ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2020-06-06 22:42:43 +02:00
parent 4bbc226335
commit 7413d05705
3 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/menu_defines.h
View File

@ -60,9 +60,6 @@ enum rarch_menu_ctl_state
RARCH_MENU_CTL_SET_PREVENT_POPULATE, RARCH_MENU_CTL_SET_PREVENT_POPULATE,
RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, RARCH_MENU_CTL_UNSET_PREVENT_POPULATE,
RARCH_MENU_CTL_IS_PREVENT_POPULATE, RARCH_MENU_CTL_IS_PREVENT_POPULATE,
RARCH_MENU_CTL_SET_OWN_DRIVER,
RARCH_MENU_CTL_UNSET_OWN_DRIVER,
RARCH_MENU_CTL_OWNS_DRIVER,
RARCH_MENU_CTL_FIND_DRIVER, RARCH_MENU_CTL_FIND_DRIVER,
RARCH_MENU_CTL_ENVIRONMENT, RARCH_MENU_CTL_ENVIRONMENT,
RARCH_MENU_CTL_POINTER_DOWN, RARCH_MENU_CTL_POINTER_DOWN,

2
network/discord.h
View File

@ -52,8 +52,6 @@ void discord_avatar_set_ready(bool ready);
bool discord_avatar_is_ready(void); bool discord_avatar_is_ready(void);
char* discord_get_own_username(void);
char* discord_get_own_avatar(void); char* discord_get_own_avatar(void);
#endif /* __RARCH_DISCORD_H */ #endif /* __RARCH_DISCORD_H */

63
retroarch.c
View File

