mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename event_cmd_ctl to command_event

Browse Source
This commit is contained in:
twinaphex 2016-05-09 20:20:50 +02:00
parent 3c74031c2f
commit a98ef36d36
34 changed files with 181 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/audio_driver.c
View File

@ -297,7 +297,7 @@ static bool uninit_audio(void)
free(audio_driver_data.output_samples.buf); free(audio_driver_data.output_samples.buf);
audio_driver_data.output_samples.buf = NULL; audio_driver_data.output_samples.buf = NULL;
event_cmd_ctl(EVENT_CMD_DSP_FILTER_DEINIT, NULL); command_event(EVENT_CMD_DSP_FILTER_DEINIT, NULL);
compute_audio_buffer_statistics(); compute_audio_buffer_statistics();
@ -380,7 +380,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
if (!settings->audio.sync && audio_driver_is_active()) if (!settings->audio.sync && audio_driver_is_active())
{ {
event_cmd_ctl(EVENT_CMD_AUDIO_SET_NONBLOCKING_STATE, NULL); command_event(EVENT_CMD_AUDIO_SET_NONBLOCKING_STATE, NULL);
audio_driver_data.chunk.size = audio_driver_data.chunk.nonblock_size; audio_driver_data.chunk.size = audio_driver_data.chunk.nonblock_size;
} }
@ -438,7 +438,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
RARCH_WARN("Audio rate control was desired, but driver does not support needed features.\n"); RARCH_WARN("Audio rate control was desired, but driver does not support needed features.\n");
} }
event_cmd_ctl(EVENT_CMD_DSP_FILTER_INIT, NULL); command_event(EVENT_CMD_DSP_FILTER_INIT, NULL);
audio_driver_data.free_samples.count = 0; audio_driver_data.free_samples.count = 0;
@ -928,8 +928,8 @@ bool audio_driver_toggle_mute(void)
settings->audio.mute_enable = !settings->audio.mute_enable; settings->audio.mute_enable = !settings->audio.mute_enable;
if (settings->audio.mute_enable) if (settings->audio.mute_enable)
event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); command_event(EVENT_CMD_AUDIO_STOP, NULL);
else if (!event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL)) else if (!command_event(EVENT_CMD_AUDIO_START, NULL))
{ {
audio_driver_unset_active(); audio_driver_unset_active();
return false; return false;

6
cheevos.c
View File

@ -2214,9 +2214,9 @@ bool cheevos_toggle_hardcore_mode(void)
if (settings->cheevos.hardcore_mode_enable) if (settings->cheevos.hardcore_mode_enable)
{ {
/* send reset core cmd to avoid any user savestate previusly loaded */ /* send reset core cmd to avoid any user savestate previusly loaded */
event_cmd_ctl(EVENT_CMD_RESET, NULL); command_event(EVENT_CMD_RESET, NULL);
if (settings->rewind_enable) if (settings->rewind_enable)
event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL); command_event(EVENT_CMD_REWIND_DEINIT, NULL);
RARCH_LOG("%s\n", msg_hash_to_str(MSG_CHEEVOS_HARDCORE_MODE_ENABLE)); RARCH_LOG("%s\n", msg_hash_to_str(MSG_CHEEVOS_HARDCORE_MODE_ENABLE));
runloop_msg_queue_push(msg_hash_to_str(MSG_CHEEVOS_HARDCORE_MODE_ENABLE), 0, 3 * 60, true); runloop_msg_queue_push(msg_hash_to_str(MSG_CHEEVOS_HARDCORE_MODE_ENABLE), 0, 3 * 60, true);
@ -2224,7 +2224,7 @@ bool cheevos_toggle_hardcore_mode(void)
else else
{ {
if (settings->rewind_enable) if (settings->rewind_enable)
event_cmd_ctl(EVENT_CMD_REWIND_INIT, NULL); command_event(EVENT_CMD_REWIND_INIT, NULL);
} }
return true; return true;

84
command_event.c
View File

@ -212,7 +212,7 @@ static bool event_disk_control_append_image(const char *path)
RARCH_LOG("%s\n", msg); RARCH_LOG("%s\n", msg);
runloop_msg_queue_push(msg, 0, 180, true); runloop_msg_queue_push(msg, 0, 180, true);
event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL); command_event(EVENT_CMD_AUTOSAVE_DEINIT, NULL);
/* TODO: Need to figure out what to do with subsystems case. */ /* TODO: Need to figure out what to do with subsystems case. */
if (!*global->subsystem) if (!*global->subsystem)
@ -225,7 +225,7 @@ static bool event_disk_control_append_image(const char *path)
rarch_ctl(RARCH_CTL_FILL_PATHNAMES, NULL); rarch_ctl(RARCH_CTL_FILL_PATHNAMES, NULL);
} }
event_cmd_ctl(EVENT_CMD_AUTOSAVE_INIT, NULL); command_event(EVENT_CMD_AUTOSAVE_INIT, NULL);
event_disk_control_set_index(new_idx); event_disk_control_set_index(new_idx);
event_disk_control_set_eject(false, false); event_disk_control_set_eject(false, false);
@ -571,8 +571,8 @@ static bool event_init_content(void)
msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD)); msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD));
event_load_auto_state(); event_load_auto_state();
event_cmd_ctl(EVENT_CMD_BSV_MOVIE_INIT, NULL); command_event(EVENT_CMD_BSV_MOVIE_INIT, NULL);
event_cmd_ctl(EVENT_CMD_NETPLAY_INIT, NULL); command_event(EVENT_CMD_NETPLAY_INIT, NULL);
return true; return true;
} }
@ -921,14 +921,14 @@ static bool event_cmd_exec(void *data)
} }
/** /**
* event_cmd_ctl: * command_event:
* @cmd : Event command index. * @cmd : Event command index.
* *
* Performs program event command with index @cmd. * Performs program event command with index @cmd.
* *
* Returns: true (1) on success, otherwise false (0). * Returns: true (1) on success, otherwise false (0).
**/ **/
bool event_cmd_ctl(enum event_command cmd, void *data) bool command_event(enum event_command cmd, void *data)
{ {
unsigned i = 0; unsigned i = 0;
bool boolean = false; bool boolean = false;
@ -951,7 +951,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
{ {
unsigned width = 0, height = 0; unsigned width = 0, height = 0;
event_cmd_ctl(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL); command_event(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL);
if (video_driver_get_video_output_size(&width, &height)) if (video_driver_get_video_output_size(&width, &height))
{ {
@ -970,7 +970,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
break; break;
case EVENT_CMD_LOAD_CONTENT_PERSIST: case EVENT_CMD_LOAD_CONTENT_PERSIST:
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); command_event(EVENT_CMD_LOAD_CORE, NULL);
#endif #endif
rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL); rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL);
break; break;
@ -985,13 +985,13 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
case EVENT_CMD_LOAD_CONTENT: case EVENT_CMD_LOAD_CONTENT:
{ {
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
event_cmd_ctl(EVENT_CMD_LOAD_CONTENT_PERSIST, NULL); command_event(EVENT_CMD_LOAD_CONTENT_PERSIST, NULL);
#else #else
char *fullpath = NULL; char *fullpath = NULL;
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, settings->path.libretro); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, settings->path.libretro);
event_cmd_ctl(EVENT_CMD_EXEC, (void*)fullpath); command_event(EVENT_CMD_EXEC, (void*)fullpath);
event_cmd_ctl(EVENT_CMD_QUIT, NULL); command_event(EVENT_CMD_QUIT, NULL);
#endif #endif
} }
break; break;
@ -1001,7 +1001,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
#endif #endif
break; break;
case EVENT_CMD_LOAD_CORE_PERSIST: case EVENT_CMD_LOAD_CORE_PERSIST:
event_cmd_ctl(EVENT_CMD_LOAD_CORE_DEINIT, NULL); command_event(EVENT_CMD_LOAD_CORE_DEINIT, NULL);
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
bool *ptr = NULL; bool *ptr = NULL;
@ -1033,9 +1033,9 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
} }
break; break;
case EVENT_CMD_LOAD_CORE: case EVENT_CMD_LOAD_CORE:
event_cmd_ctl(EVENT_CMD_LOAD_CORE_PERSIST, NULL); command_event(EVENT_CMD_LOAD_CORE_PERSIST, NULL);
#ifndef HAVE_DYNAMIC #ifndef HAVE_DYNAMIC
event_cmd_ctl(EVENT_CMD_QUIT, NULL); command_event(EVENT_CMD_QUIT, NULL);
#endif #endif
break; break;
case EVENT_CMD_LOAD_STATE: case EVENT_CMD_LOAD_STATE:
@ -1069,7 +1069,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
settings->video.scale = *window_scale; settings->video.scale = *window_scale;
if (!settings->video.fullscreen) if (!settings->video.fullscreen)
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
runloop_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx); runloop_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx);
} }
@ -1119,7 +1119,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
break; break;
case EVENT_CMD_UNLOAD_CORE: case EVENT_CMD_UNLOAD_CORE:
runloop_ctl(RUNLOOP_CTL_PREPARE_DUMMY, NULL); runloop_ctl(RUNLOOP_CTL_PREPARE_DUMMY, NULL);
event_cmd_ctl(EVENT_CMD_LOAD_CORE_DEINIT, NULL); command_event(EVENT_CMD_LOAD_CORE_DEINIT, NULL);
break; break;
case EVENT_CMD_QUIT: case EVENT_CMD_QUIT:
rarch_ctl(RARCH_CTL_QUIT, NULL); rarch_ctl(RARCH_CTL_QUIT, NULL);
@ -1140,7 +1140,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
video_driver_unset_video_cache_context(); video_driver_unset_video_cache_context();
video_driver_unset_video_cache_context_ack(); video_driver_unset_video_cache_context_ack();
event_cmd_ctl(EVENT_CMD_RESET_CONTEXT, NULL); command_event(EVENT_CMD_RESET_CONTEXT, NULL);
video_driver_unset_video_cache_context(); video_driver_unset_video_cache_context();
/* Poll input to avoid possibly stale data to corrupt things. */ /* Poll input to avoid possibly stale data to corrupt things. */
@ -1149,7 +1149,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_display_set_framebuffer_dirty_flag(); menu_display_set_framebuffer_dirty_flag();
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
event_cmd_ctl(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL); command_event(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL);
#endif #endif
} }
break; break;
@ -1157,7 +1157,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
cheat_manager_state_free(); cheat_manager_state_free();
break; break;
case EVENT_CMD_CHEATS_INIT: case EVENT_CMD_CHEATS_INIT:
event_cmd_ctl(EVENT_CMD_CHEATS_DEINIT, NULL); command_event(EVENT_CMD_CHEATS_DEINIT, NULL);
event_init_cheats(); event_init_cheats();
break; break;
case EVENT_CMD_CHEATS_APPLY: case EVENT_CMD_CHEATS_APPLY:
@ -1187,9 +1187,9 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
break; break;
case EVENT_CMD_REWIND_TOGGLE: case EVENT_CMD_REWIND_TOGGLE:
if (settings->rewind_enable) if (settings->rewind_enable)
event_cmd_ctl(EVENT_CMD_REWIND_INIT, NULL); command_event(EVENT_CMD_REWIND_INIT, NULL);
else else
event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL); command_event(EVENT_CMD_REWIND_DEINIT, NULL);
break; break;
case EVENT_CMD_AUTOSAVE_DEINIT: case EVENT_CMD_AUTOSAVE_DEINIT:
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
@ -1202,7 +1202,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
#endif #endif
break; break;
case EVENT_CMD_AUTOSAVE_INIT: case EVENT_CMD_AUTOSAVE_INIT:
event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL); command_event(EVENT_CMD_AUTOSAVE_DEINIT, NULL);
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
autosave_init(); autosave_init();
#endif #endif
@ -1251,7 +1251,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
#endif #endif
break; break;
case EVENT_CMD_OVERLAY_INIT: case EVENT_CMD_OVERLAY_INIT:
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); command_event(EVENT_CMD_OVERLAY_DEINIT, NULL);
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
input_overlay_init(); input_overlay_init();
#endif #endif
@ -1265,7 +1265,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
audio_driver_dsp_filter_free(); audio_driver_dsp_filter_free();
break; break;
case EVENT_CMD_DSP_FILTER_INIT: case EVENT_CMD_DSP_FILTER_INIT:
event_cmd_ctl(EVENT_CMD_DSP_FILTER_DEINIT, NULL); command_event(EVENT_CMD_DSP_FILTER_DEINIT, NULL);
if (!*settings->path.audio_dsp_plugin) if (!*settings->path.audio_dsp_plugin)
break; break;
audio_driver_dsp_filter_init(settings->path.audio_dsp_plugin); audio_driver_dsp_filter_init(settings->path.audio_dsp_plugin);
@ -1278,7 +1278,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
return false; return false;
break; break;
case EVENT_CMD_RECORD_INIT: case EVENT_CMD_RECORD_INIT:
event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); command_event(EVENT_CMD_HISTORY_DEINIT, NULL);
if (!recording_init()) if (!recording_init())
return false; return false;
break; break;
@ -1291,7 +1291,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
g_defaults.history = NULL; g_defaults.history = NULL;
break; break;
case EVENT_CMD_HISTORY_INIT: case EVENT_CMD_HISTORY_INIT:
event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); command_event(EVENT_CMD_HISTORY_DEINIT, NULL);
if (!settings->history_list_enable) if (!settings->history_list_enable)
return false; return false;
RARCH_LOG("%s: [%s].\n", RARCH_LOG("%s: [%s].\n",
@ -1305,7 +1305,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
core_info_deinit_list(); core_info_deinit_list();
break; break;
case EVENT_CMD_CORE_INFO_INIT: case EVENT_CMD_CORE_INFO_INIT:
event_cmd_ctl(EVENT_CMD_CORE_INFO_DEINIT, NULL); command_event(EVENT_CMD_CORE_INFO_DEINIT, NULL);
if (*settings->directory.libretro) if (*settings->directory.libretro)
core_info_init_list(); core_info_init_list();
@ -1418,7 +1418,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL)) if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL))
{ {
RARCH_LOG("%s\n", msg_hash_to_str(MSG_PAUSED)); RARCH_LOG("%s\n", msg_hash_to_str(MSG_PAUSED));
event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); command_event(EVENT_CMD_AUDIO_STOP, NULL);
if (settings->video.black_frame_insertion) if (settings->video.black_frame_insertion)
video_driver_cached_frame_render(); video_driver_cached_frame_render();
@ -1426,40 +1426,40 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
else else
{ {
RARCH_LOG("%s\n", msg_hash_to_str(MSG_UNPAUSED)); RARCH_LOG("%s\n", msg_hash_to_str(MSG_UNPAUSED));
event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); command_event(EVENT_CMD_AUDIO_START, NULL);
} }
break; break;
case EVENT_CMD_PAUSE_TOGGLE: case EVENT_CMD_PAUSE_TOGGLE:
boolean = runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL); boolean = runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL);
boolean = !boolean; boolean = !boolean;
runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); command_event(EVENT_CMD_PAUSE_CHECKS, NULL);
break; break;
case EVENT_CMD_UNPAUSE: case EVENT_CMD_UNPAUSE:
boolean = false; boolean = false;
runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); command_event(EVENT_CMD_PAUSE_CHECKS, NULL);
break; break;
case EVENT_CMD_PAUSE: case EVENT_CMD_PAUSE:
boolean = true; boolean = true;
runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); command_event(EVENT_CMD_PAUSE_CHECKS, NULL);
break; break;
case EVENT_CMD_MENU_PAUSE_LIBRETRO: case EVENT_CMD_MENU_PAUSE_LIBRETRO:
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
{ {
if (settings->menu.pause_libretro) if (settings->menu.pause_libretro)
event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); command_event(EVENT_CMD_AUDIO_STOP, NULL);
else else
event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); command_event(EVENT_CMD_AUDIO_START, NULL);
} }
else else
{ {
if (settings->menu.pause_libretro) if (settings->menu.pause_libretro)
event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); command_event(EVENT_CMD_AUDIO_START, NULL);
} }
#endif #endif
break; break;
@ -1467,7 +1467,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
runloop_ctl(RUNLOOP_CTL_SHADER_DIR_DEINIT, NULL); runloop_ctl(RUNLOOP_CTL_SHADER_DIR_DEINIT, NULL);
break; break;
case EVENT_CMD_SHADER_DIR_INIT: case EVENT_CMD_SHADER_DIR_INIT:
event_cmd_ctl(EVENT_CMD_SHADER_DIR_DEINIT, NULL); command_event(EVENT_CMD_SHADER_DIR_DEINIT, NULL);
if (!runloop_ctl(RUNLOOP_CTL_SHADER_DIR_INIT, NULL)) if (!runloop_ctl(RUNLOOP_CTL_SHADER_DIR_INIT, NULL))
return false; return false;
@ -1519,14 +1519,14 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
msg_hash_to_str(MSG_SRAM_WILL_NOT_BE_SAVED)); msg_hash_to_str(MSG_SRAM_WILL_NOT_BE_SAVED));
if (global->sram.use) if (global->sram.use)
event_cmd_ctl(EVENT_CMD_AUTOSAVE_INIT, NULL); command_event(EVENT_CMD_AUTOSAVE_INIT, NULL);
} }
break; break;
case EVENT_CMD_BSV_MOVIE_DEINIT: case EVENT_CMD_BSV_MOVIE_DEINIT:
bsv_movie_ctl(BSV_MOVIE_CTL_DEINIT, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_DEINIT, NULL);
break; break;
case EVENT_CMD_BSV_MOVIE_INIT: case EVENT_CMD_BSV_MOVIE_INIT:
event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); command_event(EVENT_CMD_BSV_MOVIE_DEINIT, NULL);
bsv_movie_ctl(BSV_MOVIE_CTL_INIT, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_INIT, NULL);
break; break;
case EVENT_CMD_NETPLAY_DEINIT: case EVENT_CMD_NETPLAY_DEINIT:
@ -1545,7 +1545,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
#endif #endif
break; break;
case EVENT_CMD_NETPLAY_INIT: case EVENT_CMD_NETPLAY_INIT:
event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL); command_event(EVENT_CMD_NETPLAY_DEINIT, NULL);
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
if (!init_netplay()) if (!init_netplay())
return false; return false;
@ -1563,20 +1563,20 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
/* If we go fullscreen we drop all drivers and /* If we go fullscreen we drop all drivers and
* reinitialize to be safe. */ * reinitialize to be safe. */
settings->video.fullscreen = !settings->video.fullscreen; settings->video.fullscreen = !settings->video.fullscreen;
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
break; break;
case EVENT_CMD_COMMAND_DEINIT: case EVENT_CMD_COMMAND_DEINIT:
input_driver_deinit_command(); input_driver_deinit_command();
break; break;
case EVENT_CMD_COMMAND_INIT: case EVENT_CMD_COMMAND_INIT:
event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL); command_event(EVENT_CMD_COMMAND_DEINIT, NULL);
input_driver_init_command(); input_driver_init_command();
break; break;
case EVENT_CMD_REMOTE_DEINIT: case EVENT_CMD_REMOTE_DEINIT:
input_driver_deinit_remote(); input_driver_deinit_remote();
break; break;
case EVENT_CMD_REMOTE_INIT: case EVENT_CMD_REMOTE_INIT:
event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL); command_event(EVENT_CMD_REMOTE_DEINIT, NULL);
input_driver_init_remote(); input_driver_init_remote();
break; break;
case EVENT_CMD_TEMPORARY_CONTENT_DEINIT: case EVENT_CMD_TEMPORARY_CONTENT_DEINIT:

