From a98ef36d360f23b927265a5bd45216fd66eb6859 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 9 May 2016 20:20:50 +0200 Subject: [PATCH] Rename event_cmd_ctl to command_event --- audio/audio_driver.c | 10 +-- cheevos.c | 6 +- command_event.c | 84 +++++++++++++------------- command_event.h | 2 +- content.c | 6 +- driver.c | 12 ++-- dynamic.c | 2 +- frontend/drivers/platform_ctr.c | 2 +- frontend/drivers/platform_emscripten.c | 8 +-- frontend/drivers/platform_psp.c | 2 +- frontend/frontend.c | 4 +- gfx/drivers/ctr_gfx.c | 4 +- gfx/video_driver.c | 10 +-- input/drivers/android_input.c | 4 +- input/drivers_joypad/ctr_joypad.c | 2 +- menu/cbs/menu_cbs_left.c | 2 +- menu/cbs/menu_cbs_ok.c | 26 ++++---- menu/cbs/menu_cbs_right.c | 2 +- menu/cbs/menu_cbs_start.c | 2 +- menu/drivers/nuklear.c | 2 +- menu/drivers/zarch.c | 2 +- menu/menu_content.c | 4 +- menu/menu_displaylist.c | 2 +- menu/menu_driver.c | 16 ++--- menu/menu_setting.c | 12 ++-- network/netplay.c | 6 +- record/record_driver.c | 8 +-- retroarch.c | 58 +++++++++--------- runloop.c | 50 +++++++-------- tasks/task_content.c | 4 +- ui/drivers/ui_cocoa.m | 2 +- ui/drivers/ui_cocoatouch.m | 2 +- ui/drivers/ui_qt.c | 2 +- ui/drivers/ui_win32.c | 2 +- 34 files changed, 181 insertions(+), 181 deletions(-) diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 18ef6ae84c..7d74c0b9a5 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -297,7 +297,7 @@ static bool uninit_audio(void) free(audio_driver_data.output_samples.buf); 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(); @@ -380,7 +380,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited) 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; } @@ -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"); } - event_cmd_ctl(EVENT_CMD_DSP_FILTER_INIT, NULL); + command_event(EVENT_CMD_DSP_FILTER_INIT, NULL); 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; if (settings->audio.mute_enable) - event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); - else if (!event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL)) + command_event(EVENT_CMD_AUDIO_STOP, NULL); + else if (!command_event(EVENT_CMD_AUDIO_START, NULL)) { audio_driver_unset_active(); return false; diff --git a/cheevos.c b/cheevos.c index de23ba515b..c3bc001a5f 100644 --- a/cheevos.c +++ b/cheevos.c @@ -2214,9 +2214,9 @@ bool cheevos_toggle_hardcore_mode(void) if (settings->cheevos.hardcore_mode_enable) { /* 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) - 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)); 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 { if (settings->rewind_enable) - event_cmd_ctl(EVENT_CMD_REWIND_INIT, NULL); + command_event(EVENT_CMD_REWIND_INIT, NULL); } return true; diff --git a/command_event.c b/command_event.c index 9e76c7e979..7f03348b73 100644 --- a/command_event.c +++ b/command_event.c @@ -212,7 +212,7 @@ static bool event_disk_control_append_image(const char *path) RARCH_LOG("%s\n", msg); 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. */ if (!*global->subsystem) @@ -225,7 +225,7 @@ static bool event_disk_control_append_image(const char *path) 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_eject(false, false); @@ -571,8 +571,8 @@ static bool event_init_content(void) msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD)); event_load_auto_state(); - event_cmd_ctl(EVENT_CMD_BSV_MOVIE_INIT, NULL); - event_cmd_ctl(EVENT_CMD_NETPLAY_INIT, NULL); + command_event(EVENT_CMD_BSV_MOVIE_INIT, NULL); + command_event(EVENT_CMD_NETPLAY_INIT, NULL); return true; } @@ -921,14 +921,14 @@ static bool event_cmd_exec(void *data) } /** - * event_cmd_ctl: + * command_event: * @cmd : Event command index. * * Performs program event command with index @cmd. * * 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; bool boolean = false; @@ -951,7 +951,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) { 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)) { @@ -970,7 +970,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) break; case EVENT_CMD_LOAD_CONTENT_PERSIST: #ifdef HAVE_DYNAMIC - event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); + command_event(EVENT_CMD_LOAD_CORE, NULL); #endif rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL); break; @@ -985,13 +985,13 @@ bool event_cmd_ctl(enum event_command cmd, void *data) case EVENT_CMD_LOAD_CONTENT: { #ifdef HAVE_DYNAMIC - event_cmd_ctl(EVENT_CMD_LOAD_CONTENT_PERSIST, NULL); + command_event(EVENT_CMD_LOAD_CONTENT_PERSIST, NULL); #else char *fullpath = NULL; runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, settings->path.libretro); - event_cmd_ctl(EVENT_CMD_EXEC, (void*)fullpath); - event_cmd_ctl(EVENT_CMD_QUIT, NULL); + command_event(EVENT_CMD_EXEC, (void*)fullpath); + command_event(EVENT_CMD_QUIT, NULL); #endif } break; @@ -1001,7 +1001,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) #endif break; 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 bool *ptr = NULL; @@ -1033,9 +1033,9 @@ bool event_cmd_ctl(enum event_command cmd, void *data) } break; 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 - event_cmd_ctl(EVENT_CMD_QUIT, NULL); + command_event(EVENT_CMD_QUIT, NULL); #endif break; case EVENT_CMD_LOAD_STATE: @@ -1069,7 +1069,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) settings->video.scale = *window_scale; 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); } @@ -1119,7 +1119,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) break; case EVENT_CMD_UNLOAD_CORE: 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; case EVENT_CMD_QUIT: 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_ack(); - event_cmd_ctl(EVENT_CMD_RESET_CONTEXT, NULL); + command_event(EVENT_CMD_RESET_CONTEXT, NULL); video_driver_unset_video_cache_context(); /* 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 menu_display_set_framebuffer_dirty_flag(); 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 } break; @@ -1157,7 +1157,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) cheat_manager_state_free(); break; case EVENT_CMD_CHEATS_INIT: - event_cmd_ctl(EVENT_CMD_CHEATS_DEINIT, NULL); + command_event(EVENT_CMD_CHEATS_DEINIT, NULL); event_init_cheats(); break; case EVENT_CMD_CHEATS_APPLY: @@ -1187,9 +1187,9 @@ bool event_cmd_ctl(enum event_command cmd, void *data) break; case EVENT_CMD_REWIND_TOGGLE: if (settings->rewind_enable) - event_cmd_ctl(EVENT_CMD_REWIND_INIT, NULL); + command_event(EVENT_CMD_REWIND_INIT, NULL); else - event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL); + command_event(EVENT_CMD_REWIND_DEINIT, NULL); break; case EVENT_CMD_AUTOSAVE_DEINIT: #ifdef HAVE_THREADS @@ -1202,7 +1202,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) #endif break; case EVENT_CMD_AUTOSAVE_INIT: - event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL); + command_event(EVENT_CMD_AUTOSAVE_DEINIT, NULL); #ifdef HAVE_THREADS autosave_init(); #endif @@ -1251,7 +1251,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) #endif break; case EVENT_CMD_OVERLAY_INIT: - event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); + command_event(EVENT_CMD_OVERLAY_DEINIT, NULL); #ifdef HAVE_OVERLAY input_overlay_init(); #endif @@ -1265,7 +1265,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) audio_driver_dsp_filter_free(); break; 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) break; 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; break; case EVENT_CMD_RECORD_INIT: - event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); + command_event(EVENT_CMD_HISTORY_DEINIT, NULL); if (!recording_init()) return false; break; @@ -1291,7 +1291,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) g_defaults.history = NULL; break; 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) return false; RARCH_LOG("%s: [%s].\n", @@ -1305,7 +1305,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) core_info_deinit_list(); break; 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) 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)) { 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) video_driver_cached_frame_render(); @@ -1426,40 +1426,40 @@ bool event_cmd_ctl(enum event_command cmd, void *data) else { 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; case EVENT_CMD_PAUSE_TOGGLE: boolean = runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL); boolean = !boolean; runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); - event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); + command_event(EVENT_CMD_PAUSE_CHECKS, NULL); break; case EVENT_CMD_UNPAUSE: boolean = false; runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); - event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); + command_event(EVENT_CMD_PAUSE_CHECKS, NULL); break; case EVENT_CMD_PAUSE: boolean = true; runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); - event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); + command_event(EVENT_CMD_PAUSE_CHECKS, NULL); break; case EVENT_CMD_MENU_PAUSE_LIBRETRO: #ifdef HAVE_MENU if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) { if (settings->menu.pause_libretro) - event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); + command_event(EVENT_CMD_AUDIO_STOP, NULL); else - event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); + command_event(EVENT_CMD_AUDIO_START, NULL); } else { if (settings->menu.pause_libretro) - event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); + command_event(EVENT_CMD_AUDIO_START, NULL); } #endif break; @@ -1467,7 +1467,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) runloop_ctl(RUNLOOP_CTL_SHADER_DIR_DEINIT, NULL); break; 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)) 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)); if (global->sram.use) - event_cmd_ctl(EVENT_CMD_AUTOSAVE_INIT, NULL); + command_event(EVENT_CMD_AUTOSAVE_INIT, NULL); } break; case EVENT_CMD_BSV_MOVIE_DEINIT: bsv_movie_ctl(BSV_MOVIE_CTL_DEINIT, NULL); break; 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); break; case EVENT_CMD_NETPLAY_DEINIT: @@ -1545,7 +1545,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) #endif break; case EVENT_CMD_NETPLAY_INIT: - event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL); + command_event(EVENT_CMD_NETPLAY_DEINIT, NULL); #ifdef HAVE_NETPLAY if (!init_netplay()) 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 * reinitialize to be safe. */ settings->video.fullscreen = !settings->video.fullscreen; - event_cmd_ctl(EVENT_CMD_REINIT, NULL); + command_event(EVENT_CMD_REINIT, NULL); break; case EVENT_CMD_COMMAND_DEINIT: input_driver_deinit_command(); break; case EVENT_CMD_COMMAND_INIT: - event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL); + command_event(EVENT_CMD_COMMAND_DEINIT, NULL); input_driver_init_command(); break; case EVENT_CMD_REMOTE_DEINIT: input_driver_deinit_remote(); break; case EVENT_CMD_REMOTE_INIT: - event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL); + command_event(EVENT_CMD_REMOTE_DEINIT, NULL); input_driver_init_remote(); break; case EVENT_CMD_TEMPORARY_CONTENT_DEINIT: diff --git a/command_event.h b/command_event.h index 28d74b7558..d51832314a 100644 --- a/command_event.h +++ b/command_event.h @@ -216,7 +216,7 @@ enum event_command * * 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 } diff --git a/content.c b/content.c index 6f10332dbc..82c58b81a1 100644 --- a/content.c +++ b/content.c @@ -901,9 +901,9 @@ bool content_load(content_ctx_info_t *info) #ifdef HAVE_MENU menu_driver_ctl(RARCH_MENU_CTL_SHADER_MANAGER_INIT, NULL); #endif - event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); - event_cmd_ctl(EVENT_CMD_RESUME, NULL); - event_cmd_ctl(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL); + command_event(EVENT_CMD_HISTORY_INIT, NULL); + command_event(EVENT_CMD_RESUME, NULL); + command_event(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL); check_default_dirs(); diff --git a/driver.c b/driver.c index c5bbe04d08..c5c4c05378 100644 --- a/driver.c +++ b/driver.c @@ -207,7 +207,7 @@ static void driver_adjust_system_rates(void) return; 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 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(); 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. * 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( msg_hash_to_str(MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT), 2, 180, false); - event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_RECORD_INIT, NULL); + command_event(EVENT_CMD_RECORD_DEINIT, NULL); + command_event(EVENT_CMD_RECORD_INIT, NULL); } return true; @@ -286,8 +286,8 @@ static void menu_update_libretro_info(void) if (!info) return; - event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); - event_cmd_ctl(EVENT_CMD_LOAD_CORE_PERSIST, NULL); + command_event(EVENT_CMD_CORE_INFO_INIT, NULL); + command_event(EVENT_CMD_LOAD_CORE_PERSIST, NULL); } #endif diff --git a/dynamic.c b/dynamic.c index df878f5628..395f24cf52 100644 --- a/dynamic.c +++ b/dynamic.c @@ -1245,7 +1245,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) /* Forces recomputation of aspect ratios if * 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. */ } diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index 7ba3ee9447..b7cb60c86a 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -95,7 +95,7 @@ static void frontend_ctr_deinit(void *data) *verbose = true; #ifdef HAVE_FILE_LOGGER - event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); + command_event(EVENT_CMD_LOG_FILE_DEINIT, NULL); #endif if(gfxBottomFramebuffers[0] == (u8*)currentConsole->frameBuffer) diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c index e0a9a33105..9d9d43bdaa 100644 --- a/frontend/drivers/platform_emscripten.c +++ b/frontend/drivers/platform_emscripten.c @@ -44,22 +44,22 @@ static void emscripten_mainloop(void) void cmd_savefiles(void) { - event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL); + command_event(EVENT_CMD_SAVEFILES, NULL); } 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) { - event_cmd_ctl(EVENT_CMD_LOAD_STATE, NULL); + command_event(EVENT_CMD_LOAD_STATE, NULL); } void cmd_take_screenshot(void) { - event_cmd_ctl(EVENT_CMD_TAKE_SCREENSHOT, NULL); + command_event(EVENT_CMD_TAKE_SCREENSHOT, NULL); } diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index b998ecdcd9..97cbadfd7a 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -163,7 +163,7 @@ static void frontend_psp_deinit(void *data) *verbose = false; #ifdef HAVE_FILE_LOGGER - event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); + command_event(EVENT_CMD_LOG_FILE_DEINIT, NULL); #endif #endif diff --git a/frontend/frontend.c b/frontend/frontend.c index 7922589f47..ac23b047a9 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -59,7 +59,7 @@ void main_exit(void *args) { 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 /* Do not want menu context to live any more. */ @@ -67,7 +67,7 @@ void main_exit(void *args) #endif 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) logger_shutdown(); diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index 31919122f2..a9cae9880a 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -512,13 +512,13 @@ static bool ctr_frame(void* data, const void* frame, if(!aptMainLoop()) { - event_cmd_ctl(EVENT_CMD_QUIT, NULL); + command_event(EVENT_CMD_QUIT, NULL); return true; } if (select_pressed) { - event_cmd_ctl(EVENT_CMD_QUIT, NULL); + command_event(EVENT_CMD_QUIT, NULL); return true; } diff --git a/gfx/video_driver.c b/gfx/video_driver.c index aafe362853..c711fa2cd5 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -505,7 +505,7 @@ static void deinit_pixel_converter(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()) video_driver_deinit_hw_context(); @@ -526,7 +526,7 @@ static bool uninit_video_input(void) deinit_pixel_converter(); 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(); return true; @@ -600,7 +600,7 @@ static bool init_video(void) runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); 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) geom = (const struct retro_game_geometry*)&av_info->geometry; @@ -742,8 +742,8 @@ static bool init_video(void) init_video_input(tmp); - event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); + command_event(EVENT_CMD_OVERLAY_DEINIT, NULL); + command_event(EVENT_CMD_OVERLAY_INIT, NULL); video_driver_cached_frame_set(&dummy_pixels, 4, 4, 8); diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 980ecdc1b0..312e9972d2 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -1067,7 +1067,7 @@ static void android_input_poll(void *data) if (android_app->reinitRequested != 0) { 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); return; } @@ -1094,7 +1094,7 @@ bool android_run_events(void *data) if (android_app->reinitRequested != 0) { 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); } diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c index 803339ffbf..8f8621f523 100644 --- a/input/drivers_joypad/ctr_joypad.c +++ b/input/drivers_joypad/ctr_joypad.c @@ -170,7 +170,7 @@ static void ctr_joypad_poll(void) (state_tmp & KEY_SELECT) && (state_tmp & KEY_L) && (state_tmp & KEY_R)) - event_cmd_ctl(EVENT_CMD_QUIT, NULL); + command_event(EVENT_CMD_QUIT, NULL); } diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index cbcb4763c3..9ae34ab732 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -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, bool wraparound) { - event_cmd_ctl(EVENT_CMD_DISK_PREV, NULL); + command_event(EVENT_CMD_DISK_PREV, NULL); return 0; } diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 59d9f1696c..44feb5477c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -506,7 +506,7 @@ static int file_load_with_detect_core_wrapper(size_t idx, size_t entry_idx, switch (ret) { 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, 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, 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; } @@ -758,7 +758,7 @@ static int generic_action_ok(const char *path, flush_char = NULL; flush_type = MENU_SETTINGS; 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 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: flush_char = NULL; flush_type = 49; - event_cmd_ctl(EVENT_CMD_DISK_APPEND_IMAGE, action_path); - event_cmd_ctl(EVENT_CMD_RESUME, NULL); + command_event(EVENT_CMD_DISK_APPEND_IMAGE, action_path); + command_event(EVENT_CMD_RESUME, NULL); break; case ACTION_OK_SET_PATH: 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) { - if (!event_cmd_ctl(cmd, NULL)) + if (!command_event(cmd, NULL)) return menu_cbs_exit(); return 0; } @@ -1269,10 +1269,10 @@ static void cb_decompressed(void *task_data, void *user_data, const char *err) switch (type_hash) { case CB_CORE_UPDATER_DOWNLOAD: - event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); + command_event(EVENT_CMD_CORE_INFO_INIT, NULL); break; case CB_UPDATE_ASSETS: - event_cmd_ctl(EVENT_CMD_REINIT, NULL); + command_event(EVENT_CMD_REINIT, NULL); break; } } @@ -1414,7 +1414,7 @@ static void cb_generic_download(void *task_data, switch (transf->type_hash) { case CB_CORE_UPDATER_DOWNLOAD: - event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); + command_event(EVENT_CMD_CORE_INFO_INIT, NULL); break; } #endif @@ -1708,7 +1708,7 @@ static int generic_action_ok_network(const char *path, if (string_is_empty(settings->network.buildbot_url)) return menu_cbs_exit(); - event_cmd_ctl(EVENT_CMD_NETWORK_INIT, NULL); + command_event(EVENT_CMD_NETWORK_INIT, NULL); 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, 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( 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) { 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, false, CORE_TYPE_PLAIN, NULL, NULL); return 0; @@ -2228,7 +2228,7 @@ static int action_ok_video_resolution(const char *path, { char msg[PATH_MAX_LENGTH] = {0}; #ifdef __CELLOS_LV2__ - event_cmd_ctl(EVENT_CMD_REINIT, NULL); + command_event(EVENT_CMD_REINIT, NULL); #endif video_driver_set_video_mode(width, height, true); #ifdef GEKKO diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index f57a1be697..f760cdc3d1 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -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, bool wraparound) { - event_cmd_ctl(EVENT_CMD_DISK_NEXT, NULL); + command_event(EVENT_CMD_DISK_NEXT, NULL); return 0; } diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index f6b467546a..e8f2b6ff59 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -62,7 +62,7 @@ static int action_start_video_filter_file_load(unsigned type, const char *label) return -1; settings->path.softfilter_plugin[0] = '\0'; - event_cmd_ctl(EVENT_CMD_REINIT, NULL); + command_event(EVENT_CMD_REINIT, NULL); return 0; } diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c index 598c5f9cca..88a946f272 100644 --- a/menu/drivers/nuklear.c +++ b/menu/drivers/nuklear.c @@ -389,7 +389,7 @@ static bool nk_menu_init_list(void *data) menu_entries_add(menu_stack, 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; diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 64b1971d99..64b21b98e7 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -1156,7 +1156,7 @@ static bool zarch_menu_init_list(void *data) menu_entries_add(menu_stack, 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; diff --git a/menu/menu_content.c b/menu/menu_content.c index c2b2d812aa..37785abe9c 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -195,10 +195,10 @@ static bool menu_content_load_from_playlist(void *data) else 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; - event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); + command_event(EVENT_CMD_LOAD_CORE, NULL); return true; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 7383c4ecdd..5853b338c1 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3775,7 +3775,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) content_playlist_t *playlist = g_defaults.history; if (!playlist) - event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); + command_event(EVENT_CMD_HISTORY_INIT, NULL); strlcpy(path_playlist, "history", sizeof(path_playlist)); diff --git a/menu/menu_driver.c b/menu/menu_driver.c index bd58fc6234..3d3d89c9e0 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -115,7 +115,7 @@ static void bundle_decompressed(void *task_data, decompress_task_data_t *dec = (decompress_task_data_t*)task_data; if (dec && !err) - event_cmd_ctl(EVENT_CMD_REINIT, NULL); + command_event(EVENT_CMD_REINIT, NULL); if (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->help_screen_type = MENU_HELP_WELCOME; 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 @@ -245,12 +245,12 @@ static void menu_driver_toggle(bool latch) menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh); /* 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. */ - event_cmd_ctl(EVENT_CMD_RUMBLE_STOP, NULL); + command_event(EVENT_CMD_RUMBLE_STOP, NULL); 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. * 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); 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 */ 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_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_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)) { 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 true; } diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 4082d89f68..7b61ef6ce6 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -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; driver_ctl(RARCH_DRIVER_CTL_SET_REFRESH_RATE, &video_refresh_rate_float); /* 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) @@ -2750,7 +2750,7 @@ static int setting_action_action_ok(void *data, bool wraparound) (void)wraparound; 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; } @@ -3063,7 +3063,7 @@ void general_write_handler(void *data) } if (rarch_cmd || setting->cmd_trigger.triggered) - event_cmd_ctl(rarch_cmd, NULL); + command_event(rarch_cmd, NULL); } 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) { - event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); + command_event(EVENT_CMD_OVERLAY_DEINIT, NULL); return; } if (setting->value.target.boolean) - event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); + command_event(EVENT_CMD_OVERLAY_INIT, NULL); else - event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); + command_event(EVENT_CMD_OVERLAY_DEINIT, NULL); } #endif diff --git a/network/netplay.c b/network/netplay.c index d7e39ef0a9..7b5a848a03 100644 --- a/network/netplay.c +++ b/network/netplay.c @@ -276,11 +276,11 @@ static bool netplay_get_cmd(netplay_t *netplay) return netplay_cmd_nak(netplay); case NETPLAY_CMD_PAUSE: - event_cmd_ctl(EVENT_CMD_PAUSE, NULL); + command_event(EVENT_CMD_PAUSE, NULL); return netplay_cmd_ack(netplay); case NETPLAY_CMD_RESUME: - event_cmd_ctl(EVENT_CMD_UNPAUSE, NULL); + command_event(EVENT_CMD_UNPAUSE, NULL); return netplay_cmd_ack(netplay); default: break; @@ -1163,7 +1163,7 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data) { bool *state = (bool*)data; if (*state) - event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); + command_event(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); } break; default: diff --git a/record/record_driver.c b/record/record_driver.c index e8ba91c8ce..625bfbdca7 100644 --- a/record/record_driver.c +++ b/record/record_driver.c @@ -198,7 +198,7 @@ void recording_dump_frame(const void *data, unsigned width, { RARCH_WARN("%s \n", 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); return; @@ -213,7 +213,7 @@ void recording_dump_frame(const void *data, unsigned width, runloop_msg_queue_push( msg_hash_to_str(MSG_RECORDING_TERMINATED_DUE_TO_RESIZE), 1, 180, true); - event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); + command_event(EVENT_CMD_RECORD_DEINIT, NULL); return; } @@ -256,7 +256,7 @@ bool recording_deinit(void) recording_data = NULL; recording_driver = NULL; - event_cmd_ctl(EVENT_CMD_GPU_RECORD_DEINIT, NULL); + command_event(EVENT_CMD_GPU_RECORD_DEINIT, NULL); return true; } @@ -425,7 +425,7 @@ bool recording_init(void) if (!record_driver_init_first(&recording_driver, &recording_data, ¶ms)) { 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; } diff --git a/retroarch.c b/retroarch.c index 6e3338d67c..cb2862d1c8 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1069,7 +1069,7 @@ static void retroarch_init_savefile_paths(void) 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(); 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); - if (!event_cmd_ctl(EVENT_CMD_CORE_INIT, ¤t_core_type)) + if (!command_event(EVENT_CMD_CORE_INIT, ¤t_core_type)) goto error; driver_ctl(RARCH_DRIVER_CTL_INIT_ALL, NULL); - event_cmd_ctl(EVENT_CMD_COMMAND_INIT, NULL); - event_cmd_ctl(EVENT_CMD_REMOTE_INIT, NULL); - event_cmd_ctl(EVENT_CMD_REWIND_INIT, NULL); - event_cmd_ctl(EVENT_CMD_CONTROLLERS_INIT, NULL); - event_cmd_ctl(EVENT_CMD_RECORD_INIT, NULL); - event_cmd_ctl(EVENT_CMD_CHEATS_INIT, NULL); - event_cmd_ctl(EVENT_CMD_SAVEFILES_INIT, NULL); - event_cmd_ctl(EVENT_CMD_SET_PER_GAME_RESOLUTION, NULL); + command_event(EVENT_CMD_COMMAND_INIT, NULL); + command_event(EVENT_CMD_REMOTE_INIT, NULL); + command_event(EVENT_CMD_REWIND_INIT, NULL); + command_event(EVENT_CMD_CONTROLLERS_INIT, NULL); + command_event(EVENT_CMD_RECORD_INIT, NULL); + command_event(EVENT_CMD_CHEATS_INIT, NULL); + command_event(EVENT_CMD_SAVEFILES_INIT, NULL); + command_event(EVENT_CMD_SET_PER_GAME_RESOLUTION, NULL); rarch_ctl(RARCH_CTL_UNSET_ERROR_ON_INIT, NULL); rarch_ctl(RARCH_CTL_SET_INITED, NULL); return 0; error: - event_cmd_ctl(EVENT_CMD_CORE_DEINIT, NULL); + command_event(EVENT_CMD_CORE_DEINIT, NULL); rarch_ctl(RARCH_CTL_UNSET_INITED, NULL); return 1; } @@ -1382,7 +1382,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, 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_GLOBAL_FREE, NULL); @@ -1399,33 +1399,33 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) if (!config_realloc()) return false; - event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); + command_event(EVENT_CMD_HISTORY_DEINIT, NULL); runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL); break; case RARCH_CTL_MAIN_DEINIT: if (!rarch_ctl(RARCH_CTL_IS_INITED, NULL)) return false; - event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL); + command_event(EVENT_CMD_NETPLAY_DEINIT, NULL); + command_event(EVENT_CMD_COMMAND_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); - event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL); + command_event(EVENT_CMD_RECORD_DEINIT, NULL); + command_event(EVENT_CMD_SAVEFILES, NULL); - event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_CHEATS_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); + command_event(EVENT_CMD_REWIND_DEINIT, NULL); + command_event(EVENT_CMD_CHEATS_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); - event_cmd_ctl(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_SAVEFILES_DEINIT, NULL); + command_event(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL); + command_event(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL); + command_event(EVENT_CMD_SAVEFILES_DEINIT, NULL); rarch_ctl(RARCH_CTL_UNSET_INITED, NULL); break; @@ -1511,7 +1511,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) #endif #ifdef HAVE_OVERLAY if (settings->input.overlay_hide_in_menu) - event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); + command_event(EVENT_CMD_OVERLAY_DEINIT, NULL); #endif break; 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); #ifdef HAVE_OVERLAY if (settings && settings->input.overlay_hide_in_menu) - event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); + command_event(EVENT_CMD_OVERLAY_INIT, NULL); #endif break; case RARCH_CTL_QUIT: diff --git a/runloop.c b/runloop.c index 214f8c053e..0653374ba0 100644 --- a/runloop.c +++ b/runloop.c @@ -186,7 +186,7 @@ static bool runloop_check_movie_playback(void) msg_hash_to_str(MSG_MOVIE_PLAYBACK_ENDED), 1, 180, false); 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_PLAYBACK, NULL); @@ -204,7 +204,7 @@ static bool runloop_check_movie_record(void) msg_hash_to_str(MSG_MOVIE_RECORD_STOPPED), 2, 180, true); 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; } @@ -295,7 +295,7 @@ static bool check_pause(settings_t *settings, old_focus = focus; 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) 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) { - event_cmd_ctl(EVENT_CMD_SHADER_DIR_DEINIT, NULL); + command_event(EVENT_CMD_SHADER_DIR_DEINIT, NULL); return false; } @@ -517,10 +517,10 @@ static bool runloop_check_state(event_cmd_state_t *cmd, rarch_dir_list_t *shader return false; 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)) - event_cmd_ctl(EVENT_CMD_AUDIO_MUTE_TOGGLE, NULL); + command_event(EVENT_CMD_AUDIO_MUTE_TOGGLE, NULL); 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)) - event_cmd_ctl(EVENT_CMD_VOLUME_UP, NULL); + command_event(EVENT_CMD_VOLUME_UP, NULL); 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 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)) - 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)) - event_cmd_ctl(EVENT_CMD_LOAD_STATE, NULL); + command_event(EVENT_CMD_LOAD_STATE, NULL); #ifdef HAVE_CHEEVOS 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)); 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)) - event_cmd_ctl(EVENT_CMD_DISK_NEXT, NULL); + command_event(EVENT_CMD_DISK_NEXT, NULL); 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)) - event_cmd_ctl(EVENT_CMD_RESET, NULL); + command_event(EVENT_CMD_RESET, NULL); cheat_manager_state_checks( 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)) { - event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); + command_event(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); video_driver_cached_frame_render(); } @@ -909,10 +909,10 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) case RUNLOOP_CTL_GLOBAL_FREE: { global_t *global = NULL; - event_cmd_ctl(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); - event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); + command_event(EVENT_CMD_TEMPORARY_CONTENT_DEINIT, NULL); + command_event(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT, NULL); + command_event(EVENT_CMD_RECORD_DEINIT, NULL); + command_event(EVENT_CMD_LOG_FILE_DEINIT, NULL); rarch_ctl(RARCH_CTL_UNSET_BLOCK_CONFIG_READ, 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(); 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( RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL)) { input_driver_set_onscreen_keyboard_enabled(); prev_overlay_restore = false; - event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); + command_event(EVENT_CMD_OVERLAY_INIT, NULL); } else if (prev_overlay_restore) { 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; } } @@ -1366,7 +1366,7 @@ int runloop_iterate(unsigned *sleep_ms) cmd.state[2] = cmd.state[0] & ~cmd.state[1]; /* trigger */ 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)) { @@ -1377,11 +1377,11 @@ int runloop_iterate(unsigned *sleep_ms) #endif 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)) - event_cmd_ctl(EVENT_CMD_GRAB_MOUSE_TOGGLE, NULL); + command_event(EVENT_CMD_GRAB_MOUSE_TOGGLE, NULL); #ifdef HAVE_MENU if (runloop_cmd_menu_press(cmd_ptr) || diff --git a/tasks/task_content.c b/tasks/task_content.c index 5169bb4f2e..c374098572 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -35,7 +35,7 @@ bool rarch_task_push_content_load_default( if (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) @@ -60,7 +60,7 @@ bool rarch_task_push_content_load_default( } if (cmd != EVENT_CMD_NONE) - event_cmd_ctl(cmd, NULL); + command_event(cmd, NULL); #ifdef HAVE_MENU menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUIT, NULL); diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index bce6069f9f..c6479608d8 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -568,7 +568,7 @@ static void *ui_companion_cocoa_init(void) static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) { (void)data; - event_cmd_ctl(cmd, NULL); + command_event(cmd, NULL); } static void ui_companion_cocoa_notify_list_pushed(void *data, diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 51e06cdd5f..59e24c9922 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -76,7 +76,7 @@ static void ui_companion_cocoatouch_event_command( void *data, enum event_command cmd) { (void)data; - event_cmd_ctl(cmd, NULL); + command_event(cmd, NULL); } static void rarch_draw_observer(CFRunLoopObserverRef observer, diff --git a/ui/drivers/ui_qt.c b/ui/drivers/ui_qt.c index b10ffa08e0..1ef89dfec0 100644 --- a/ui/drivers/ui_qt.c +++ b/ui/drivers/ui_qt.c @@ -108,7 +108,7 @@ static void ui_companion_qt_event_command(void *data, enum event_command cmd) return; slock_lock(handle->lock); - event_cmd_ctl(cmd, NULL); + command_event(cmd, NULL); slock_unlock(handle->lock); } diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index c433833b73..8d06d1ec53 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -645,7 +645,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam) } if (cmd != EVENT_CMD_NONE) - event_cmd_ctl(cmd, NULL); + command_event(cmd, NULL); if (do_wm_close) PostMessage(owner, WM_CLOSE, 0, 0);