Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups

Browse source
This commit is contained in:
twinaphex 2019-07-22 21:22:39 +02:00
parent 532a5bb571
commit 45d94efdf4
2 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
command.h
View file

@ -152,12 +152,8 @@ enum event_command
CMD_EVENT_SHADERS_APPLY_CHANGES, CMD_EVENT_SHADERS_APPLY_CHANGES,
/* A new shader preset has been loaded */ /* A new shader preset has been loaded */
CMD_EVENT_SHADER_PRESET_LOADED, CMD_EVENT_SHADER_PRESET_LOADED,
/* Initializes controllers. */
CMD_EVENT_CONTROLLERS_INIT,
/* Apply cheats. */ /* Apply cheats. */
CMD_EVENT_CHEATS_APPLY, CMD_EVENT_CHEATS_APPLY,
/* Deinitializes network system. */
CMD_EVENT_NETWORK_DEINIT,
/* Initializes network system. */ /* Initializes network system. */
CMD_EVENT_NETWORK_INIT, CMD_EVENT_NETWORK_INIT,
/* Initializes netplay system with a string or no host specified. */ /* Initializes netplay system with a string or no host specified. */

29
retroarch.c
View file

@ -3819,9 +3819,6 @@ bool command_event(enum event_command cmd, void *data)
retroarch_menu_running(); retroarch_menu_running();
#endif #endif
break; break;
case CMD_EVENT_CONTROLLERS_INIT:
command_event_init_controllers();
break;
case CMD_EVENT_RESET: case CMD_EVENT_RESET:
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
rcheevos_state_loaded_flag = false; rcheevos_state_loaded_flag = false;
@ -4078,21 +4075,17 @@ TODO: Add a setting for these tweaks */
} }
break; break;
case CMD_EVENT_RECORD_DEINIT: case CMD_EVENT_RECORD_DEINIT:
{ recording_set_state(false);
recording_set_state(false); streaming_set_state(false);
streaming_set_state(false); if (!recording_deinit())
if (!recording_deinit()) return false;
return false;
}
break; break;
case CMD_EVENT_RECORD_INIT: case CMD_EVENT_RECORD_INIT:
recording_set_state(true);
if (!recording_init())
{ {
recording_set_state(true); command_event(CMD_EVENT_RECORD_DEINIT, NULL);
if (!recording_init()) return false;
{
command_event(CMD_EVENT_RECORD_DEINIT, NULL);
return false;
}
} }
break; break;
case CMD_EVENT_HISTORY_DEINIT: case CMD_EVENT_HISTORY_DEINIT:
@ -4416,9 +4409,6 @@ TODO: Add a setting for these tweaks */
case CMD_EVENT_NETPLAY_DEINIT: case CMD_EVENT_NETPLAY_DEINIT:
deinit_netplay(); deinit_netplay();
break; break;
case CMD_EVENT_NETWORK_DEINIT:
network_deinit();
break;
case CMD_EVENT_NETWORK_INIT: case CMD_EVENT_NETWORK_INIT:
network_init(); network_init();
break; break;
@ -4583,7 +4573,6 @@ TODO: Add a setting for these tweaks */
break; break;
#else #else
case CMD_EVENT_NETPLAY_DEINIT: case CMD_EVENT_NETPLAY_DEINIT:
case CMD_EVENT_NETWORK_DEINIT:
case CMD_EVENT_NETWORK_INIT: case CMD_EVENT_NETWORK_INIT:
case CMD_EVENT_NETPLAY_INIT: case CMD_EVENT_NETPLAY_INIT:
case CMD_EVENT_NETPLAY_INIT_DIRECT: case CMD_EVENT_NETPLAY_INIT_DIRECT:
@ -21664,7 +21653,7 @@ bool retroarch_main_init(int argc, char *argv[])
input_driver_deinit_mapper(); input_driver_deinit_mapper();
input_driver_init_mapper(); input_driver_init_mapper();
command_event(CMD_EVENT_REWIND_INIT, NULL); command_event(CMD_EVENT_REWIND_INIT, NULL);
command_event(CMD_EVENT_CONTROLLERS_INIT, NULL); command_event_init_controllers();
if (!string_is_empty(global->record.path)) if (!string_is_empty(global->record.path))
command_event(CMD_EVENT_RECORD_INIT, NULL); command_event(CMD_EVENT_RECORD_INIT, NULL);