2
command_event.h
View File

@ -216,7 +216,7 @@ enum event_command
* *
* Returns: true (1) on success, otherwise false (0). * Returns: true (1) on success, otherwise false (0).
**/ **/
bool event_cmd_ctl(enum event_command action, void *data); bool command_event(enum event_command action, void *data);
#ifdef __cplusplus #ifdef __cplusplus
} }

6
content.c
View File

@ -901,9 +901,9 @@ bool content_load(content_ctx_info_t *info)
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_driver_ctl(RARCH_MENU_CTL_SHADER_MANAGER_INIT, NULL); menu_driver_ctl(RARCH_MENU_CTL_SHADER_MANAGER_INIT, NULL);
#endif #endif
event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); command_event(EVENT_CMD_HISTORY_INIT, NULL);
event_cmd_ctl(EVENT_CMD_RESUME, NULL); command_event(EVENT_CMD_RESUME, NULL);
event_cmd_ctl(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL); command_event(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL);
check_default_dirs(); check_default_dirs();

12
driver.c
View File

@ -207,7 +207,7 @@ static void driver_adjust_system_rates(void)
return; return;
if (runloop_ctl(RUNLOOP_CTL_IS_NONBLOCK_FORCED, NULL)) if (runloop_ctl(RUNLOOP_CTL_IS_NONBLOCK_FORCED, NULL))
event_cmd_ctl(EVENT_CMD_VIDEO_SET_NONBLOCKING_STATE, NULL); command_event(EVENT_CMD_VIDEO_SET_NONBLOCKING_STATE, NULL);
else else
driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL); driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL);
} }
@ -254,7 +254,7 @@ static bool driver_update_system_av_info(const struct retro_system_av_info *info
struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
memcpy(av_info, info, sizeof(*av_info)); memcpy(av_info, info, sizeof(*av_info));
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
/* Cannot continue recording with different parameters. /* Cannot continue recording with different parameters.
* Take the easiest route out and just restart the recording. */ * Take the easiest route out and just restart the recording. */
@ -263,8 +263,8 @@ static bool driver_update_system_av_info(const struct retro_system_av_info *info
runloop_msg_queue_push( runloop_msg_queue_push(
msg_hash_to_str(MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT), msg_hash_to_str(MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT),
2, 180, false); 2, 180, false);
event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); command_event(EVENT_CMD_RECORD_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_RECORD_INIT, NULL); command_event(EVENT_CMD_RECORD_INIT, NULL);
} }
return true; return true;
@ -286,8 +286,8 @@ static void menu_update_libretro_info(void)
if (!info) if (!info)
return; return;
event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); command_event(EVENT_CMD_CORE_INFO_INIT, NULL);
event_cmd_ctl(EVENT_CMD_LOAD_CORE_PERSIST, NULL); command_event(EVENT_CMD_LOAD_CORE_PERSIST, NULL);
} }
#endif #endif

