mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Discord) Remove settings_t dependency

Browse Source
This commit is contained in:
twinaphex 2020-01-02 18:29:30 +01:00
parent 6b6233944b
commit c73daa6a1c
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
discord/discord.c
View File

@ -23,7 +23,6 @@
#include "../deps/discord-rpc/include/discord_rpc.h"
#include "../retroarch.h"
#include "../configuration.h"
#include "../core.h"
#include "../core_info.h"
#include "../paths.h"
@ -464,11 +463,10 @@ void discord_update(enum discord_presence presence)
discord_status = presence;
}
void discord_init(void)
void discord_init(const char *discord_app_id)
{
char full_path[PATH_MAX_LENGTH];
char command[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr();
DiscordEventHandlers handlers;
@ -483,7 +481,7 @@ void discord_init(void)
handlers.spectateGame = handle_discord_spectate;
handlers.joinRequest = handle_discord_join_request;
Discord_Initialize(settings->arrays.discord_app_id, &handlers, 0, NULL);
Discord_Initialize(discord_app_id, &handlers, 0, NULL);
#ifdef _WIN32
GetModuleFileNameA(NULL, full_path, sizeof(full_path));
@ -500,7 +498,7 @@ void discord_init(void)
get_retroarch_launch_arguments());
#endif
RARCH_LOG("[discord] registering startup command: %s\n", command);
Discord_Register(settings->arrays.discord_app_id, command);
Discord_Register(discord_app_id, command);
discord_ready = true;
}

2
discord/discord.h
View File

@ -41,7 +41,7 @@ typedef struct discord_userdata
enum discord_presence status;
} discord_userdata_t;
void discord_init(void);
void discord_init(const char *discord_app_id);
void discord_shutdown(void);

9
retroarch.c
View File

@ -7479,14 +7479,15 @@ TODO: Add a setting for these tweaks */
{
settings_t *settings = configuration_settings;
if (settings)
if (!settings->bools.discord_enable)
return false;
if (!settings)
return false;
if (!settings->bools.discord_enable)
return false;
if (discord_is_ready())
return true;
discord_init();
discord_init(settings->arrays.discord_app_id);
}
#endif
break;