@ -5999,14 +5999,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
break; break;
case RARCH_MENU_CTL_IS_PREVENT_POPULATE: case RARCH_MENU_CTL_IS_PREVENT_POPULATE:
return menu_st->prevent_populate; return menu_st->prevent_populate;
case RARCH_MENU_CTL_SET_OWN_DRIVER:
menu_st->data_own = true;
break;
case RARCH_MENU_CTL_UNSET_OWN_DRIVER:
menu_st->data_own = false;
break;
case RARCH_MENU_CTL_OWNS_DRIVER:
return menu_st->data_own;
case RARCH_MENU_CTL_DEINIT: case RARCH_MENU_CTL_DEINIT:
if ( p_rarch->menu_driver_ctx if ( p_rarch->menu_driver_ctx
&& p_rarch->menu_driver_ctx->context_destroy) && p_rarch->menu_driver_ctx->context_destroy)
@ -6349,7 +6341,7 @@ bool discord_is_ready(void)
return discord_st->ready; return discord_st->ready;
} }
char *discord_get_own_username(void) static char *discord_get_own_username(void)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
discord_state_t *discord_st = &p_rarch->discord_st; discord_state_t *discord_st = &p_rarch->discord_st;
@ -6781,8 +6773,6 @@ static void discord_init(
handlers.spectateGame = handle_discord_spectate; handlers.spectateGame = handle_discord_spectate;
handlers.joinRequest = handle_discord_join_request; handlers.joinRequest = handle_discord_join_request;
RARCH_LOG("[DISCORD] initializing ..\n");
Discord_Initialize(discord_app_id, &handlers, 0, NULL); Discord_Initialize(discord_app_id, &handlers, 0, NULL);
#ifdef _WIN32 #ifdef _WIN32
@ -6797,19 +6787,10 @@ static void discord_init(
#else #else
snprintf(command, sizeof(command), "sh -c %s", args); snprintf(command, sizeof(command), "sh -c %s", args);
#endif #endif
RARCH_LOG("[DISCORD] registering startup command: %s\n", command); RARCH_LOG("[DISCORD] Registering startup command: %s\n", command);
Discord_Register(discord_app_id, command); Discord_Register(discord_app_id, command);
discord_st->ready = true; discord_st->ready = true;
} }
static void discord_shutdown(discord_state_t *discord_st)
{
RARCH_LOG("[DISCORD] shutting down ..\n");
Discord_ClearPresence();
Discord_Shutdown();
discord_st->ready = false;
}
#endif #endif
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
@ -6823,10 +6804,9 @@ static void discord_shutdown(discord_state_t *discord_st)
**/ **/
static bool netplay_is_alive(netplay_t *netplay) static bool netplay_is_alive(netplay_t *netplay)
{ {
if (!netplay)
return false;
return (netplay->is_server) || return (netplay->is_server) ||
(!netplay->is_server && netplay->self_mode >= NETPLAY_CONNECTION_CONNECTED); (!netplay->is_server &&
netplay->self_mode >= NETPLAY_CONNECTION_CONNECTED);
} }
/** /**
@ -6843,7 +6823,8 @@ static bool netplay_should_skip(netplay_t *netplay)
{ {
if (!netplay) if (!netplay)
return false; return false;
return netplay->is_replay && (netplay->self_mode >= NETPLAY_CONNECTION_CONNECTED); return netplay->is_replay
&& (netplay->self_mode >= NETPLAY_CONNECTION_CONNECTED);
} }
/** /**
@ -6874,7 +6855,7 @@ static bool get_self_input_state(netplay_t *netplay)
for (devi = 0; devi < MAX_INPUT_DEVICES; devi++) for (devi = 0; devi < MAX_INPUT_DEVICES; devi++)
{ {
if (!(devices & (1<<devi))) if (!(devices & (1 << devi)))
continue; continue;
/* Find an appropriate local device */ /* Find an appropriate local device */
@ -6882,7 +6863,7 @@ static bool get_self_input_state(netplay_t *netplay)
for (local_device = 0; local_device < MAX_INPUT_DEVICES; local_device++) for (local_device = 0; local_device < MAX_INPUT_DEVICES; local_device++)
{ {
if (used_devices & (1<<local_device)) if (used_devices & (1 << local_device))
continue; continue;
if ((netplay->config_devices[local_device]&RETRO_DEVICE_MASK) == dev_type) if ((netplay->config_devices[local_device]&RETRO_DEVICE_MASK) == dev_type)
break; break;
@ -6890,7 +6871,7 @@ static bool get_self_input_state(netplay_t *netplay)
if (local_device == MAX_INPUT_DEVICES) if (local_device == MAX_INPUT_DEVICES)
local_device = 0; local_device = 0;
used_devices |= (1<<local_device); used_devices |= (1 << local_device);
istate = netplay_input_state_for(&ptr->real_input[devi], istate = netplay_input_state_for(&ptr->real_input[devi],
/* If we're a slave, we write our own input to MAX_CLIENTS to keep it separate */ /* If we're a slave, we write our own input to MAX_CLIENTS to keep it separate */
@ -7184,7 +7165,7 @@ static bool netplay_poll(
for (client = 1; client < MAX_CLIENTS; client++) for (client = 1; client < MAX_CLIENTS; client++)
{ {
struct netplay_connection *connection; struct netplay_connection *connection;
if (!(netplay->connected_players & (1<<client))) if (!(netplay->connected_players & (1 << client)))
continue; continue;
if (netplay->read_frame_count[client] > netplay->unread_frame_count) if (netplay->read_frame_count[client] > netplay->unread_frame_count)
continue; continue;
@ -7640,7 +7621,7 @@ static int16_t input_state_net(unsigned port, unsigned device,
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
netplay_t *netplay = p_rarch->netplay_data; netplay_t *netplay = p_rarch->netplay_data;
if (netplay_is_alive(netplay)) if (netplay && netplay_is_alive(netplay))
return netplay_input_state(netplay, port, device, idx, id); return netplay_input_state(netplay, port, device, idx, id);
return netplay->cbs.state_cb(port, device, idx, id); return netplay->cbs.state_cb(port, device, idx, id);
} }
@ -7865,7 +7846,7 @@ static void netplay_force_future(netplay_t *netplay)
uint32_t client; uint32_t client;
for (client = 0; client < MAX_CLIENTS; client++) for (client = 0; client < MAX_CLIENTS; client++)
{ {
if (!(netplay->connected_players & (1<<client))) if (!(netplay->connected_players & (1 << client)))
continue; continue;
if (netplay->read_frame_count[client] < netplay->run_frame_count) if (netplay->read_frame_count[client] < netplay->run_frame_count)
@ -8197,7 +8178,9 @@ static bool init_netplay(
&cbs, &cbs,
settings->bools.netplay_nat_traversal && !settings->bools.netplay_use_mitm_server, settings->bools.netplay_nat_traversal && !settings->bools.netplay_use_mitm_server,
#ifdef HAVE_DISCORD #ifdef HAVE_DISCORD
discord_get_own_username() ? discord_get_own_username() : discord_get_own_username()
? discord_get_own_username()
:
#endif #endif
settings->paths.username, settings->paths.username,
quirks); quirks);
@ -14995,6 +14978,7 @@ static void global_free(struct rarch_state *p_rarch)
void main_exit(void *args) void main_exit(void *args)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
struct menu_state *menu_st = &p_rarch->menu_driver_state;
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
bool config_save_on_exit = settings->bools.config_save_on_exit; bool config_save_on_exit = settings->bools.config_save_on_exit;
@ -15017,7 +15001,8 @@ void main_exit(void *args)
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* Do not want menu context to live any more. */ /* Do not want menu context to live any more. */
menu_driver_ctl(RARCH_MENU_CTL_UNSET_OWN_DRIVER, NULL); if (menu_st)
menu_st->data_own = false;
#endif #endif
rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL); rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL);
@ -21145,7 +21130,7 @@ static void input_driver_poll(void)
#ifdef HAVE_ACCESSIBILITY #ifdef HAVE_ACCESSIBILITY
/* gamepad override */ /* gamepad override */
if (i==0 && p_rarch->gamepad_input_override & (1<<j)) if (i == 0 && p_rarch->gamepad_input_override & (1 << j))
{ {
BIT256_SET(handle->buttons[i], j); BIT256_SET(handle->buttons[i], j);
} }
@ -31553,6 +31538,7 @@ void driver_set_nonblock_state(void)
**/ **/
static void drivers_init(struct rarch_state *p_rarch, int flags) static void drivers_init(struct rarch_state *p_rarch, int flags)
{ {
struct menu_state *menu_st = &p_rarch->menu_driver_state;
bool video_is_threaded = VIDEO_DRIVER_IS_THREADED_INTERNAL(); bool video_is_threaded = VIDEO_DRIVER_IS_THREADED_INTERNAL();
settings_t *settings = p_rarch->configuration_settings; settings_t *settings = p_rarch->configuration_settings;
#if defined(HAVE_GFX_WIDGETS) #if defined(HAVE_GFX_WIDGETS)
@ -31564,7 +31550,8 @@ static void drivers_init(struct rarch_state *p_rarch, int flags)
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* By default, we want the menu to persist through driver reinits. */ /* By default, we want the menu to persist through driver reinits. */
menu_driver_ctl(RARCH_MENU_CTL_SET_OWN_DRIVER, NULL); if (menu_st)
menu_st->data_own = true;
#endif #endif
if (flags & (DRIVER_VIDEO_MASK | DRIVER_AUDIO_MASK)) if (flags & (DRIVER_VIDEO_MASK | DRIVER_AUDIO_MASK))
@ -35061,7 +35048,11 @@ bool retroarch_main_quit(void)
command_event(CMD_EVENT_DISCORD_UPDATE, &userdata); command_event(CMD_EVENT_DISCORD_UPDATE, &userdata);
} }
if (discord_st->ready) if (discord_st->ready)
discord_shutdown(discord_st); {
Discord_ClearPresence();
Discord_Shutdown();
discord_st->ready = false;
}
discord_is_inited = false; discord_is_inited = false;
#endif #endif