2
dynamic.c
View File

@ -1245,7 +1245,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
/* Forces recomputation of aspect ratios if /* Forces recomputation of aspect ratios if
* using core-dependent aspect ratios. */ * using core-dependent aspect ratios. */
event_cmd_ctl(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL); command_event(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL);
/* TODO: Figure out what to do, if anything, with recording. */ /* TODO: Figure out what to do, if anything, with recording. */
} }

2
frontend/drivers/platform_ctr.c
View File

@ -95,7 +95,7 @@ static void frontend_ctr_deinit(void *data)
*verbose = true; *verbose = true;
#ifdef HAVE_FILE_LOGGER #ifdef HAVE_FILE_LOGGER
event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); command_event(EVENT_CMD_LOG_FILE_DEINIT, NULL);
#endif #endif
if(gfxBottomFramebuffers[0] == (u8*)currentConsole->frameBuffer) if(gfxBottomFramebuffers[0] == (u8*)currentConsole->frameBuffer)

8
frontend/drivers/platform_emscripten.c
View File

@ -44,22 +44,22 @@ static void emscripten_mainloop(void)
void cmd_savefiles(void) void cmd_savefiles(void)
{ {
event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL); command_event(EVENT_CMD_SAVEFILES, NULL);
} }
void cmd_save_state(void) void cmd_save_state(void)
{ {
event_cmd_ctl(EVENT_CMD_SAVE_STATE, NULL); command_event(EVENT_CMD_SAVE_STATE, NULL);
} }
void cmd_load_state(void) void cmd_load_state(void)
{ {
event_cmd_ctl(EVENT_CMD_LOAD_STATE, NULL); command_event(EVENT_CMD_LOAD_STATE, NULL);
} }
void cmd_take_screenshot(void) void cmd_take_screenshot(void)
{ {
event_cmd_ctl(EVENT_CMD_TAKE_SCREENSHOT, NULL); command_event(EVENT_CMD_TAKE_SCREENSHOT, NULL);
} }

