diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 8861765c9e..0974330646 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -269,7 +269,7 @@ static bool uninit_audio(void) free(audio_driver_data.outsamples); audio_driver_data.outsamples = NULL; - event_command(EVENT_CMD_DSP_FILTER_DEINIT); + event_cmd_ctl(EVENT_CMD_DSP_FILTER_DEINIT, NULL); compute_audio_buffer_statistics(); @@ -348,7 +348,7 @@ static bool init_audio(void) if (!settings->audio.sync && audio_driver_ctl(RARCH_AUDIO_CTL_IS_ACTIVE, NULL)) { - event_command(EVENT_CMD_AUDIO_SET_NONBLOCKING_STATE); + event_cmd_ctl(EVENT_CMD_AUDIO_SET_NONBLOCKING_STATE, NULL); audio_driver_data.chunk_size = audio_driver_data.nonblock_chunk_size; } @@ -407,7 +407,7 @@ static bool init_audio(void) RARCH_WARN("Audio rate control was desired, but driver does not support needed features.\n"); } - event_command(EVENT_CMD_DSP_FILTER_INIT); + event_cmd_ctl(EVENT_CMD_DSP_FILTER_INIT, NULL); audio_driver_data.buffer_free_samples_count = 0; @@ -817,8 +817,8 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data) settings->audio.mute_enable = !settings->audio.mute_enable; if (settings->audio.mute_enable) - event_command(EVENT_CMD_AUDIO_STOP); - else if (!event_command(EVENT_CMD_AUDIO_START)) + event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); + else if (!event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL)) { audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_ACTIVE, NULL); return false; diff --git a/command_event.c b/command_event.c index 57fd227b18..d07d26f8e8 100644 --- a/command_event.c +++ b/command_event.c @@ -207,7 +207,7 @@ void event_disk_control_append_image(const char *path) RARCH_LOG("%s\n", msg); runloop_msg_queue_push(msg, 0, 180, true); - event_command(EVENT_CMD_AUTOSAVE_DEINIT); + event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL); /* TODO: Need to figure out what to do with subsystems case. */ if (!*global->subsystem) @@ -220,7 +220,7 @@ void event_disk_control_append_image(const char *path) rarch_ctl(RARCH_CTL_FILL_PATHNAMES, NULL); } - event_command(EVENT_CMD_AUTOSAVE_INIT); + event_cmd_ctl(EVENT_CMD_AUTOSAVE_INIT, NULL); event_disk_control_set_index(new_idx); event_disk_control_set_eject(false, false); } @@ -394,7 +394,7 @@ static void event_deinit_core(bool reinit) core.retro_deinit(); if (reinit) - event_command(EVENT_CMD_DRIVERS_DEINIT); + event_cmd_ctl(EVENT_CMD_DRIVERS_DEINIT, NULL); /* auto overrides: reload the original config */ if (runloop_ctl(RUNLOOP_CTL_IS_OVERRIDES_ACTIVE, NULL)) @@ -547,8 +547,8 @@ static bool event_init_content(void) msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD)); event_load_auto_state(); - event_command(EVENT_CMD_BSV_MOVIE_INIT); - event_command(EVENT_CMD_NETPLAY_INIT); + event_cmd_ctl(EVENT_CMD_BSV_MOVIE_INIT, NULL); + event_cmd_ctl(EVENT_CMD_NETPLAY_INIT, NULL); return true; } @@ -765,7 +765,7 @@ void event_save_current_config(void) config_save_file(global->path.core_specific_config); } - event_command(EVENT_CMD_AUTOSAVE_STATE); + event_cmd_ctl(EVENT_CMD_AUTOSAVE_STATE, NULL); } /** @@ -888,18 +888,17 @@ static bool event_update_system_info(struct retro_system_info *_info, #endif /** - * event_command: + * event_cmd_ctl: * @cmd : Event command index. * * Performs program event command with index @cmd. * * Returns: true (1) on success, otherwise false (0). **/ -bool event_command(enum event_command cmd) +bool event_cmd_ctl(enum event_command cmd, void *data) { unsigned i = 0; bool boolean = false; - global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); rarch_system_info_t *info = NULL; @@ -919,7 +918,7 @@ bool event_command(enum event_command cmd) { unsigned width = 0, height = 0; - event_command(EVENT_CMD_VIDEO_SET_ASPECT_RATIO); + event_cmd_ctl(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL); if (video_driver_get_video_output_size(&width, &height)) { @@ -935,7 +934,7 @@ bool event_command(enum event_command cmd) break; case EVENT_CMD_LOAD_CONTENT_PERSIST: #ifdef HAVE_DYNAMIC - event_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); #endif rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL); break; @@ -950,14 +949,14 @@ bool event_command(enum event_command cmd) case EVENT_CMD_LOAD_CONTENT: { #ifdef HAVE_DYNAMIC - event_command(EVENT_CMD_LOAD_CONTENT_PERSIST); + event_cmd_ctl(EVENT_CMD_LOAD_CONTENT_PERSIST, NULL); #else char *fullpath = NULL; runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)settings->libretro); rarch_environment_cb(RETRO_ENVIRONMENT_EXEC, (void*)fullpath); - event_command(EVENT_CMD_QUIT); + event_cmd_ctl(EVENT_CMD_QUIT, NULL); #endif } break; @@ -967,7 +966,7 @@ bool event_command(enum event_command cmd) #endif break; case EVENT_CMD_LOAD_CORE_PERSIST: - event_command(EVENT_CMD_LOAD_CORE_DEINIT); + event_cmd_ctl(EVENT_CMD_LOAD_CORE_DEINIT, NULL); { #ifdef HAVE_MENU bool *ptr = NULL; @@ -981,9 +980,9 @@ bool event_command(enum event_command cmd) } break; case EVENT_CMD_LOAD_CORE: - event_command(EVENT_CMD_LOAD_CORE_PERSIST); + event_cmd_ctl(EVENT_CMD_LOAD_CORE_PERSIST, NULL); #ifndef HAVE_DYNAMIC - event_command(EVENT_CMD_QUIT); + event_cmd_ctl(EVENT_CMD_QUIT, NULL); #endif break; case EVENT_CMD_LOAD_STATE: @@ -1011,7 +1010,7 @@ bool event_command(enum event_command cmd) settings->video.scale = *window_scale; if (!settings->video.fullscreen) - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); runloop_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx); } @@ -1038,7 +1037,7 @@ bool event_command(enum event_command cmd) /* bSNES since v073r01 resets controllers to JOYPAD * after a reset, so just enforce it here. */ - event_command(EVENT_CMD_CONTROLLERS_INIT); + event_cmd_ctl(EVENT_CMD_CONTROLLERS_INIT, NULL); break; case EVENT_CMD_SAVE_STATE: if (settings->savestate_auto_index) @@ -1060,7 +1059,7 @@ bool event_command(enum event_command cmd) break; case EVENT_CMD_UNLOAD_CORE: runloop_ctl(RUNLOOP_CTL_PREPARE_DUMMY, NULL); - event_command(EVENT_CMD_LOAD_CORE_DEINIT); + event_cmd_ctl(EVENT_CMD_LOAD_CORE_DEINIT, NULL); break; case EVENT_CMD_QUIT: rarch_ctl(RARCH_CTL_QUIT, NULL); @@ -1076,7 +1075,7 @@ bool event_command(enum event_command cmd) video_driver_ctl(RARCH_DISPLAY_CTL_UNSET_VIDEO_CACHE_CONTEXT, NULL); video_driver_ctl(RARCH_DISPLAY_CTL_UNSET_VIDEO_CACHE_CONTEXT_ACK, NULL); - event_command(EVENT_CMD_RESET_CONTEXT); + event_cmd_ctl(EVENT_CMD_RESET_CONTEXT, NULL); video_driver_ctl(RARCH_DISPLAY_CTL_UNSET_VIDEO_CACHE_CONTEXT, NULL); /* Poll input to avoid possibly stale data to corrupt things. */ @@ -1086,7 +1085,7 @@ bool event_command(enum event_command cmd) menu_display_ctl(MENU_DISPLAY_CTL_SET_FRAMEBUFFER_DIRTY_FLAG, NULL); if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) - event_command(EVENT_CMD_VIDEO_SET_BLOCKING_STATE); + event_cmd_ctl(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL); #endif } break; @@ -1094,7 +1093,7 @@ bool event_command(enum event_command cmd) cheat_manager_state_free(); break; case EVENT_CMD_CHEATS_INIT: - event_command(EVENT_CMD_CHEATS_DEINIT); + event_cmd_ctl(EVENT_CMD_CHEATS_DEINIT, NULL); event_init_cheats(); break; case EVENT_CMD_CHEATS_APPLY: @@ -1103,7 +1102,7 @@ bool event_command(enum event_command cmd) case EVENT_CMD_REMAPPING_DEINIT: break; case EVENT_CMD_REMAPPING_INIT: - event_command(EVENT_CMD_REMAPPING_DEINIT); + event_cmd_ctl(EVENT_CMD_REMAPPING_DEINIT, NULL); event_init_remapping(); break; case EVENT_CMD_REWIND_DEINIT: @@ -1121,9 +1120,9 @@ bool event_command(enum event_command cmd) break; case EVENT_CMD_REWIND_TOGGLE: if (settings->rewind_enable) - event_command(EVENT_CMD_REWIND_INIT); + event_cmd_ctl(EVENT_CMD_REWIND_INIT, NULL); else - event_command(EVENT_CMD_REWIND_DEINIT); + event_cmd_ctl(EVENT_CMD_REWIND_DEINIT, NULL); break; case EVENT_CMD_AUTOSAVE_DEINIT: #ifdef HAVE_THREADS @@ -1131,7 +1130,7 @@ bool event_command(enum event_command cmd) #endif break; case EVENT_CMD_AUTOSAVE_INIT: - event_command(EVENT_CMD_AUTOSAVE_DEINIT); + event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL); #ifdef HAVE_THREADS autosave_event_init(); #endif @@ -1179,7 +1178,7 @@ bool event_command(enum event_command cmd) #endif break; case EVENT_CMD_OVERLAY_INIT: - event_command(EVENT_CMD_OVERLAY_DEINIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); #ifdef HAVE_OVERLAY input_overlay_init(); #endif @@ -1193,7 +1192,7 @@ bool event_command(enum event_command cmd) audio_driver_dsp_filter_free(); break; case EVENT_CMD_DSP_FILTER_INIT: - event_command(EVENT_CMD_DSP_FILTER_DEINIT); + event_cmd_ctl(EVENT_CMD_DSP_FILTER_DEINIT, NULL); if (!*settings->audio.dsp_plugin) break; audio_driver_dsp_filter_init(settings->audio.dsp_plugin); @@ -1206,7 +1205,7 @@ bool event_command(enum event_command cmd) return false; break; case EVENT_CMD_RECORD_INIT: - event_command(EVENT_CMD_HISTORY_DEINIT); + event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); if (!recording_init()) return false; break; @@ -1219,7 +1218,7 @@ bool event_command(enum event_command cmd) g_defaults.history = NULL; break; case EVENT_CMD_HISTORY_INIT: - event_command(EVENT_CMD_HISTORY_DEINIT); + event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); if (!settings->history_list_enable) return false; RARCH_LOG("%s: [%s].\n", @@ -1233,7 +1232,7 @@ bool event_command(enum event_command cmd) runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_LIST_FREE, NULL); break; case EVENT_CMD_CORE_INFO_INIT: - event_command(EVENT_CMD_CORE_INFO_DEINIT); + event_cmd_ctl(EVENT_CMD_CORE_INFO_DEINIT, NULL); if (*settings->libretro_directory) runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_LIST_INIT, NULL); @@ -1305,11 +1304,11 @@ bool event_command(enum event_command cmd) memcpy(&hw_render, video_driver_callback(), sizeof(hw_render)); - event_command(EVENT_CMD_DRIVERS_DEINIT); + event_cmd_ctl(EVENT_CMD_DRIVERS_DEINIT, NULL); memcpy(video_driver_callback(), &hw_render, sizeof(hw_render)); - event_command(EVENT_CMD_DRIVERS_INIT); + event_cmd_ctl(EVENT_CMD_DRIVERS_INIT, NULL); } break; case EVENT_CMD_QUIT_RETROARCH: @@ -1351,7 +1350,7 @@ bool event_command(enum event_command cmd) if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL)) { RARCH_LOG("%s\n", msg_hash_to_str(MSG_PAUSED)); - event_command(EVENT_CMD_AUDIO_STOP); + event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); if (settings->video.black_frame_insertion) video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER, NULL); @@ -1359,40 +1358,40 @@ bool event_command(enum event_command cmd) else { RARCH_LOG("%s\n", msg_hash_to_str(MSG_UNPAUSED)); - event_command(EVENT_CMD_AUDIO_START); + event_cmd_ctl(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_command(EVENT_CMD_PAUSE_CHECKS); + event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); break; case EVENT_CMD_UNPAUSE: boolean = false; runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); - event_command(EVENT_CMD_PAUSE_CHECKS); + event_cmd_ctl(EVENT_CMD_PAUSE_CHECKS, NULL); break; case EVENT_CMD_PAUSE: boolean = true; runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean); - event_command(EVENT_CMD_PAUSE_CHECKS); + event_cmd_ctl(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_command(EVENT_CMD_AUDIO_STOP); + event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); else - event_command(EVENT_CMD_AUDIO_START); + event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); } else { if (settings->menu.pause_libretro) - event_command(EVENT_CMD_AUDIO_START); + event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); } #endif break; @@ -1400,54 +1399,63 @@ bool event_command(enum event_command cmd) runloop_ctl(RUNLOOP_CTL_SHADER_DIR_DEINIT, NULL); break; case EVENT_CMD_SHADER_DIR_INIT: - event_command(EVENT_CMD_SHADER_DIR_DEINIT); + event_cmd_ctl(EVENT_CMD_SHADER_DIR_DEINIT, NULL); if (!runloop_ctl(RUNLOOP_CTL_SHADER_DIR_INIT, NULL)) return false; break; case EVENT_CMD_SAVEFILES: - if (!global->savefiles || !global->sram.use) - return false; - - for (i = 0; i < global->savefiles->size; i++) { - unsigned type = global->savefiles->elems[i].attr.i; - const char *path = global->savefiles->elems[i].data; - RARCH_LOG("%s #%u %s \"%s\".\n", - msg_hash_to_str(MSG_SAVING_RAM_TYPE), - type, - msg_hash_to_str(MSG_TO), - path); - save_ram_file(path, type); + global_t *global = global_get_ptr(); + if (!global->savefiles || !global->sram.use) + return false; + + for (i = 0; i < global->savefiles->size; i++) + { + unsigned type = global->savefiles->elems[i].attr.i; + const char *path = global->savefiles->elems[i].data; + RARCH_LOG("%s #%u %s \"%s\".\n", + msg_hash_to_str(MSG_SAVING_RAM_TYPE), + type, + msg_hash_to_str(MSG_TO), + path); + save_ram_file(path, type); + } } return true; case EVENT_CMD_SAVEFILES_DEINIT: - if (!global) - break; + { + global_t *global = global_get_ptr(); + if (!global) + break; - if (global->savefiles) - string_list_free(global->savefiles); - global->savefiles = NULL; + if (global->savefiles) + string_list_free(global->savefiles); + global->savefiles = NULL; + } break; case EVENT_CMD_SAVEFILES_INIT: - global->sram.use = global->sram.use && !global->sram.save_disable + { + global_t *global = global_get_ptr(); + global->sram.use = global->sram.use && !global->sram.save_disable #ifdef HAVE_NETPLAY - && (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL) || !global->netplay.is_client) + && (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL) || !global->netplay.is_client) #endif - ; + ; - if (!global->sram.use) - RARCH_LOG("%s\n", - msg_hash_to_str(MSG_SRAM_WILL_NOT_BE_SAVED)); + if (!global->sram.use) + RARCH_LOG("%s\n", + msg_hash_to_str(MSG_SRAM_WILL_NOT_BE_SAVED)); - if (global->sram.use) - event_command(EVENT_CMD_AUTOSAVE_INIT); + if (global->sram.use) + event_cmd_ctl(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_command(EVENT_CMD_BSV_MOVIE_DEINIT); + event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_INIT, NULL); break; case EVENT_CMD_NETPLAY_DEINIT: @@ -1466,7 +1474,7 @@ bool event_command(enum event_command cmd) #endif break; case EVENT_CMD_NETPLAY_INIT: - event_command(EVENT_CMD_NETPLAY_DEINIT); + event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL); #ifdef HAVE_NETPLAY if (!init_netplay()) return false; @@ -1484,32 +1492,35 @@ bool event_command(enum event_command cmd) /* If we go fullscreen we drop all drivers and * reinitialize to be safe. */ settings->video.fullscreen = !settings->video.fullscreen; - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); break; case EVENT_CMD_COMMAND_DEINIT: input_driver_ctl(RARCH_INPUT_CTL_COMMAND_DEINIT, NULL); break; case EVENT_CMD_COMMAND_INIT: - event_command(EVENT_CMD_COMMAND_DEINIT); + event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL); input_driver_ctl(RARCH_INPUT_CTL_COMMAND_INIT, NULL); break; case EVENT_CMD_REMOTE_DEINIT: input_driver_ctl(RARCH_INPUT_CTL_REMOTE_DEINIT, NULL); break; case EVENT_CMD_REMOTE_INIT: - event_command(EVENT_CMD_REMOTE_DEINIT); + event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL); input_driver_ctl(RARCH_INPUT_CTL_REMOTE_INIT, NULL); break; case EVENT_CMD_TEMPORARY_CONTENT_DEINIT: content_ctl(CONTENT_CTL_DEINIT, NULL); break; case EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT: - if (!global) - break; + { + global_t *global = global_get_ptr(); + if (!global) + break; - if (global->subsystem_fullpaths) - string_list_free(global->subsystem_fullpaths); - global->subsystem_fullpaths = NULL; + if (global->subsystem_fullpaths) + string_list_free(global->subsystem_fullpaths); + global->subsystem_fullpaths = NULL; + } break; case EVENT_CMD_LOG_FILE_DEINIT: retro_main_log_file_deinit(); diff --git a/command_event.h b/command_event.h index 0efafbdab5..9b0a0850f9 100644 --- a/command_event.h +++ b/command_event.h @@ -225,7 +225,7 @@ void event_disk_control_append_image(const char *path); * * Returns: true (1) on success, otherwise false (0). **/ -bool event_command(enum event_command action); +bool event_cmd_ctl(enum event_command action, void *data); #ifdef __cplusplus } diff --git a/driver.c b/driver.c index 49992d2a73..91f0a50779 100644 --- a/driver.c +++ b/driver.c @@ -210,7 +210,7 @@ static void driver_adjust_system_rates(void) return; if (system->force_nonblock) - event_command(EVENT_CMD_VIDEO_SET_NONBLOCKING_STATE); + event_cmd_ctl(EVENT_CMD_VIDEO_SET_NONBLOCKING_STATE, NULL); else driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL); } @@ -261,7 +261,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_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); /* Cannot continue recording with different parameters. * Take the easiest route out and just restart the recording. */ @@ -269,8 +269,8 @@ static bool driver_update_system_av_info(const struct retro_system_av_info *info { runloop_msg_queue_push_new( MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT, 2, 180, false); - event_command(EVENT_CMD_RECORD_DEINIT); - event_command(EVENT_CMD_RECORD_INIT); + event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); + event_cmd_ctl(EVENT_CMD_RECORD_INIT, NULL); } return true; @@ -296,8 +296,8 @@ static void menu_update_libretro_info(void) retro_get_system_info(info); #endif - event_command(EVENT_CMD_CORE_INFO_INIT); - event_command(EVENT_CMD_LOAD_CORE_PERSIST); + event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); + event_cmd_ctl(EVENT_CMD_LOAD_CORE_PERSIST, NULL); } #endif diff --git a/dynamic.c b/dynamic.c index e7dcf8449d..e2aba30466 100644 --- a/dynamic.c +++ b/dynamic.c @@ -1204,7 +1204,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) /* Forces recomputation of aspect ratios if * using core-dependent aspect ratios. */ - event_command(EVENT_CMD_VIDEO_SET_ASPECT_RATIO); + event_cmd_ctl(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 e6616efa23..12bfa9a27b 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -114,7 +114,7 @@ static void frontend_ctr_deinit(void *data) *verbose = true; #ifdef HAVE_FILE_LOGGER - event_command(EVENT_CMD_LOG_FILE_DEINIT); + event_cmd_ctl(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 468489479f..47c84df5c4 100644 --- a/frontend/drivers/platform_emscripten.c +++ b/frontend/drivers/platform_emscripten.c @@ -42,22 +42,22 @@ static void emscripten_mainloop(void) void cmd_savefiles(void) { - event_command(EVENT_CMD_SAVEFILES); + event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL); } void cmd_save_state(void) { - event_command(EVENT_CMD_SAVE_STATE); + event_cmd_ctl(EVENT_CMD_SAVE_STATE, NULL); } void cmd_load_state(void) { - event_command(EVENT_CMD_LOAD_STATE); + event_cmd_ctl(EVENT_CMD_LOAD_STATE, NULL); } void cmd_take_screenshot(void) { - event_command(EVENT_CMD_TAKE_SCREENSHOT); + event_cmd_ctl(EVENT_CMD_TAKE_SCREENSHOT, NULL); } diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c index 4ee80c0e20..39e6da67eb 100644 --- a/frontend/drivers/platform_psp.c +++ b/frontend/drivers/platform_psp.c @@ -168,7 +168,7 @@ static void frontend_psp_deinit(void *data) *verbose = false; #ifdef HAVE_FILE_LOGGER - event_command(EVENT_CMD_LOG_FILE_DEINIT); + event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); #endif #endif diff --git a/frontend/frontend.c b/frontend/frontend.c index 4f57fa4fb2..296c176f43 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -62,7 +62,7 @@ void main_exit(void *args) { settings_t *settings = config_get_ptr(); - event_command(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG); + event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL); if (content_ctl(CONTENT_CTL_IS_INITED, NULL)) { @@ -73,7 +73,7 @@ void main_exit(void *args) rarch_main_deinit(); } - event_command(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG); + event_cmd_ctl(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG, NULL); #if defined(HAVE_LOGGER) && !defined(ANDROID) logger_shutdown(); @@ -231,7 +231,7 @@ bool main_load_content(int argc, char **argv, void *args, goto error; } - event_command(EVENT_CMD_RESUME); + event_cmd_ctl(EVENT_CMD_RESUME, NULL); check_defaults_dirs(); @@ -279,7 +279,7 @@ int rarch_main(int argc, char *argv[], void *data) return ret; } - event_command(EVENT_CMD_HISTORY_INIT); + event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); settings = config_get_ptr(); diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index 8da9125272..4315ee2d67 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -410,13 +410,13 @@ static bool ctr_frame(void* data, const void* frame, if(!aptMainLoop()) { - event_command(EVENT_CMD_QUIT); + event_cmd_ctl(EVENT_CMD_QUIT, NULL); return true; } if (select_pressed) { - event_command(EVENT_CMD_QUIT); + event_cmd_ctl(EVENT_CMD_QUIT, NULL); return true; } diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 67f9e30889..e6f40b4eee 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -520,7 +520,7 @@ void video_driver_callback_destroy_context(void) static bool uninit_video_input(void) { - event_command(EVENT_CMD_OVERLAY_DEINIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); if (!video_driver_ctl(RARCH_DISPLAY_CTL_IS_VIDEO_CACHE_CONTEXT, NULL)) { @@ -545,7 +545,7 @@ static bool uninit_video_input(void) deinit_video_filter(); - event_command(EVENT_CMD_SHADER_DIR_DEINIT); + event_cmd_ctl(EVENT_CMD_SHADER_DIR_DEINIT, NULL); video_monitor_compute_fps_statistics(); return true; @@ -621,7 +621,7 @@ static bool init_video(void) runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); init_video_filter(video_driver_state.pix_fmt); - event_command(EVENT_CMD_SHADER_DIR_INIT); + event_cmd_ctl(EVENT_CMD_SHADER_DIR_INIT, NULL); if (av_info) geom = (const struct retro_game_geometry*)&av_info->geometry; @@ -756,8 +756,8 @@ static bool init_video(void) init_video_input(tmp); - event_command(EVENT_CMD_OVERLAY_DEINIT); - event_command(EVENT_CMD_OVERLAY_INIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); + event_cmd_ctl(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 41688fbc31..423929160f 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -1065,7 +1065,7 @@ static void android_input_poll(void *data) if (android_app->reinitRequested != 0) { if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL)) - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); android_app_write_cmd(android_app, APP_CMD_REINIT_DONE); return; } @@ -1092,7 +1092,7 @@ bool android_run_events(void *data) if (android_app->reinitRequested != 0) { if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL)) - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(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 863e612418..803339ffbf 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_command(EVENT_CMD_QUIT); + event_cmd_ctl(EVENT_CMD_QUIT, NULL); } diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 29a98e7c01..0bf0157481 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -344,9 +344,9 @@ static void cb_decompressed(void *task_data, void *user_data, const char *err) if (dec && !err) { if (type_hash == CB_CORE_UPDATER_DOWNLOAD) - event_command(EVENT_CMD_CORE_INFO_INIT); + event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); else if (type_hash == CB_UPDATE_ASSETS) - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); } if (err) @@ -464,7 +464,7 @@ void cb_generic_download(void *task_data, void *user_data, const char *err) } #else if (transf->type_hash == CB_CORE_UPDATER_DOWNLOAD) - event_command(EVENT_CMD_CORE_INFO_INIT); + event_cmd_ctl(EVENT_CMD_CORE_INFO_INIT, NULL); #endif finish: diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 3109a8bf82..2f6372e0ba 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -351,7 +351,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_command(EVENT_CMD_DISK_PREV); + event_cmd_ctl(EVENT_CMD_DISK_PREV, NULL); return 0; } diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 9ffb3472c8..fa5684626b 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -432,7 +432,7 @@ static int rarch_defer_core_wrapper(size_t idx, size_t entry_idx, const char *pa case -1: { int ret = 0; - event_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); ret = menu_common_load_content(NULL, NULL, false, CORE_TYPE_PLAIN); @@ -614,7 +614,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_command(EVENT_CMD_CHEATS_APPLY); + event_cmd_ctl(EVENT_CMD_CHEATS_APPLY, NULL); return 0; } @@ -677,7 +677,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); - event_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); #if defined(HAVE_DYNAMIC) /* No content needed for this core, load core immediately. */ @@ -694,7 +694,7 @@ static int generic_action_ok(const char *path, /* Core selection on non-console just updates directory listing. * Will take effect on new content load. */ ret = -1; - event_command(EVENT_CMD_RESTART_RETROARCH); + event_cmd_ctl(EVENT_CMD_RESTART_RETROARCH, NULL); #endif break; @@ -748,7 +748,7 @@ static int generic_action_ok(const char *path, flush_char = NULL; flush_type = 49; event_disk_control_append_image(action_path); - event_command(EVENT_CMD_RESUME); + event_cmd_ctl(EVENT_CMD_RESUME, NULL); break; case ACTION_OK_SET_PATH: flush_char = NULL; @@ -1132,7 +1132,7 @@ static int action_ok_file_load(const char *path, static int generic_action_ok_command(enum event_command cmd) { - if (!event_command(cmd)) + if (!event_cmd_ctl(cmd, NULL)) return -1; return 0; } @@ -1406,7 +1406,7 @@ static int action_ok_file_load_or_resume(const char *path, return generic_action_ok_command(EVENT_CMD_RESUME); runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, menu->deferred_path); - event_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL); return -1; @@ -1449,7 +1449,7 @@ static int generic_action_ok_network(const char *path, if (string_is_empty(settings->network.buildbot_url)) return -1; - event_command(EVENT_CMD_NETWORK_INIT); + event_cmd_ctl(EVENT_CMD_NETWORK_INIT, NULL); switch (type_id) { @@ -1815,7 +1815,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_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); ret = menu_common_load_content(NULL, detect_content_path, false, CORE_TYPE_PLAIN); if (ret == -1) action_ok_push_quick_menu(); @@ -1850,7 +1850,7 @@ static int action_ok_load_archive_detect_core(const char *path, switch (ret) { case -1: - event_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); ret = menu_common_load_content(NULL, NULL, false, CORE_TYPE_PLAIN); if (ret == -1) action_ok_push_quick_menu(); @@ -1924,7 +1924,7 @@ static int action_ok_video_resolution(const char *path, { char msg[PATH_MAX_LENGTH] = {0}; #ifdef __CELLOS_LV2__ - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); #endif video_driver_set_video_mode(width, height, true); snprintf(msg, sizeof(msg),"Applying: %dx%d\n START to reset", width, height); diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index a41ae1981c..174a1942b3 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -368,7 +368,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_command(EVENT_CMD_DISK_NEXT); + event_cmd_ctl(EVENT_CMD_DISK_NEXT, NULL); return 0; } diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index 80b1cc760e..43747659f1 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -60,7 +60,7 @@ static int action_start_video_filter_file_load(unsigned type, const char *label) return -1; settings->video.softfilter_plugin[0] = '\0'; - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); return 0; } diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 8cf11ab8d6..0dfcf36fc5 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -1243,7 +1243,7 @@ static int zarch_iterate(void *data, void *userdata, enum menu_action action) if (zui->time_to_quit) { zui->time_to_quit = false; - if (!event_command(EVENT_CMD_QUIT)) + if (!event_cmd_ctl(EVENT_CMD_QUIT, NULL)) return -1; return 0; } @@ -1273,7 +1273,7 @@ static bool zarch_menu_init_list(void *data) menu_entries_push(menu_stack, info.path, info.label, info.type, info.flags, 0); #endif - event_command(EVENT_CMD_HISTORY_INIT); + event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); info.list = selection_buf; menu_displaylist_push_list(&info, DISPLAYLIST_HISTORY); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c605bc2251..89829b506f 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2973,7 +2973,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) content_playlist_t *playlist = g_defaults.history; if (!playlist) - event_command(EVENT_CMD_HISTORY_INIT); + event_cmd_ctl(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 2bbdb62d4b..225c0672b8 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -298,12 +298,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_command(EVENT_CMD_VIDEO_SET_BLOCKING_STATE); + event_cmd_ctl(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL); /* Stop all rumbling before entering the menu. */ - event_command(EVENT_CMD_RUMBLE_STOP); + event_cmd_ctl(EVENT_CMD_RUMBLE_STOP, NULL); if (settings->menu.pause_libretro) - event_command(EVENT_CMD_AUDIO_STOP); + event_cmd_ctl(EVENT_CMD_AUDIO_STOP, NULL); /* Override keyboard callback to redirect to menu instead. * We'll use this later for something ... */ @@ -322,7 +322,7 @@ static void menu_driver_toggle(bool latch) driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL); if (settings && settings->menu.pause_libretro) - event_command(EVENT_CMD_AUDIO_START); + event_cmd_ctl(EVENT_CMD_AUDIO_START, NULL); /* Prevent stray input from going to libretro core */ input_driver_ctl(RARCH_INPUT_CTL_SET_FLUSHING_INPUT, NULL); @@ -463,13 +463,13 @@ bool menu_load_content(enum rarch_core_type type) menu_shader_manager_init(menu_driver_data); - event_command(EVENT_CMD_HISTORY_INIT); + event_cmd_ctl(EVENT_CMD_HISTORY_INIT, NULL); if (*fullpath || menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL)) menu_push_to_history_playlist(); - event_command(EVENT_CMD_VIDEO_SET_ASPECT_RATIO); - event_command(EVENT_CMD_RESUME); + event_cmd_ctl(EVENT_CMD_VIDEO_SET_ASPECT_RATIO, NULL); + event_cmd_ctl(EVENT_CMD_RESUME, NULL); return true; } @@ -483,7 +483,7 @@ int menu_common_load_content( if (core_path) { runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path); - event_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); } if (fullpath) @@ -508,7 +508,7 @@ int menu_common_load_content( } if (cmd != EVENT_CMD_NONE) - event_command(cmd); + event_cmd_ctl(cmd, NULL); return -1; } @@ -533,7 +533,7 @@ static void menu_free(menu_handle_t *menu) menu_display_free(); menu_entries_ctl(MENU_ENTRIES_CTL_DEINIT, NULL); - event_command(EVENT_CMD_HISTORY_DEINIT); + event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_LIST_FREE, NULL); runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_FREE, NULL); @@ -548,7 +548,7 @@ static void bundle_decompressed(void *task_data, void *user_data, const char *er decompress_task_data_t *dec = (decompress_task_data_t*)task_data; if (dec && !err) - event_command(EVENT_CMD_REINIT); + event_cmd_ctl(EVENT_CMD_REINIT, NULL); if (err) RARCH_ERR("%s", err); @@ -605,7 +605,7 @@ void *menu_init(const void *data) menu->push_help_screen = true; menu->help_screen_type = MENU_HELP_WELCOME; settings->menu_show_start_screen = false; - event_command(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG); + event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL); } if ( settings->bundle_assets_extract_enable diff --git a/menu/menu_setting.c b/menu/menu_setting.c index ea52424d70..bad6f74a2c 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2580,7 +2580,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_command(EVENT_CMD_VIDEO_SET_BLOCKING_STATE); + event_cmd_ctl(EVENT_CMD_VIDEO_SET_BLOCKING_STATE, NULL); } if (setting_generic_action_ok_default(setting, wraparound) != 0) @@ -2633,7 +2633,7 @@ static int setting_action_action_ok(void *data, bool wraparound) (void)wraparound; if (setting->cmd_trigger.idx != EVENT_CMD_NONE) - event_command(setting->cmd_trigger.idx); + event_cmd_ctl(setting->cmd_trigger.idx, NULL); return 0; } @@ -2936,7 +2936,7 @@ void general_write_handler(void *data) } if (rarch_cmd || setting->cmd_trigger.triggered) - event_command(rarch_cmd); + event_cmd_ctl(rarch_cmd, NULL); } static void setting_add_special_callbacks( @@ -2989,14 +2989,14 @@ static void overlay_enable_toggle_change_handler(void *data) if (settings && settings->input.overlay_hide_in_menu) { - event_command(EVENT_CMD_OVERLAY_DEINIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); return; } if (setting->value.boolean) - event_command(EVENT_CMD_OVERLAY_INIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); else - event_command(EVENT_CMD_OVERLAY_DEINIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); } #endif diff --git a/netplay/netplay.c b/netplay/netplay.c index 0afa577e2e..a76dd1e4be 100644 --- a/netplay/netplay.c +++ b/netplay/netplay.c @@ -256,11 +256,11 @@ static bool netplay_get_cmd(netplay_t *netplay) return netplay_cmd_nak(netplay); case NETPLAY_CMD_PAUSE: - event_command(EVENT_CMD_PAUSE); + event_cmd_ctl(EVENT_CMD_PAUSE, NULL); return netplay_cmd_ack(netplay); case NETPLAY_CMD_RESUME: - event_command(EVENT_CMD_UNPAUSE); + event_cmd_ctl(EVENT_CMD_UNPAUSE, NULL); return netplay_cmd_ack(netplay); default: break; @@ -1125,14 +1125,14 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data) { bool *state = (bool*)data; if (*state) - event_command(EVENT_CMD_NETPLAY_FLIP_PLAYERS); + event_cmd_ctl(EVENT_CMD_NETPLAY_FLIP_PLAYERS, NULL); } break; case RARCH_NETPLAY_CTL_FULLSCREEN_TOGGLE: { bool *state = (bool*)data; if (*state) - event_command(EVENT_CMD_FULLSCREEN_TOGGLE); + event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); } break; default: diff --git a/record/record_driver.c b/record/record_driver.c index 60b43d2188..65f263818e 100644 --- a/record/record_driver.c +++ b/record/record_driver.c @@ -190,7 +190,7 @@ void recording_dump_frame(const void *data, unsigned width, { RARCH_WARN("%s \n", msg_hash_to_str(MSG_VIEWPORT_SIZE_CALCULATION_FAILED)); - event_command(EVENT_CMD_GPU_RECORD_DEINIT); + event_cmd_ctl(EVENT_CMD_GPU_RECORD_DEINIT, NULL); recording_dump_frame(data, width, height, pitch); return; @@ -203,7 +203,7 @@ void recording_dump_frame(const void *data, unsigned width, RARCH_WARN("%s\n", msg_hash_to_str(MSG_RECORDING_TERMINATED_DUE_TO_RESIZE)); runloop_msg_queue_push_new(MSG_RECORDING_TERMINATED_DUE_TO_RESIZE, 1, 180, true); - event_command(EVENT_CMD_RECORD_DEINIT); + event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); return; } @@ -245,7 +245,7 @@ bool recording_deinit(void) recording_data = NULL; recording_driver = NULL; - event_command(EVENT_CMD_GPU_RECORD_DEINIT); + event_cmd_ctl(EVENT_CMD_GPU_RECORD_DEINIT, NULL); return true; } @@ -412,7 +412,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_command(EVENT_CMD_GPU_RECORD_DEINIT); + event_cmd_ctl(EVENT_CMD_GPU_RECORD_DEINIT, NULL); return false; } diff --git a/retroarch.c b/retroarch.c index ca76909bb5..f725e0e4ab 100644 --- a/retroarch.c +++ b/retroarch.c @@ -988,7 +988,7 @@ static void rarch_init_savefile_paths(void) runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); - event_command(EVENT_CMD_SAVEFILES_DEINIT); + event_cmd_ctl(EVENT_CMD_SAVEFILES_DEINIT, NULL); global->savefiles = string_list_new(); retro_assert(global->savefiles); @@ -1185,26 +1185,27 @@ int rarch_main_init(int argc, char *argv[]) init_libretro_sym(current_core_type); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL); driver_ctl(RARCH_DRIVER_CTL_INIT_PRE, NULL); -if (!event_command(EVENT_CMD_CORE_INIT)) goto error; + if (!event_cmd_ctl(EVENT_CMD_CORE_INIT, NULL)) + goto error; - event_command(EVENT_CMD_DRIVERS_INIT); - event_command(EVENT_CMD_COMMAND_INIT); - event_command(EVENT_CMD_REMOTE_INIT); - event_command(EVENT_CMD_REWIND_INIT); - event_command(EVENT_CMD_CONTROLLERS_INIT); - event_command(EVENT_CMD_RECORD_INIT); - event_command(EVENT_CMD_CHEATS_INIT); - event_command(EVENT_CMD_REMAPPING_INIT); + event_cmd_ctl(EVENT_CMD_DRIVERS_INIT, 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_REMAPPING_INIT, NULL); - event_command(EVENT_CMD_SAVEFILES_INIT); - event_command(EVENT_CMD_SET_PER_GAME_RESOLUTION); + event_cmd_ctl(EVENT_CMD_SAVEFILES_INIT, NULL); + event_cmd_ctl(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_command(EVENT_CMD_CORE_DEINIT); + event_cmd_ctl(EVENT_CMD_CORE_DEINIT, NULL); rarch_ctl(RARCH_CTL_UNSET_INITED, NULL); return 1; } @@ -1314,8 +1315,8 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) rarch_force_fullscreen = false; runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, NULL); - event_command(EVENT_CMD_DRIVERS_DEINIT); - event_command(EVENT_CMD_LOG_FILE_DEINIT); + event_cmd_ctl(EVENT_CMD_DRIVERS_DEINIT, NULL); + event_cmd_ctl(EVENT_CMD_LOG_FILE_DEINIT, NULL); runloop_ctl(RUNLOOP_CTL_STATE_FREE, NULL); runloop_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL); @@ -1331,15 +1332,15 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) if (!inited) return false; - event_command(EVENT_CMD_DRIVERS_DEINIT); - event_command(EVENT_CMD_DRIVERS_INIT); + event_cmd_ctl(EVENT_CMD_DRIVERS_DEINIT, NULL); + event_cmd_ctl(EVENT_CMD_DRIVERS_INIT, NULL); } return true; case RARCH_CTL_PREINIT: if (!config_realloc()) return false; - event_command(EVENT_CMD_HISTORY_DEINIT); + event_cmd_ctl(EVENT_CMD_HISTORY_DEINIT, NULL); runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL); return true; @@ -1409,7 +1410,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) #endif #ifdef HAVE_OVERLAY if (settings->input.overlay_hide_in_menu) - event_command(EVENT_CMD_OVERLAY_DEINIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); #endif break; case RARCH_CTL_LOAD_CONTENT: @@ -1445,7 +1446,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_command(EVENT_CMD_OVERLAY_INIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); #endif break; case RARCH_CTL_QUIT: @@ -1515,27 +1516,27 @@ void rarch_main_deinit(void) { global_t *global = global_get_ptr(); - event_command(EVENT_CMD_NETPLAY_DEINIT); - event_command(EVENT_CMD_COMMAND_DEINIT); - event_command(EVENT_CMD_REMOTE_DEINIT); + event_cmd_ctl(EVENT_CMD_NETPLAY_DEINIT, NULL); + event_cmd_ctl(EVENT_CMD_COMMAND_DEINIT, NULL); + event_cmd_ctl(EVENT_CMD_REMOTE_DEINIT, NULL); if (global->sram.use) - event_command(EVENT_CMD_AUTOSAVE_DEINIT); + event_cmd_ctl(EVENT_CMD_AUTOSAVE_DEINIT, NULL); - event_command(EVENT_CMD_RECORD_DEINIT); - event_command(EVENT_CMD_SAVEFILES); + event_cmd_ctl(EVENT_CMD_RECORD_DEINIT, NULL); + event_cmd_ctl(EVENT_CMD_SAVEFILES, NULL); - event_command(EVENT_CMD_REWIND_DEINIT); - event_command(EVENT_CMD_CHEATS_DEINIT); - event_command(EVENT_CMD_BSV_MOVIE_DEINIT); + 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); - event_command(EVENT_CMD_AUTOSAVE_STATE); + event_cmd_ctl(EVENT_CMD_AUTOSAVE_STATE, NULL); - event_command(EVENT_CMD_CORE_DEINIT); + event_cmd_ctl(EVENT_CMD_CORE_DEINIT, NULL); - event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT); - event_command(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT); - event_command(EVENT_CMD_SAVEFILES_DEINIT); + 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); rarch_ctl(RARCH_CTL_UNSET_INITED, NULL); } @@ -1602,7 +1603,7 @@ void rarch_playlist_load_content(void *data, unsigned idx) rarch_environment_cb(RETRO_ENVIRONMENT_EXEC, (void*)path); - event_command(EVENT_CMD_LOAD_CORE); + event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); } /** diff --git a/runloop.c b/runloop.c index e07512fa97..175ab33d3b 100644 --- a/runloop.c +++ b/runloop.c @@ -212,7 +212,7 @@ static bool check_pause(settings_t *settings, old_focus = focus; if (cmd != EVENT_CMD_NONE) - event_command(cmd); + event_cmd_ctl(cmd, NULL); if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL) == old_is_paused) return false; @@ -311,7 +311,7 @@ static bool shader_dir_init(rarch_dir_list_t *dir_list) if (!dir_list->list || dir_list->list->size == 0) { - event_command(EVENT_CMD_SHADER_DIR_DEINIT); + event_cmd_ctl(EVENT_CMD_SHADER_DIR_DEINIT, NULL); return false; } @@ -713,10 +713,10 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) return false; if (runloop_cmd_triggered(cmd, RARCH_SCREENSHOT)) - event_command(EVENT_CMD_TAKE_SCREENSHOT); + event_cmd_ctl(EVENT_CMD_TAKE_SCREENSHOT, NULL); if (runloop_cmd_triggered(cmd, RARCH_MUTE)) - event_command(EVENT_CMD_AUDIO_MUTE_TOGGLE); + event_cmd_ctl(EVENT_CMD_AUDIO_MUTE_TOGGLE, NULL); if (runloop_cmd_triggered(cmd, RARCH_OSK)) { @@ -727,9 +727,9 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) } if (runloop_cmd_press(cmd, RARCH_VOLUME_UP)) - event_command(EVENT_CMD_VOLUME_UP); + event_cmd_ctl(EVENT_CMD_VOLUME_UP, NULL); else if (runloop_cmd_press(cmd, RARCH_VOLUME_DOWN)) - event_command(EVENT_CMD_VOLUME_DOWN); + event_cmd_ctl(EVENT_CMD_VOLUME_DOWN, NULL); #ifdef HAVE_NETPLAY tmp = runloop_cmd_triggered(cmd, RARCH_NETPLAY_FLIP); @@ -750,9 +750,9 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) ); if (runloop_cmd_triggered(cmd, RARCH_SAVE_STATE_KEY)) - event_command(EVENT_CMD_SAVE_STATE); + event_cmd_ctl(EVENT_CMD_SAVE_STATE, NULL); else if (runloop_cmd_triggered(cmd, RARCH_LOAD_STATE_KEY)) - event_command(EVENT_CMD_LOAD_STATE); + event_cmd_ctl(EVENT_CMD_LOAD_STATE, NULL); state_manager_check_rewind(runloop_cmd_press(cmd, RARCH_REWIND)); @@ -768,14 +768,14 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) runloop_cmd_triggered(cmd, RARCH_SHADER_PREV)); if (runloop_cmd_triggered(cmd, RARCH_DISK_EJECT_TOGGLE)) - event_command(EVENT_CMD_DISK_EJECT_TOGGLE); + event_cmd_ctl(EVENT_CMD_DISK_EJECT_TOGGLE, NULL); else if (runloop_cmd_triggered(cmd, RARCH_DISK_NEXT)) - event_command(EVENT_CMD_DISK_NEXT); + event_cmd_ctl(EVENT_CMD_DISK_NEXT, NULL); else if (runloop_cmd_triggered(cmd, RARCH_DISK_PREV)) - event_command(EVENT_CMD_DISK_PREV); + event_cmd_ctl(EVENT_CMD_DISK_PREV, NULL); if (runloop_cmd_triggered(cmd, RARCH_RESET)) - event_command(EVENT_CMD_RESET); + event_cmd_ctl(EVENT_CMD_RESET, NULL); cheat_manager_state_checks( runloop_cmd_triggered(cmd, RARCH_CHEAT_INDEX_PLUS), @@ -799,7 +799,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) if (runloop_cmd_triggered(cmd, RARCH_FULLSCREEN_TOGGLE_KEY)) { - event_command(EVENT_CMD_FULLSCREEN_TOGGLE); + event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); video_driver_ctl(RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER, NULL); } @@ -842,7 +842,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) MSG_MOVIE_RECORD_STOPPED, 2, 180, true); RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_RECORD_STOPPED)); - event_command(EVENT_CMD_BSV_MOVIE_DEINIT); + event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); break; case RUNLOOP_CTL_CHECK_MOVIE_INIT: if (bsv_movie_ctl(BSV_MOVIE_CTL_IS_INITED, NULL)) @@ -893,7 +893,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) MSG_MOVIE_PLAYBACK_ENDED, 1, 180, false); RARCH_LOG("%s\n", msg_hash_to_str(MSG_MOVIE_PLAYBACK_ENDED)); - event_command(EVENT_CMD_BSV_MOVIE_DEINIT); + event_cmd_ctl(EVENT_CMD_BSV_MOVIE_DEINIT, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_END, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_PLAYBACK, NULL); @@ -911,10 +911,10 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data) case RUNLOOP_CTL_GLOBAL_FREE: { global_t *global = NULL; - event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT); - event_command(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT); - event_command(EVENT_CMD_RECORD_DEINIT); - event_command(EVENT_CMD_LOG_FILE_DEINIT); + 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); rarch_ctl(RARCH_CTL_UNSET_BLOCK_CONFIG_READ, NULL); runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL); @@ -1162,18 +1162,18 @@ static void runloop_iterate_linefeed_overlay(settings_t *settings) { input_driver_ctl(RARCH_INPUT_CTL_UNSET_OSK_ENABLED, NULL); prev_overlay_restore = true; - event_command(EVENT_CMD_OVERLAY_DEINIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); } else if (!osk_enable && input_driver_ctl(RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED, NULL)) { input_driver_ctl(RARCH_INPUT_CTL_SET_OSK_ENABLED, NULL); prev_overlay_restore = false; - event_command(EVENT_CMD_OVERLAY_INIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); } else if (prev_overlay_restore) { if (!settings->input.overlay_hide_in_menu) - event_command(EVENT_CMD_OVERLAY_INIT); + event_cmd_ctl(EVENT_CMD_OVERLAY_INIT, NULL); prev_overlay_restore = false; } } @@ -1321,7 +1321,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_command(EVENT_CMD_OVERLAY_NEXT); + event_cmd_ctl(EVENT_CMD_OVERLAY_NEXT, NULL); if (runloop_cmd_triggered(cmd_ptr, RARCH_FULLSCREEN_TOGGLE_KEY)) { @@ -1331,11 +1331,11 @@ int runloop_iterate(unsigned *sleep_ms) #endif if (fullscreen_toggled) - event_command(EVENT_CMD_FULLSCREEN_TOGGLE); + event_cmd_ctl(EVENT_CMD_FULLSCREEN_TOGGLE, NULL); } if (runloop_cmd_triggered(cmd_ptr, RARCH_GRAB_MOUSE_TOGGLE)) - event_command(EVENT_CMD_GRAB_MOUSE_TOGGLE); + event_cmd_ctl(EVENT_CMD_GRAB_MOUSE_TOGGLE, NULL); #ifdef HAVE_MENU if (runloop_cmd_menu_press(cmd_ptr) || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)) diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 1de3e2eff0..11a5c3af07 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -554,7 +554,7 @@ static void *ui_companion_cocoa_init(void) static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) { (void)data; - event_command(cmd); + event_cmd_ctl(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 193359402a..dbe183c3ea 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_command(cmd); + event_cmd_ctl(cmd, NULL); } static void rarch_draw_observer(CFRunLoopObserverRef observer, diff --git a/ui/drivers/ui_qt.c b/ui/drivers/ui_qt.c index 7e530c3e64..b10ffa08e0 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_command(cmd); + event_cmd_ctl(cmd, NULL); slock_unlock(handle->lock); } diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index dca658163a..e26a698fa8 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -600,7 +600,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam) } if (cmd != EVENT_CMD_NONE) - event_command(cmd); + event_cmd_ctl(cmd, NULL); if (do_wm_close) PostMessage(owner, WM_CLOSE, 0, 0);