yuzu-emu/discord-rpc
1
0
Fork 0
mirror of https://github.com/yuzu-emu/discord-rpc.git synced 2024-11-27 21:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixup event names

Browse Source 
- GAME_XXXXX not XXXXX_GAME
- Nuked the WantsPresence event
This commit is contained in:
Jason Citron 2017-07-28 00:19:10 -07:00
parent 6338a572d3
commit 93d9ba10c2
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/send-presence/send-presence.c
View File

@ -40,12 +40,6 @@ static void handleDiscordError(int errcode, const char* message)
printf("\nDiscord: error (%d: %s)\n", errcode, message); printf("\nDiscord: error (%d: %s)\n", errcode, message);
} }
static void handleDiscordPresenceRequested()
{
printf("\nDiscord: requests presence\n");
updateDiscordPresence();
}
static int prompt(char* line, size_t size) static int prompt(char* line, size_t size)
{ {
int res; int res;
@ -102,7 +96,6 @@ int main(int argc, char* argv[])
handlers.ready = handleDiscordReady; handlers.ready = handleDiscordReady;
handlers.disconnected = handleDiscordDisconnected; handlers.disconnected = handleDiscordDisconnected;
handlers.errored = handleDiscordError; handlers.errored = handleDiscordError;
handlers.presenceRequested = handleDiscordPresenceRequested;
Discord_Initialize(APPLICATION_ID, &handlers, 1); Discord_Initialize(APPLICATION_ID, &handlers, 1);
gameLoop(); gameLoop();

1
include/discord-rpc.h
View File

@ -27,7 +27,6 @@ typedef struct DiscordEventHandlers {
void (*ready)(); void (*ready)();
void (*disconnected)(int errorCode, const char* message); void (*disconnected)(int errorCode, const char* message);
void (*errored)(int errorCode, const char* message); void (*errored)(int errorCode, const char* message);
void (*presenceRequested)();
void (*joinGame)(const char* joinSecret); void (*joinGame)(const char* joinSecret);
void (*spectateGame)(const char* spectateSecret); void (*spectateGame)(const char* spectateSecret);
} DiscordEventHandlers; } DiscordEventHandlers;

21
src/discord-rpc.cpp
View File

@ -26,7 +26,6 @@ static DiscordEventHandlers Handlers{};
static std::atomic_bool WasJustConnected{false}; static std::atomic_bool WasJustConnected{false};
static std::atomic_bool WasJustDisconnected{false}; static std::atomic_bool WasJustDisconnected{false};
static std::atomic_bool GotErrorMessage{false}; static std::atomic_bool GotErrorMessage{false};
static std::atomic_bool WasPresenceRequested{false};
static std::atomic_bool WasJoinGame{false}; static std::atomic_bool WasJoinGame{false};
static std::atomic_bool WasSpectateGame{false}; static std::atomic_bool WasSpectateGame{false};
static char JoinGameSecret[256]; static char JoinGameSecret[256];
@ -117,17 +116,13 @@ extern "C" void Discord_UpdateConnection()
continue; continue;
} }
// todo ug if (strcmp(evtName, "GAME_JOIN") == 0) {
if (strcmp(evtName, "PRESENCE_REQUESTED") == 0) {
WasPresenceRequested.store(true);
}
else if (strcmp(evtName, "JOIN_GAME") == 0) {
auto data = message.FindMember("data"); auto data = message.FindMember("data");
auto secret = data->value["secret"].GetString(); auto secret = data->value["secret"].GetString();
StringCopy(JoinGameSecret, secret); StringCopy(JoinGameSecret, secret);
WasJoinGame.store(true); WasJoinGame.store(true);
} }
else if (strcmp(evtName, "SPECTATE_GAME") == 0) { else if (strcmp(evtName, "GAME_SPECTATE") == 0) {
auto data = message.FindMember("data"); auto data = message.FindMember("data");
auto secret = data->value["secret"].GetString(); auto secret = data->value["secret"].GetString();
StringCopy(SpectateGameSecret, secret); StringCopy(SpectateGameSecret, secret);
@ -201,16 +196,12 @@ extern "C" void Discord_Initialize(const char* applicationId,
WasJustConnected.exchange(true); WasJustConnected.exchange(true);
ReconnectTimeMs.reset(); ReconnectTimeMs.reset();
if (Handlers.presenceRequested) {
RegisterForEvent("PRESENCE_REQUESTED");
}
if (Handlers.joinGame) { if (Handlers.joinGame) {
RegisterForEvent("JOIN_GAME"); RegisterForEvent("GAME_JOIN");
} }
if (Handlers.spectateGame) { if (Handlers.spectateGame) {
RegisterForEvent("SPECTATE_GAME"); RegisterForEvent("GAME_SPECTATE");
} }
}; };
Connection->onDisconnect = [](int err, const char* message) { Connection->onDisconnect = [](int err, const char* message) {
@ -265,10 +256,6 @@ extern "C" void Discord_RunCallbacks()
Handlers.ready(); Handlers.ready();
} }
if (WasPresenceRequested.exchange(false) && Handlers.presenceRequested) {
Handlers.presenceRequested();
}
if (WasJoinGame.exchange(false) && Handlers.joinGame) { if (WasJoinGame.exchange(false) && Handlers.joinGame) {
Handlers.joinGame(JoinGameSecret); Handlers.joinGame(JoinGameSecret);
} }