2
frontend/drivers/platform_psp.c
View File

@ -163,7 +163,7 @@ static void frontend_psp_deinit(void *data)
*verbose = false; *verbose = false;
#ifdef HAVE_FILE_LOGGER #ifdef HAVE_FILE_LOGGER
event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); command_event(EVENT_CMD_LOG_FILE_DEINIT, NULL);
#endif #endif
#endif #endif

4
frontend/frontend.c
View File

@ -59,7 +59,7 @@ void main_exit(void *args)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL); command_event(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL);
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* Do not want menu context to live any more. */ /* Do not want menu context to live any more. */
@ -67,7 +67,7 @@ void main_exit(void *args)
#endif #endif
rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL); rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG, NULL); command_event(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG, NULL);
#if defined(HAVE_LOGGER) && !defined(ANDROID) #if defined(HAVE_LOGGER) && !defined(ANDROID)
logger_shutdown(); logger_shutdown();

4
gfx/drivers/ctr_gfx.c
View File

@ -512,13 +512,13 @@ static bool ctr_frame(void* data, const void* frame,
if(!aptMainLoop()) if(!aptMainLoop())
{ {
event_cmd_ctl(EVENT_CMD_QUIT, NULL); command_event(EVENT_CMD_QUIT, NULL);
return true; return true;
} }
if (select_pressed) if (select_pressed)
{ {
event_cmd_ctl(EVENT_CMD_QUIT, NULL); command_event(EVENT_CMD_QUIT, NULL);
return true; return true;
} }

10
gfx/video_driver.c
View File

@ -505,7 +505,7 @@ static void deinit_pixel_converter(void)
static bool uninit_video_input(void) static bool uninit_video_input(void)
{ {
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); command_event(EVENT_CMD_OVERLAY_DEINIT, NULL);
if (!video_driver_is_video_cache_context()) if (!video_driver_is_video_cache_context())
video_driver_deinit_hw_context(); video_driver_deinit_hw_context();
@ -526,7 +526,7 @@ static bool uninit_video_input(void)
deinit_pixel_converter(); deinit_pixel_converter();
deinit_video_filter(); deinit_video_filter();
event_cmd_ctl(EVENT_CMD_SHADER_DIR_DEINIT, NULL); command_event(EVENT_CMD_SHADER_DIR_DEINIT, NULL);
video_monitor_compute_fps_statistics(); video_monitor_compute_fps_statistics();
return true; return true;
@ -600,7 +600,7 @@ static bool init_video(void)
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
init_video_filter(video_driver_state.pix_fmt); init_video_filter(video_driver_state.pix_fmt);
event_cmd_ctl(EVENT_CMD_SHADER_DIR_INIT, NULL); command_event(EVENT_CMD_SHADER_DIR_INIT, NULL);
if (av_info) if (av_info)
geom = (const struct retro_game_geometry*)&av_info->geometry; geom = (const struct retro_game_geometry*)&av_info->geometry;
@ -742,8 +742,8 @@ static bool init_video(void)
init_video_input(tmp); init_video_input(tmp);
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); command_event(EVENT_CMD_OVERLAY_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); command_event(EVENT_CMD_OVERLAY_INIT, NULL);
video_driver_cached_frame_set(&dummy_pixels, 4, 4, 8); video_driver_cached_frame_set(&dummy_pixels, 4, 4, 8);

4
input/drivers/android_input.c
View File

@ -1067,7 +1067,7 @@ static void android_input_poll(void *data)
if (android_app->reinitRequested != 0) if (android_app->reinitRequested != 0)
{ {
if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL)) if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL))
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
android_app_write_cmd(android_app, APP_CMD_REINIT_DONE); android_app_write_cmd(android_app, APP_CMD_REINIT_DONE);
return; return;
} }
@ -1094,7 +1094,7 @@ bool android_run_events(void *data)
if (android_app->reinitRequested != 0) if (android_app->reinitRequested != 0)
{ {
if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL)) if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL))
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
android_app_write_cmd(android_app, APP_CMD_REINIT_DONE); android_app_write_cmd(android_app, APP_CMD_REINIT_DONE);
} }

2
input/drivers_joypad/ctr_joypad.c
View File

@ -170,7 +170,7 @@ static void ctr_joypad_poll(void)
(state_tmp & KEY_SELECT) && (state_tmp & KEY_SELECT) &&
(state_tmp & KEY_L) && (state_tmp & KEY_L) &&
(state_tmp & KEY_R)) (state_tmp & KEY_R))
event_cmd_ctl(EVENT_CMD_QUIT, NULL); command_event(EVENT_CMD_QUIT, NULL);
} }

2
menu/cbs/menu_cbs_left.c
View File

