mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Can remove retroarch_get_launch_arguments function now

Browse Source
This commit is contained in:
twinaphex 2020-02-01 17:46:01 +01:00
parent 85d64602ff
commit 6b99e07043
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
discord/discord.c
View File

@ -467,7 +467,7 @@ void discord_update(enum discord_presence presence, bool fuzzy_archive_match)
discord_status = presence;
}
void discord_init(const char *discord_app_id)
void discord_init(const char *discord_app_id, char *args)
{
char full_path[PATH_MAX_LENGTH];
char command[PATH_MAX_LENGTH];
@ -489,17 +489,15 @@ void discord_init(const char *discord_app_id)
#ifdef _WIN32
fill_pathname_application_path(full_path, sizeof(full_path));
if (strstr(retroarch_get_launch_arguments(), full_path))
strlcpy(command, retroarch_get_launch_arguments(), sizeof(command));
if (strstr(args, full_path))
strlcpy(command, args, sizeof(command));
else
{
path_basedir(full_path);
snprintf(command, sizeof(command), "%s%s",
full_path, retroarch_get_launch_arguments());
snprintf(command, sizeof(command), "%s%s", full_path, args);
}
#else
snprintf(command, sizeof(command), "sh -c %s",
retroarch_get_launch_arguments());
snprintf(command, sizeof(command), "sh -c %s", args);
#endif
RARCH_LOG("[discord] registering startup command: %s\n", command);
Discord_Register(discord_app_id, command);

2
discord/discord.h
View File

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

10
retroarch.c
View File

@ -7669,7 +7669,8 @@ TODO: Add a setting for these tweaks */
if (discord_is_ready())
return true;
discord_init(settings->arrays.discord_app_id);
discord_init(settings->arrays.discord_app_id,
launch_arguments);
}
#endif
break;
@ -7950,7 +7951,7 @@ void main_exit(void *args)
frontend_driver_exitspawn(
path_get_ptr(RARCH_PATH_CORE),
path_get_realsize(RARCH_PATH_CORE),
retroarch_get_launch_arguments());
launch_arguments);
has_set_username = false;
rarch_is_inited = false;
@ -27796,11 +27797,6 @@ struct retro_system_info *runloop_get_libretro_system_info(void)
return &runloop_system.info;
}
char *retroarch_get_launch_arguments(void)
{
return launch_arguments;
}
void retroarch_force_video_driver_fallback(const char *driver)
{
settings_t *settings = configuration_settings;

4
retroarch.h
View File

@ -371,8 +371,6 @@ void retroarch_menu_running(void);
void retroarch_menu_running_finished(bool quit);
char *retroarch_get_launch_arguments(void);
rarch_system_info_t *runloop_get_system_info(void);
struct retro_system_info *runloop_get_libretro_system_info(void);
@ -1995,8 +1993,6 @@ void menu_driver_set_binding_state(bool on);
bool menu_driver_is_toggled(void);
bool menu_driver_is_toggled(void);
bool menu_widgets_ready(void);
unsigned int retroarch_get_rotation(void);