mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Discord.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-05-29 10:40:01 +02:00
parent 4a035f5b22
commit b4912a718f
1 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
discord/discord.c
View File

@ -17,7 +17,7 @@
static const char* APPLICATION_ID = "450822022025576457"; static const char* APPLICATION_ID = "450822022025576457";
static int FrustrationLevel = 0; static int FrustrationLevel = 0;
static int64_t start_time; static int64_t start_time = 0;
static bool discord_ready = false; static bool discord_ready = false;
static unsigned discord_status = 0; static unsigned discord_status = 0;
@ -26,7 +26,7 @@ DiscordRichPresence discord_presence;
static void handle_discord_ready(const DiscordUser* connectedUser) static void handle_discord_ready(const DiscordUser* connectedUser)
{ {
RARCH_LOG("[discord] connected to user %s#%s - %s\n", RARCH_LOG("[Discord] connected to user %s#%s - %s\n",
connectedUser->username, connectedUser->username,
connectedUser->discriminator, connectedUser->discriminator,
connectedUser->userId); connectedUser->userId);
@ -34,29 +34,29 @@ static void handle_discord_ready(const DiscordUser* connectedUser)
static void handle_discord_disconnected(int errcode, const char* message) static void handle_discord_disconnected(int errcode, const char* message)
{ {
RARCH_LOG("[discord] disconnected (%d: %s)\n", errcode, message); RARCH_LOG("[Discord] disconnected (%d: %s)\n", errcode, message);
} }
static void handle_discord_error(int errcode, const char* message) static void handle_discord_error(int errcode, const char* message)
{ {
RARCH_LOG("[discord] error (%d: %s)\n", errcode, message); RARCH_LOG("[Discord] error (%d: %s)\n", errcode, message);
} }
static void handle_discord_join(const char* secret) static void handle_discord_join(const char* secret)
{ {
RARCH_LOG("[discord] join (%s)\n", secret); RARCH_LOG("[Discord] join (%s)\n", secret);
} }
static void handle_discord_spectate(const char* secret) static void handle_discord_spectate(const char* secret)
{ {
RARCH_LOG("[discord] spectate (%s)\n", secret); RARCH_LOG("[Discord] spectate (%s)\n", secret);
} }
static void handle_discord_join_request(const DiscordUser* request) static void handle_discord_join_request(const DiscordUser* request)
{ {
int response = -1; int response = -1;
char yn[4]; char yn[4];
RARCH_LOG("[discord] join request from %s#%s - %s\n", RARCH_LOG("[Discord] join request from %s#%s - %s\n",
request->username, request->username,
request->discriminator, request->discriminator,
request->userId); request->userId);
@ -64,10 +64,15 @@ static void handle_discord_join_request(const DiscordUser* request)
void discord_update(unsigned presence) void discord_update(unsigned presence)
{ {
if (!discord_ready || discord_status != DISCORD_PRESENCE_MENU && discord_status == presence) if (!discord_ready)
return;
if (
(discord_status != DISCORD_PRESENCE_MENU) &&
(discord_status == presence))
return; return;
RARCH_LOG("[discord] updating (%d)\n", presence); RARCH_LOG("[Discord] updating (%d)\n", presence);
memset(&discord_presence, 0, sizeof(discord_presence)); memset(&discord_presence, 0, sizeof(discord_presence));
switch (presence) switch (presence)
@ -83,7 +88,9 @@ void discord_update(unsigned presence)
discord_presence.state = "Link's House"; discord_presence.state = "Link's House";
discord_presence.details = "Legend of Zelda, The - Link's Awakening DX"; discord_presence.details = "Legend of Zelda, The - Link's Awakening DX";
discord_presence.largeImageKey = "icon"; discord_presence.largeImageKey = "icon";
//discord_presence.smallImageKey = "icon"; #if 0
discord_presence.smallImageKey = "icon";
#endif
discord_presence.instance = 0; discord_presence.instance = 0;
discord_presence.startTimestamp = start_time; discord_presence.startTimestamp = start_time;
break; break;
@ -94,12 +101,13 @@ void discord_update(unsigned presence)
discord_status = presence; discord_status = presence;
} }
void discord_init() void discord_init(void)
{ {
RARCH_LOG("[discord] initializing\n"); DiscordEventHandlers handlers;
RARCH_LOG("[Discord] initializing\n");
start_time = time(0); start_time = time(0);
DiscordEventHandlers handlers;
memset(&handlers, 0, sizeof(handlers)); memset(&handlers, 0, sizeof(handlers));
handlers.ready = handle_discord_ready; handlers.ready = handle_discord_ready;
handlers.disconnected = handle_discord_disconnected; handlers.disconnected = handle_discord_disconnected;
@ -107,14 +115,15 @@ void discord_init()
handlers.joinGame = handle_discord_join; handlers.joinGame = handle_discord_join;
handlers.spectateGame = handle_discord_spectate; handlers.spectateGame = handle_discord_spectate;
handlers.joinRequest = handle_discord_join_request; handlers.joinRequest = handle_discord_join_request;
Discord_Initialize(APPLICATION_ID, &handlers, 1, NULL); Discord_Initialize(APPLICATION_ID, &handlers, 1, NULL);
discord_ready = true; discord_ready = true;
} }
void discord_shutdown() void discord_shutdown(void)
{ {
RARCH_LOG("[discord] shutting down\n"); RARCH_LOG("[Discord] shutting down\n");
Discord_ClearPresence(); Discord_ClearPresence();
Discord_Shutdown(); Discord_Shutdown();
discord_ready = false; discord_ready = false;