@ -369,7 +369,7 @@ static int core_setting_left(unsigned type, const char *label,
static int disk_options_disk_idx_left(unsigned type, const char *label, static int disk_options_disk_idx_left(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
event_cmd_ctl(EVENT_CMD_DISK_PREV, NULL); command_event(EVENT_CMD_DISK_PREV, NULL);
return 0; return 0;
} }

26
menu/cbs/menu_cbs_ok.c
View File

@ -506,7 +506,7 @@ static int file_load_with_detect_core_wrapper(size_t idx, size_t entry_idx,
switch (ret) switch (ret)
{ {
case -1: case -1:
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); command_event(EVENT_CMD_LOAD_CORE, NULL);
rarch_task_push_content_load_default(NULL, NULL, rarch_task_push_content_load_default(NULL, NULL,
false, CORE_TYPE_PLAIN, NULL, NULL); false, CORE_TYPE_PLAIN, NULL, NULL);
@ -695,7 +695,7 @@ static int action_ok_playlist_entry(const char *path,
static int action_ok_cheat_apply_changes(const char *path, static int action_ok_cheat_apply_changes(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
event_cmd_ctl(EVENT_CMD_CHEATS_APPLY, NULL); command_event(EVENT_CMD_CHEATS_APPLY, NULL);
return 0; return 0;
} }
@ -758,7 +758,7 @@ static int generic_action_ok(const char *path,
flush_char = NULL; flush_char = NULL;
flush_type = MENU_SETTINGS; flush_type = MENU_SETTINGS;
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, action_path); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, action_path);
if (event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL)) if (command_event(EVENT_CMD_LOAD_CORE, NULL))
{ {
#ifndef HAVE_DYNAMIC #ifndef HAVE_DYNAMIC
if (frontend_driver_set_fork(FRONTEND_FORK_CORE)) if (frontend_driver_set_fork(FRONTEND_FORK_CORE))
@ -818,8 +818,8 @@ static int generic_action_ok(const char *path,
case ACTION_OK_APPEND_DISK_IMAGE: case ACTION_OK_APPEND_DISK_IMAGE:
flush_char = NULL; flush_char = NULL;
flush_type = 49; flush_type = 49;
event_cmd_ctl(EVENT_CMD_DISK_APPEND_IMAGE, action_path); command_event(EVENT_CMD_DISK_APPEND_IMAGE, action_path);
event_cmd_ctl(EVENT_CMD_RESUME, NULL); command_event(EVENT_CMD_RESUME, NULL);
break; break;
case ACTION_OK_SET_PATH: case ACTION_OK_SET_PATH:
flush_char = NULL; flush_char = NULL;
@ -1236,7 +1236,7 @@ static int action_ok_file_load(const char *path,
static int generic_action_ok_command(enum event_command cmd) static int generic_action_ok_command(enum event_command cmd)
{ {
if (!event_cmd_ctl(cmd, NULL)) if (!command_event(cmd, NULL))
return menu_cbs_exit(); return menu_cbs_exit();
return 0; return 0;
} }
@ -1269,10 +1269,10 @@ static void cb_decompressed(void *task_data, void *user_data, const char *err)
switch (type_hash) switch (type_hash)
{ {
case CB_CORE_UPDATER_DOWNLOAD: case CB_CORE_UPDATER_DOWNLOAD:
event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); command_event(EVENT_CMD_CORE_INFO_INIT, NULL);
break; break;
case CB_UPDATE_ASSETS: case CB_UPDATE_ASSETS:
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
break; break;
} }
} }
@ -1414,7 +1414,7 @@ static void cb_generic_download(void *task_data,
switch (transf->type_hash) switch (transf->type_hash)
{ {
case CB_CORE_UPDATER_DOWNLOAD: case CB_CORE_UPDATER_DOWNLOAD:
event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); command_event(EVENT_CMD_CORE_INFO_INIT, NULL);
break; break;
} }
#endif #endif
@ -1708,7 +1708,7 @@ static int generic_action_ok_network(const char *path,
if (string_is_empty(settings->network.buildbot_url)) if (string_is_empty(settings->network.buildbot_url))
return menu_cbs_exit(); return menu_cbs_exit();
event_cmd_ctl(EVENT_CMD_NETWORK_INIT, NULL); command_event(EVENT_CMD_NETWORK_INIT, NULL);
switch (type_id) switch (type_id)
{ {
@ -2109,7 +2109,7 @@ static int action_ok_load_archive(const char *path,
fill_pathname_join(detect_content_path, menu_path, content_path, fill_pathname_join(detect_content_path, menu_path, content_path,
sizeof(detect_content_path)); sizeof(detect_content_path));
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); command_event(EVENT_CMD_LOAD_CORE, NULL);
rarch_task_push_content_load_default( rarch_task_push_content_load_default(
NULL, detect_content_path, false, CORE_TYPE_PLAIN, NULL, NULL); NULL, detect_content_path, false, CORE_TYPE_PLAIN, NULL, NULL);
@ -2153,7 +2153,7 @@ static int action_ok_load_archive_detect_core(const char *path,
switch (ret) switch (ret)
{ {
case -1: case -1:
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); command_event(EVENT_CMD_LOAD_CORE, NULL);
rarch_task_push_content_load_default(NULL, NULL, rarch_task_push_content_load_default(NULL, NULL,
false, CORE_TYPE_PLAIN, NULL, NULL); false, CORE_TYPE_PLAIN, NULL, NULL);
return 0; return 0;
@ -2228,7 +2228,7 @@ static int action_ok_video_resolution(const char *path,
{ {
char msg[PATH_MAX_LENGTH] = {0}; char msg[PATH_MAX_LENGTH] = {0};
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
#endif #endif
video_driver_set_video_mode(width, height, true); video_driver_set_video_mode(width, height, true);
#ifdef GEKKO #ifdef GEKKO

2
menu/cbs/menu_cbs_right.c
View File

@ -391,7 +391,7 @@ int core_setting_right(unsigned type, const char *label,
static int disk_options_disk_idx_right(unsigned type, const char *label, static int disk_options_disk_idx_right(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
event_cmd_ctl(EVENT_CMD_DISK_NEXT, NULL); command_event(EVENT_CMD_DISK_NEXT, NULL);
return 0; return 0;
} }

2
menu/cbs/menu_cbs_start.c
View File

@ -62,7 +62,7 @@ static int action_start_video_filter_file_load(unsigned type, const char *label)
return -1; return -1;
settings->path.softfilter_plugin[0] = '\0'; settings->path.softfilter_plugin[0] = '\0';
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
return 0; return 0;
} }

2
menu/drivers/nuklear.c
View File

@ -389,7 +389,7 @@ static bool nk_menu_init_list(void *data)
menu_entries_add(menu_stack, menu_entries_add(menu_stack,
info.path, info.label, info.type, info.flags, 0); info.path, info.label, info.type, info.flags, 0);
event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); command_event(EVENT_CMD_HISTORY_INIT, NULL);
info.list = selection_buf; info.list = selection_buf;

2
menu/drivers/zarch.c
View File

@ -1156,7 +1156,7 @@ static bool zarch_menu_init_list(void *data)
menu_entries_add(menu_stack, menu_entries_add(menu_stack,
info.path, info.label, info.type, info.flags, 0); info.path, info.label, info.type, info.flags, 0);
event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); command_event(EVENT_CMD_HISTORY_INIT, NULL);
info.list = selection_buf; info.list = selection_buf;

4
menu/menu_content.c
View File

@ -195,10 +195,10 @@ static bool menu_content_load_from_playlist(void *data)
else else
menu_driver_ctl(RARCH_MENU_CTL_SET_LOAD_NO_CONTENT, NULL); menu_driver_ctl(RARCH_MENU_CTL_SET_LOAD_NO_CONTENT, NULL);
if (!event_cmd_ctl(EVENT_CMD_EXEC, (void*)path)) if (!command_event(EVENT_CMD_EXEC, (void*)path))
return false; return false;
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); command_event(EVENT_CMD_LOAD_CORE, NULL);
return true; return true;

2
menu/menu_displaylist.c
View File

@ -3775,7 +3775,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
content_playlist_t *playlist = g_defaults.history; content_playlist_t *playlist = g_defaults.history;
if (!playlist) if (!playlist)
event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); command_event(EVENT_CMD_HISTORY_INIT, NULL);
strlcpy(path_playlist, "history", sizeof(path_playlist)); strlcpy(path_playlist, "history", sizeof(path_playlist));

16
menu/menu_driver.c
View File

@ -115,7 +115,7 @@ static void bundle_decompressed(void *task_data,
decompress_task_data_t *dec = (decompress_task_data_t*)task_data; decompress_task_data_t *dec = (decompress_task_data_t*)task_data;
if (dec && !err) if (dec && !err)
event_cmd_ctl(EVENT_CMD_REINIT, NULL); command_event(EVENT_CMD_REINIT, NULL);
if (err) if (err)
RARCH_ERR("%s", err); RARCH_ERR("%s", err);
@ -159,7 +159,7 @@ static bool menu_init(menu_handle_t *menu_data)
menu_data->push_help_screen = true; menu_data->push_help_screen = true;
menu_data->help_screen_type = MENU_HELP_WELCOME; menu_data->help_screen_type = MENU_HELP_WELCOME;
settings->menu_show_start_screen = false; settings->menu_show_start_screen = false;
event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL); command_event(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL);
} }
if ( settings->bundle_assets_extract_enable if ( settings->bundle_assets_extract_enable
@ -245,12 +245,12 @@ static void menu_driver_toggle(bool latch)
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
/* Menu should always run with vsync on. */ /* Menu should always run with vsync on. */
event_cmd_ctl(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL); command_event(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL);
/* Stop all rumbling before entering the menu. */ /* Stop all rumbling before entering the menu. */
event_cmd_ctl(EVENT_CMD_RUMBLE_STOP, NULL); command_event(EVENT_CMD_RUMBLE_STOP, NULL);
if (settings->menu.pause_libretro) if (settings->menu.pause_libretro)
event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); command_event(EVENT_CMD_AUDIO_STOP, NULL);
/* Override keyboard callback to redirect to menu instead. /* Override keyboard callback to redirect to menu instead.
* We'll use this later for something ... */ * We'll use this later for something ... */
@ -269,7 +269,7 @@ static void menu_driver_toggle(bool latch)
driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL); driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL);
if (settings && settings->menu.pause_libretro) if (settings && settings->menu.pause_libretro)
event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); command_event(EVENT_CMD_AUDIO_START, NULL);
/* Prevent stray input from going to libretro core */ /* Prevent stray input from going to libretro core */
input_driver_set_flushing_input(); input_driver_set_flushing_input();
@ -565,7 +565,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_display_deinit(); menu_display_deinit();
menu_entries_ctl(MENU_ENTRIES_CTL_DEINIT, NULL); menu_entries_ctl(MENU_ENTRIES_CTL_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); command_event(EVENT_CMD_HISTORY_DEINIT, NULL);
core_info_deinit_list(); core_info_deinit_list();
core_info_free_current_core(); core_info_free_current_core();
@ -860,7 +860,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
if (menu_driver_ctl(RARCH_MENU_CTL_IS_PENDING_SHUTDOWN, NULL)) if (menu_driver_ctl(RARCH_MENU_CTL_IS_PENDING_SHUTDOWN, NULL))
{ {
menu_driver_ctl(RARCH_MENU_CTL_UNSET_PENDING_SHUTDOWN, NULL); menu_driver_ctl(RARCH_MENU_CTL_UNSET_PENDING_SHUTDOWN, NULL);
if (!event_cmd_ctl(EVENT_CMD_QUIT, NULL)) if (!command_event(EVENT_CMD_QUIT, NULL))
return false; return false;
return true; return true;
} }

12
menu/menu_setting.c
View File

@ -2690,7 +2690,7 @@ static int setting_action_ok_video_refresh_rate_auto(void *data, bool wraparound
float video_refresh_rate_float = (float)video_refresh_rate; float video_refresh_rate_float = (float)video_refresh_rate;
driver_ctl(RARCH_DRIVER_CTL_SET_REFRESH_RATE, &video_refresh_rate_float); driver_ctl(RARCH_DRIVER_CTL_SET_REFRESH_RATE, &video_refresh_rate_float);
/* Incase refresh rate update forced non-block video. */ /* Incase refresh rate update forced non-block video. */
event_cmd_ctl(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL); command_event(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL);
} }
if (setting_generic_action_ok_default(setting, wraparound) != 0) if (setting_generic_action_ok_default(setting, wraparound) != 0)
@ -2750,7 +2750,7 @@ static int setting_action_action_ok(void *data, bool wraparound)
(void)wraparound; (void)wraparound;
if (setting->cmd_trigger.idx != EVENT_CMD_NONE) if (setting->cmd_trigger.idx != EVENT_CMD_NONE)
event_cmd_ctl(setting->cmd_trigger.idx, NULL); command_event(setting->cmd_trigger.idx, NULL);
return 0; return 0;
} }
@ -3063,7 +3063,7 @@ void general_write_handler(void *data)
} }
if (rarch_cmd || setting->cmd_trigger.triggered) if (rarch_cmd || setting->cmd_trigger.triggered)
event_cmd_ctl(rarch_cmd, NULL); command_event(rarch_cmd, NULL);
} }
static void setting_add_special_callbacks( static void setting_add_special_callbacks(
@ -3116,14 +3116,14 @@ static void overlay_enable_toggle_change_handler(void *data)
if (settings && settings->input.overlay_hide_in_menu) if (settings && settings->input.overlay_hide_in_menu)
{ {
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); command_event(EVENT_CMD_OVERLAY_DEINIT, NULL);
return; return;
} }
if (setting->value.target.boolean) if (setting->value.target.boolean)
event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); command_event(EVENT_CMD_OVERLAY_INIT, NULL);
else else
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); command_event(EVENT_CMD_OVERLAY_DEINIT, NULL);
} }
#endif #endif

6
network/netplay.c
View File

@ -276,11 +276,11 @@ static bool netplay_get_cmd(netplay_t *netplay)
return netplay_cmd_nak(netplay); return netplay_cmd_nak(netplay);
case NETPLAY_CMD_PAUSE: case NETPLAY_CMD_PAUSE:
event_cmd_ctl(EVENT_CMD_PAUSE, NULL); command_event(EVENT_CMD_PAUSE, NULL);
return netplay_cmd_ack(netplay); return netplay_cmd_ack(netplay);
case NETPLAY_CMD_RESUME: case NETPLAY_CMD_RESUME:
event_cmd_ctl(EVENT_CMD_UNPAUSE, NULL); command_event(EVENT_CMD_UNPAUSE, NULL);
return netplay_cmd_ack(netplay); return netplay_cmd_ack(netplay);
default: break; default: break;
@ -1163,7 +1163,7 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
{ {
bool *state = (bool*)data; bool *state = (bool*)data;
if (*state) if (*state)
event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); command_event(EVENT_CMD_FULLSCREEN_TOGGLE, NULL);
} }
break; break;
default: default:

8
record/record_driver.c
View File

@ -198,7 +198,7 @@ void recording_dump_frame(const void *data, unsigned width,
{ {
RARCH_WARN("%s \n", RARCH_WARN("%s \n",
msg_hash_to_str(MSG_VIEWPORT_SIZE_CALCULATION_FAILED)); msg_hash_to_str(MSG_VIEWPORT_SIZE_CALCULATION_FAILED));
event_cmd_ctl(EVENT_CMD_GPU_RECORD_DEINIT, NULL); command_event(EVENT_CMD_GPU_RECORD_DEINIT, NULL);
recording_dump_frame(data, width, height, pitch); recording_dump_frame(data, width, height, pitch);
return; return;
@ -213,7 +213,7 @@ void recording_dump_frame(const void *data, unsigned width,
runloop_msg_queue_push( runloop_msg_queue_push(
msg_hash_to_str(MSG_RECORDING_TERMINATED_DUE_TO_RESIZE), msg_hash_to_str(MSG_RECORDING_TERMINATED_DUE_TO_RESIZE),
1, 180, true); 1, 180, true);
event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); command_event(EVENT_CMD_RECORD_DEINIT, NULL);
return; return;
} }
@ -256,7 +256,7 @@ bool recording_deinit(void)
recording_data = NULL; recording_data = NULL;
recording_driver = NULL; recording_driver = NULL;
event_cmd_ctl(EVENT_CMD_GPU_RECORD_DEINIT, NULL); command_event(EVENT_CMD_GPU_RECORD_DEINIT, NULL);
return true; return true;
} }
@ -425,7 +425,7 @@ bool recording_init(void)
if (!record_driver_init_first(&recording_driver, &recording_data, &params)) if (!record_driver_init_first(&recording_driver, &recording_data, &params))
{ {
RARCH_ERR("%s\n", msg_hash_to_str(MSG_FAILED_TO_START_RECORDING)); RARCH_ERR("%s\n", msg_hash_to_str(MSG_FAILED_TO_START_RECORDING));
event_cmd_ctl(EVENT_CMD_GPU_RECORD_DEINIT, NULL); command_event(EVENT_CMD_GPU_RECORD_DEINIT, NULL);
return false; return false;
} }

58
retroarch.c
View File

@ -1069,7 +1069,7 @@ static void retroarch_init_savefile_paths(void)
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
event_cmd_ctl(EVENT_CMD_SAVEFILES_DEINIT, NULL); command_event(EVENT_CMD_SAVEFILES_DEINIT, NULL);
global->savefiles = string_list_new(); global->savefiles = string_list_new();
retro_assert(global->savefiles); retro_assert(global->savefiles);
@ -1299,25 +1299,25 @@ static int retroarch_main_init(int argc, char *argv[])
} }
driver_ctl(RARCH_DRIVER_CTL_INIT_PRE, NULL); driver_ctl(RARCH_DRIVER_CTL_INIT_PRE, NULL);
if (!event_cmd_ctl(EVENT_CMD_CORE_INIT, &current_core_type)) if (!command_event(EVENT_CMD_CORE_INIT, &current_core_type))
goto error; goto error;
driver_ctl(RARCH_DRIVER_CTL_INIT_ALL, NULL); driver_ctl(RARCH_DRIVER_CTL_INIT_ALL, NULL);
event_cmd_ctl(EVENT_CMD_COMMAND_INIT, NULL); command_event(EVENT_CMD_COMMAND_INIT, NULL);
event_cmd_ctl(EVENT_CMD_REMOTE_INIT, NULL); command_event(EVENT_CMD_REMOTE_INIT, NULL);
event_cmd_ctl(EVENT_CMD_REWIND_INIT, NULL); command_event(EVENT_CMD_REWIND_INIT, NULL);
event_cmd_ctl(EVENT_CMD_CONTROLLERS_INIT, NULL); command_event(EVENT_CMD_CONTROLLERS_INIT, NULL);
event_cmd_ctl(EVENT_CMD_RECORD_INIT, NULL); command_event(EVENT_CMD_RECORD_INIT, NULL);
event_cmd_ctl(EVENT_CMD_CHEATS_INIT, NULL); command_event(EVENT_CMD_CHEATS_INIT, NULL);
event_cmd_ctl(EVENT_CMD_SAVEFILES_INIT, NULL); command_event(EVENT_CMD_SAVEFILES_INIT, NULL);
event_cmd_ctl(EVENT_CMD_SET_PER_GAME_RESOLUTION, NULL); command_event(EVENT_CMD_SET_PER_GAME_RESOLUTION, NULL);
rarch_ctl(RARCH_CTL_UNSET_ERROR_ON_INIT, NULL); rarch_ctl(RARCH_CTL_UNSET_ERROR_ON_INIT, NULL);
rarch_ctl(RARCH_CTL_SET_INITED, NULL); rarch_ctl(RARCH_CTL_SET_INITED, NULL);
return 0; return 0;
error: error:
event_cmd_ctl(EVENT_CMD_CORE_DEINIT, NULL); command_event(EVENT_CMD_CORE_DEINIT, NULL);
rarch_ctl(RARCH_CTL_UNSET_INITED, NULL); rarch_ctl(RARCH_CTL_UNSET_INITED, NULL);
return 1; return 1;
} }
@ -1382,7 +1382,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, NULL); runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, NULL);
driver_ctl(RARCH_DRIVER_CTL_UNINIT_ALL, NULL); driver_ctl(RARCH_DRIVER_CTL_UNINIT_ALL, NULL);
event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); command_event(EVENT_CMD_LOG_FILE_DEINIT, NULL);
runloop_ctl(RUNLOOP_CTL_STATE_FREE, NULL); runloop_ctl(RUNLOOP_CTL_STATE_FREE, NULL);
runloop_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL); runloop_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL);
@ -1399,33 +1399,33 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
if (!config_realloc()) if (!config_realloc())
return false; return false;
event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); command_event(EVENT_CMD_HISTORY_DEINIT, NULL);
runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL); runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL);
break; break;
case RARCH_CTL_MAIN_DEINIT: case RARCH_CTL_MAIN_DEINIT:
if (!rarch_ctl(RARCH_CTL_IS_INITED, NULL)) if (!rarch_ctl(RARCH_CTL_IS_INITED, NULL))
return false; return false;
event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL); command_event(EVENT_CMD_NETPLAY_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL); command_event(EVENT_CMD_COMMAND_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL); command_event(EVENT_CMD_REMOTE_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL); command_event(EVENT_CMD_AUTOSAVE_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); command_event(EVENT_CMD_RECORD_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL); command_event(EVENT_CMD_SAVEFILES, NULL);
event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL); command_event(EVENT_CMD_REWIND_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_CHEATS_DEINIT, NULL); command_event(EVENT_CMD_CHEATS_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); command_event(EVENT_CMD_BSV_MOVIE_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_AUTOSAVE_STATE, NULL); command_event(EVENT_CMD_AUTOSAVE_STATE, NULL);
event_cmd_ctl(EVENT_CMD_CORE_DEINIT, NULL); command_event(EVENT_CMD_CORE_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL); command_event(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL); command_event(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_SAVEFILES_DEINIT, NULL); command_event(EVENT_CMD_SAVEFILES_DEINIT, NULL);
rarch_ctl(RARCH_CTL_UNSET_INITED, NULL); rarch_ctl(RARCH_CTL_UNSET_INITED, NULL);
break; break;
@ -1511,7 +1511,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
#endif #endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (settings->input.overlay_hide_in_menu) if (settings->input.overlay_hide_in_menu)
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); command_event(EVENT_CMD_OVERLAY_DEINIT, NULL);
#endif #endif
break; break;
case RARCH_CTL_LOAD_CONTENT: case RARCH_CTL_LOAD_CONTENT:
@ -1533,7 +1533,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
video_driver_set_texture_enable(false, false); video_driver_set_texture_enable(false, false);
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (settings && settings->input.overlay_hide_in_menu) if (settings && settings->input.overlay_hide_in_menu)
event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); command_event(EVENT_CMD_OVERLAY_INIT, NULL);
#endif #endif
break; break;
case RARCH_CTL_QUIT: case RARCH_CTL_QUIT:

50
runloop.c
View File

@ -186,7 +186,7 @@ static bool runloop_check_movie_playback(void)
msg_hash_to_str(MSG_MOVIE_PLAYBACK_ENDED), 1, 180, false); msg_hash_to_str(MSG_MOVIE_PLAYBACK_ENDED), 1, 180, false);
RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_PLAYBACK_ENDED)); RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_PLAYBACK_ENDED));
event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); command_event(EVENT_CMD_BSV_MOVIE_DEINIT, NULL);
bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_END, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_END, NULL);
bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_PLAYBACK, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_PLAYBACK, NULL);
@ -204,7 +204,7 @@ static bool runloop_check_movie_record(void)
msg_hash_to_str(MSG_MOVIE_RECORD_STOPPED), 2, 180, true); msg_hash_to_str(MSG_MOVIE_RECORD_STOPPED), 2, 180, true);
RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_RECORD_STOPPED)); RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_RECORD_STOPPED));
event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); command_event(EVENT_CMD_BSV_MOVIE_DEINIT, NULL);
return true; return true;
} }
@ -295,7 +295,7 @@ static bool check_pause(settings_t *settings,
old_focus = focus; old_focus = focus;
if (cmd != EVENT_CMD_NONE) if (cmd != EVENT_CMD_NONE)
event_cmd_ctl(cmd, NULL); command_event(cmd, NULL);
if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL) == old_is_paused) if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL) == old_is_paused)
return false; return false;
@ -394,7 +394,7 @@ static bool shader_dir_init(rarch_dir_list_t *dir_list)
if (!dir_list->list || dir_list->list->size == 0) if (!dir_list->list || dir_list->list->size == 0)
{ {
event_cmd_ctl(EVENT_CMD_SHADER_DIR_DEINIT, NULL); command_event(EVENT_CMD_SHADER_DIR_DEINIT, NULL);
return false; return false;
} }
@ -517,10 +517,10 @@ static bool runloop_check_state(event_cmd_state_t *cmd, rarch_dir_list_t *shader
return false; return false;
if (runloop_cmd_triggered(cmd, RARCH_SCREENSHOT)) if (runloop_cmd_triggered(cmd, RARCH_SCREENSHOT))
event_cmd_ctl(EVENT_CMD_TAKE_SCREENSHOT, NULL); command_event(EVENT_CMD_TAKE_SCREENSHOT, NULL);
if (runloop_cmd_triggered(cmd, RARCH_MUTE)) if (runloop_cmd_triggered(cmd, RARCH_MUTE))
event_cmd_ctl(EVENT_CMD_AUDIO_MUTE_TOGGLE, NULL); command_event(EVENT_CMD_AUDIO_MUTE_TOGGLE, NULL);
if (runloop_cmd_triggered(cmd, RARCH_OSK)) if (runloop_cmd_triggered(cmd, RARCH_OSK))
{ {
@ -534,9 +534,9 @@ static bool runloop_check_state(event_cmd_state_t *cmd, rarch_dir_list_t *shader
} }
if (runloop_cmd_press(cmd, RARCH_VOLUME_UP)) if (runloop_cmd_press(cmd, RARCH_VOLUME_UP))
event_cmd_ctl(EVENT_CMD_VOLUME_UP, NULL); command_event(EVENT_CMD_VOLUME_UP, NULL);
else if (runloop_cmd_press(cmd, RARCH_VOLUME_DOWN)) else if (runloop_cmd_press(cmd, RARCH_VOLUME_DOWN))
event_cmd_ctl(EVENT_CMD_VOLUME_DOWN, NULL); command_event(EVENT_CMD_VOLUME_DOWN, NULL);
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
tmp = runloop_cmd_triggered(cmd, RARCH_NETPLAY_FLIP); tmp = runloop_cmd_triggered(cmd, RARCH_NETPLAY_FLIP);
@ -557,9 +557,9 @@ static bool runloop_check_state(event_cmd_state_t *cmd, rarch_dir_list_t *shader
); );
if (runloop_cmd_triggered(cmd, RARCH_SAVE_STATE_KEY)) if (runloop_cmd_triggered(cmd, RARCH_SAVE_STATE_KEY))
event_cmd_ctl(EVENT_CMD_SAVE_STATE, NULL); command_event(EVENT_CMD_SAVE_STATE, NULL);
else if (runloop_cmd_triggered(cmd, RARCH_LOAD_STATE_KEY)) else if (runloop_cmd_triggered(cmd, RARCH_LOAD_STATE_KEY))
event_cmd_ctl(EVENT_CMD_LOAD_STATE, NULL); command_event(EVENT_CMD_LOAD_STATE, NULL);
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
if(!settings->cheevos.hardcore_mode_enable) if(!settings->cheevos.hardcore_mode_enable)
@ -578,14 +578,14 @@ static bool runloop_check_state(event_cmd_state_t *cmd, rarch_dir_list_t *shader
runloop_cmd_triggered(cmd, RARCH_SHADER_PREV)); runloop_cmd_triggered(cmd, RARCH_SHADER_PREV));
if (runloop_cmd_triggered(cmd, RARCH_DISK_EJECT_TOGGLE)) if (runloop_cmd_triggered(cmd, RARCH_DISK_EJECT_TOGGLE))
event_cmd_ctl(EVENT_CMD_DISK_EJECT_TOGGLE, NULL); command_event(EVENT_CMD_DISK_EJECT_TOGGLE, NULL);
else if (runloop_cmd_triggered(cmd, RARCH_DISK_NEXT)) else if (runloop_cmd_triggered(cmd, RARCH_DISK_NEXT))
event_cmd_ctl(EVENT_CMD_DISK_NEXT, NULL); command_event(EVENT_CMD_DISK_NEXT, NULL);
else if (runloop_cmd_triggered(cmd, RARCH_DISK_PREV)) else if (runloop_cmd_triggered(cmd, RARCH_DISK_PREV))
event_cmd_ctl(EVENT_CMD_DISK_PREV, NULL); command_event(EVENT_CMD_DISK_PREV, NULL);
if (runloop_cmd_triggered(cmd, RARCH_RESET)) if (runloop_cmd_triggered(cmd, RARCH_RESET))
event_cmd_ctl(EVENT_CMD_RESET, NULL); command_event(EVENT_CMD_RESET, NULL);
cheat_manager_state_checks( cheat_manager_state_checks(
runloop_cmd_triggered(cmd, RARCH_CHEAT_INDEX_PLUS), runloop_cmd_triggered(cmd, RARCH_CHEAT_INDEX_PLUS),
@ -611,7 +611,7 @@ static bool runloop_check_pause_state(event_cmd_state_t *cmd)
if (runloop_cmd_triggered(cmd, RARCH_FULLSCREEN_TOGGLE_KEY)) if (runloop_cmd_triggered(cmd, RARCH_FULLSCREEN_TOGGLE_KEY))
{ {
event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); command_event(EVENT_CMD_FULLSCREEN_TOGGLE, NULL);
video_driver_cached_frame_render(); video_driver_cached_frame_render();
} }
@ -909,10 +909,10 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
case RUNLOOP_CTL_GLOBAL_FREE: case RUNLOOP_CTL_GLOBAL_FREE:
{ {
global_t *global = NULL; global_t *global = NULL;
event_cmd_ctl(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL); command_event(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL); command_event(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); command_event(EVENT_CMD_RECORD_DEINIT, NULL);
event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); command_event(EVENT_CMD_LOG_FILE_DEINIT, NULL);
rarch_ctl(RARCH_CTL_UNSET_BLOCK_CONFIG_READ, NULL); rarch_ctl(RARCH_CTL_UNSET_BLOCK_CONFIG_READ, NULL);
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL); runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
@ -1212,19 +1212,19 @@ static void runloop_iterate_linefeed_overlay(settings_t *settings)
{ {
input_driver_unset_onscreen_keyboard_enabled(); input_driver_unset_onscreen_keyboard_enabled();
prev_overlay_restore = true; prev_overlay_restore = true;
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); command_event(EVENT_CMD_OVERLAY_DEINIT, NULL);
} }
else if (!osk_enable && input_keyboard_ctl( else if (!osk_enable && input_keyboard_ctl(
RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL)) RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
{ {
input_driver_set_onscreen_keyboard_enabled(); input_driver_set_onscreen_keyboard_enabled();
prev_overlay_restore = false; prev_overlay_restore = false;
event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); command_event(EVENT_CMD_OVERLAY_INIT, NULL);
} }
else if (prev_overlay_restore) else if (prev_overlay_restore)
{ {
if (!settings->input.overlay_hide_in_menu) if (!settings->input.overlay_hide_in_menu)
event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); command_event(EVENT_CMD_OVERLAY_INIT, NULL);
prev_overlay_restore = false; prev_overlay_restore = false;
} }
} }
@ -1366,7 +1366,7 @@ int runloop_iterate(unsigned *sleep_ms)
cmd.state[2] = cmd.state[0] & ~cmd.state[1]; /* trigger */ cmd.state[2] = cmd.state[0] & ~cmd.state[1]; /* trigger */
if (runloop_cmd_triggered(cmd_ptr, RARCH_OVERLAY_NEXT)) if (runloop_cmd_triggered(cmd_ptr, RARCH_OVERLAY_NEXT))
event_cmd_ctl(EVENT_CMD_OVERLAY_NEXT, NULL); command_event(EVENT_CMD_OVERLAY_NEXT, NULL);
if (runloop_cmd_triggered(cmd_ptr, RARCH_FULLSCREEN_TOGGLE_KEY)) if (runloop_cmd_triggered(cmd_ptr, RARCH_FULLSCREEN_TOGGLE_KEY))
{ {
@ -1377,11 +1377,11 @@ int runloop_iterate(unsigned *sleep_ms)
#endif #endif
if (fullscreen_toggled) if (fullscreen_toggled)
event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); command_event(EVENT_CMD_FULLSCREEN_TOGGLE, NULL);
} }
if (runloop_cmd_triggered(cmd_ptr, RARCH_GRAB_MOUSE_TOGGLE)) if (runloop_cmd_triggered(cmd_ptr, RARCH_GRAB_MOUSE_TOGGLE))
event_cmd_ctl(EVENT_CMD_GRAB_MOUSE_TOGGLE, NULL); command_event(EVENT_CMD_GRAB_MOUSE_TOGGLE, NULL);
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (runloop_cmd_menu_press(cmd_ptr) || if (runloop_cmd_menu_press(cmd_ptr) ||

4
tasks/task_content.c
View File

@ -35,7 +35,7 @@ bool rarch_task_push_content_load_default(
if (core_path) if (core_path)
{ {
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); command_event(EVENT_CMD_LOAD_CORE, NULL);
} }
if (fullpath) if (fullpath)
@ -60,7 +60,7 @@ bool rarch_task_push_content_load_default(
} }
if (cmd != EVENT_CMD_NONE) if (cmd != EVENT_CMD_NONE)
event_cmd_ctl(cmd, NULL); command_event(cmd, NULL);
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUIT, NULL); menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUIT, NULL);

2
ui/drivers/ui_cocoa.m
View File

@ -568,7 +568,7 @@ static void *ui_companion_cocoa_init(void)
static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) static void ui_companion_cocoa_event_command(void *data, enum event_command cmd)
{ {
(void)data; (void)data;
event_cmd_ctl(cmd, NULL); command_event(cmd, NULL);
} }
static void ui_companion_cocoa_notify_list_pushed(void *data, static void ui_companion_cocoa_notify_list_pushed(void *data,

2
ui/drivers/ui_cocoatouch.m
View File

@ -76,7 +76,7 @@ static void ui_companion_cocoatouch_event_command(
void *data, enum event_command cmd) void *data, enum event_command cmd)
{ {
(void)data; (void)data;
event_cmd_ctl(cmd, NULL); command_event(cmd, NULL);
} }
static void rarch_draw_observer(CFRunLoopObserverRef observer, static void rarch_draw_observer(CFRunLoopObserverRef observer,

2
ui/drivers/ui_qt.c
View File

@ -108,7 +108,7 @@ static void ui_companion_qt_event_command(void *data, enum event_command cmd)
return; return;
slock_lock(handle->lock); slock_lock(handle->lock);
event_cmd_ctl(cmd, NULL); command_event(cmd, NULL);
slock_unlock(handle->lock); slock_unlock(handle->lock);
} }

2
ui/drivers/ui_win32.c
View File

@ -645,7 +645,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
} }
if (cmd != EVENT_CMD_NONE) if (cmd != EVENT_CMD_NONE)
event_cmd_ctl(cmd, NULL); command_event(cmd, NULL);
if (do_wm_close) if (do_wm_close)
PostMessage(owner, WM_CLOSE, 0, 0); PostMessage(owner, WM_CLOSE, 0, 0);