mirror of
https://github.com/libretro/RetroArch.git
synced 2025-02-21 18:21:51 +00:00
Rename RARCH_MAIN_CTL* to RUNLOOP_CTL*
This commit is contained in:
parent
ca71e1a5bb
commit
4e333302ae
@ -495,7 +495,7 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
|
||||
|
||||
recording_push_audio(data, samples);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_PAUSED, &is_paused);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_PAUSED, &is_paused);
|
||||
|
||||
if (is_paused || settings->audio.mute_enable)
|
||||
return true;
|
||||
@ -535,7 +535,7 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
|
||||
|
||||
src_data.ratio = audio_driver_data.src_ratio;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_SLOWMOTION, &is_slowmotion);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_SLOWMOTION, &is_slowmotion);
|
||||
|
||||
if (is_slowmotion)
|
||||
src_data.ratio *= settings->slowmotion_ratio;
|
||||
|
@ -1042,7 +1042,7 @@ bool event_command(enum event_command cmd)
|
||||
event_command(EVENT_CMD_LOAD_CONTENT_PERSIST);
|
||||
#else
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_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);
|
||||
@ -1097,7 +1097,7 @@ bool event_command(enum event_command cmd)
|
||||
if (!settings->video.fullscreen)
|
||||
event_command(EVENT_CMD_REINIT);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_WINDOWED_SCALE, &idx);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx);
|
||||
}
|
||||
break;
|
||||
case EVENT_CMD_MENU_TOGGLE:
|
||||
@ -1143,7 +1143,7 @@ bool event_command(enum event_command cmd)
|
||||
return false;
|
||||
break;
|
||||
case EVENT_CMD_UNLOAD_CORE:
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_PREPARE_DUMMY, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_PREPARE_DUMMY, NULL);
|
||||
event_command(EVENT_CMD_LOAD_CORE_DEINIT);
|
||||
break;
|
||||
case EVENT_CMD_QUIT:
|
||||
@ -1417,7 +1417,7 @@ bool event_command(enum event_command cmd)
|
||||
#if defined(GEKKO) && defined(HW_RVL)
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
fill_pathname_join(new_path, g_defaults.dir.core, SALAMANDER_FILE, sizeof(new_path));
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, new_path);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, new_path);
|
||||
#endif
|
||||
if (driver->frontend_ctx && driver->frontend_ctx->set_fork)
|
||||
driver->frontend_ctx->set_fork(true, false);
|
||||
@ -1436,7 +1436,7 @@ bool event_command(enum event_command cmd)
|
||||
#endif
|
||||
break;
|
||||
case EVENT_CMD_PAUSE_CHECKS:
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_PAUSED, &boolean);
|
||||
|
||||
if (boolean)
|
||||
{
|
||||
@ -1453,21 +1453,21 @@ bool event_command(enum event_command cmd)
|
||||
}
|
||||
break;
|
||||
case EVENT_CMD_PAUSE_TOGGLE:
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_PAUSED, &boolean);
|
||||
boolean = !boolean;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
|
||||
event_command(EVENT_CMD_PAUSE_CHECKS);
|
||||
break;
|
||||
case EVENT_CMD_UNPAUSE:
|
||||
boolean = false;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
|
||||
event_command(EVENT_CMD_PAUSE_CHECKS);
|
||||
break;
|
||||
case EVENT_CMD_PAUSE:
|
||||
boolean = true;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
|
||||
event_command(EVENT_CMD_PAUSE_CHECKS);
|
||||
break;
|
||||
case EVENT_CMD_MENU_PAUSE_LIBRETRO:
|
||||
@ -1726,7 +1726,7 @@ case EVENT_CMD_REMOTE_INIT:
|
||||
event_set_volume(-0.5f);
|
||||
break;
|
||||
case EVENT_CMD_SET_FRAME_LIMIT:
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_FRAME_LIMIT_LAST_TIME, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT_LAST_TIME, NULL);
|
||||
break;
|
||||
case EVENT_CMD_NONE:
|
||||
default:
|
||||
|
@ -754,7 +754,7 @@ static void config_set_defaults(void)
|
||||
fill_pathname_expand_special(settings->libretro_directory,
|
||||
g_defaults.dir.core, sizeof(settings->libretro_directory));
|
||||
if (*g_defaults.path.core)
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, g_defaults.path.core);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, g_defaults.path.core);
|
||||
if (*g_defaults.dir.database)
|
||||
strlcpy(settings->content_database, g_defaults.dir.database,
|
||||
sizeof(settings->content_database));
|
||||
|
@ -619,7 +619,7 @@ bool init_content_file(void)
|
||||
else
|
||||
{
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
attr.i = system->info.block_extract;
|
||||
attr.i |= system->info.need_fullpath << 1;
|
||||
|
14
dynamic.c
14
dynamic.c
@ -768,7 +768,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
|
||||
case RETRO_ENVIRONMENT_SHUTDOWN:
|
||||
RARCH_LOG("Environ SHUTDOWN.\n");
|
||||
system->shutdown = true;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CORE_SHUTDOWN, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CORE_SHUTDOWN, NULL);
|
||||
break;
|
||||
|
||||
case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL:
|
||||
@ -781,7 +781,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
|
||||
if (settings->system_directory[0] == '\0')
|
||||
{
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n", fullpath);
|
||||
fill_pathname_basedir(global->dir.systemdir, fullpath,
|
||||
@ -1286,20 +1286,20 @@ bool rarch_environment_cb(unsigned cmd, void *data)
|
||||
|
||||
if (!path_file_exists((const char*)data))
|
||||
return false;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, data);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, data);
|
||||
break;
|
||||
|
||||
case RETRO_ENVIRONMENT_EXEC:
|
||||
case RETRO_ENVIRONMENT_EXEC_ESCAPE:
|
||||
{
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
if (fullpath != data)
|
||||
{
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
if (data)
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, data);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, data);
|
||||
}
|
||||
|
||||
#if defined(RARCH_CONSOLE)
|
||||
@ -1312,7 +1312,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
|
||||
if (cmd == RETRO_ENVIRONMENT_EXEC_ESCAPE)
|
||||
{
|
||||
RARCH_LOG("Environ (Private) EXEC_ESCAPE.\n");
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_EXEC, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_EXEC, NULL);
|
||||
}
|
||||
else
|
||||
RARCH_LOG("Environ (Private) EXEC.\n");
|
||||
|
@ -372,7 +372,7 @@ static void frontend_ps3_exec(const char *path, bool should_load_game)
|
||||
RARCH_LOG("Attempt to load executable: [%s].\n", path);
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
if (should_load_game && fullpath[0] != '\0')
|
||||
{
|
||||
|
@ -255,7 +255,7 @@ static void frontend_psp_exec(const char *path, bool should_load_game)
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
if (should_load_game && fullpath[0] != '\0')
|
||||
{
|
||||
|
@ -135,7 +135,7 @@ void system_exec_wii(const char *_path, bool should_load_game)
|
||||
strlcpy(game_path, gx_rom_path, sizeof(game_path));
|
||||
#else
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
strlcpy(game_path, fullpath, sizeof(game_path));
|
||||
#endif
|
||||
}
|
||||
|
@ -323,7 +323,7 @@ static void frontend_xdk_exec(const char *path, bool should_load_game)
|
||||
#else
|
||||
#ifdef _XBOX
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
#if defined(_XBOX1)
|
||||
LAUNCH_DATA ptr;
|
||||
|
@ -304,7 +304,7 @@ int rarch_main(int argc, char *argv[], void *data)
|
||||
global_t *global = global_get_ptr();
|
||||
rarch_system_info_t *system = rarch_system_info_get_ptr();
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
if (global->inited.content || system->no_content)
|
||||
history_playlist_push(
|
||||
|
@ -1839,8 +1839,8 @@ static bool gl_frame(void *data, const void *frame,
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_SLOWMOTION, &is_slowmotion);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_PAUSED, &is_paused);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_SLOWMOTION, &is_slowmotion);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_PAUSED, &is_paused);
|
||||
|
||||
/* Disable BFI during fast forward, slow-motion,
|
||||
* and pause to prevent flicker. */
|
||||
|
@ -1173,7 +1173,7 @@ static bool video_driver_cached_frame(void)
|
||||
driver_t *driver = driver_get_ptr();
|
||||
void *recording = driver ? driver->recording_data : NULL;
|
||||
|
||||
if (rarch_main_ctl(RARCH_MAIN_CTL_IS_IDLE, NULL))
|
||||
if (rarch_main_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
|
||||
return true; /* Maybe return false here for indication of idleness? */
|
||||
|
||||
/* Cannot allow recording when pushing duped frames. */
|
||||
|
@ -435,7 +435,7 @@ static bool thread_alive(void *data)
|
||||
bool ret, is_paused;
|
||||
thread_video_t *thr = (thread_video_t*)data;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_PAUSED, &is_paused);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_PAUSED, &is_paused);
|
||||
|
||||
if (is_paused)
|
||||
{
|
||||
|
@ -273,7 +273,7 @@ static void android_input_poll_main_cmd(void)
|
||||
scond_broadcast(android_app->cond);
|
||||
slock_unlock(android_app->mutex);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_PAUSED, &is_paused);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_PAUSED, &is_paused);
|
||||
|
||||
if (is_paused)
|
||||
event_command(EVENT_CMD_REINIT);
|
||||
@ -324,8 +324,8 @@ static void android_input_poll_main_cmd(void)
|
||||
{
|
||||
bool boolean = false;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_IDLE, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_IDLE, &boolean);
|
||||
|
||||
if ((android_app->sensor_state_mask
|
||||
& (UINT64_C(1) << RETRO_SENSOR_ACCELEROMETER_ENABLE))
|
||||
@ -343,8 +343,8 @@ static void android_input_poll_main_cmd(void)
|
||||
{
|
||||
bool boolean = true;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_IDLE, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_IDLE, &boolean);
|
||||
|
||||
/* Avoid draining battery while app is not being used. */
|
||||
if ((android_app->sensor_state_mask
|
||||
|
@ -650,14 +650,14 @@ static int generic_action_ok(const char *path,
|
||||
case ACTION_OK_LOAD_CORE:
|
||||
flush_char = NULL;
|
||||
flush_type = MENU_SETTINGS;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, action_path);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, action_path);
|
||||
event_command(EVENT_CMD_LOAD_CORE);
|
||||
|
||||
#if defined(HAVE_DYNAMIC)
|
||||
/* No content needed for this core, load core immediately. */
|
||||
if (menu->load_no_content && settings->core.set_supports_no_game_enable)
|
||||
{
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
ret = menu_common_load_content(NULL, NULL, false, CORE_TYPE_PLAIN);
|
||||
if (ret == -1)
|
||||
action_ok_push_quick_menu();
|
||||
@ -1355,12 +1355,12 @@ static int action_ok_file_load_or_resume(const char *path,
|
||||
if (!menu)
|
||||
return -1;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
if (!strcmp(menu->deferred_path, fullpath))
|
||||
return generic_action_ok_command(EVENT_CMD_RESUME);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, menu->deferred_path);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, menu->deferred_path);
|
||||
event_command(EVENT_CMD_LOAD_CORE);
|
||||
rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL);
|
||||
|
||||
|
@ -361,7 +361,7 @@ int menu_iterate_render(void)
|
||||
driver->render();
|
||||
}
|
||||
|
||||
if (menu_driver_alive() && !rarch_main_ctl(RARCH_MAIN_CTL_IS_IDLE, NULL))
|
||||
if (menu_driver_alive() && !rarch_main_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
|
||||
menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO, NULL);
|
||||
|
||||
menu_driver_set_texture();
|
||||
|
@ -449,7 +449,7 @@ static void rgui_render(void)
|
||||
if (menu_entries_needs_refresh() && menu_driver_alive() && !msg_force)
|
||||
return;
|
||||
|
||||
if (rarch_main_ctl(RARCH_MAIN_CTL_IS_IDLE, NULL))
|
||||
if (rarch_main_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
|
||||
return;
|
||||
|
||||
if (!menu_display_ctl(MENU_DISPLAY_CTL_UPDATE_PENDING, NULL))
|
||||
|
10
menu/menu.c
10
menu/menu.c
@ -37,7 +37,7 @@ static void menu_environment_get(int *argc, char *argv[],
|
||||
if (!wrap_args)
|
||||
return;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
wrap_args->no_content = menu->load_no_content;
|
||||
if (!global->has_set.verbosity)
|
||||
@ -62,7 +62,7 @@ static void menu_push_to_history_playlist(void)
|
||||
if (!settings->history_list_enable)
|
||||
return;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
if (*fullpath)
|
||||
{
|
||||
@ -98,7 +98,7 @@ bool menu_load_content(enum rarch_core_type type)
|
||||
driver_t *driver = driver_get_ptr();
|
||||
char *fullpath = NULL;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
/* redraw menu frame */
|
||||
menu_display_ctl(MENU_DISPLAY_CTL_SET_MSG_FORCE, &msg_force);
|
||||
menu_iterate_render();
|
||||
@ -137,12 +137,12 @@ int menu_common_load_content(
|
||||
|
||||
if (core_path)
|
||||
{
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, (void*)core_path);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
|
||||
event_command(EVENT_CMD_LOAD_CORE);
|
||||
}
|
||||
|
||||
if (fullpath)
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, (void*)fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)fullpath);
|
||||
|
||||
switch (type)
|
||||
{
|
||||
|
@ -1797,7 +1797,7 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in
|
||||
if (!menu)
|
||||
return -1;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
if (global->inited.main && (global->inited.core.type != CORE_TYPE_DUMMY)
|
||||
&& !strcmp(menu->deferred_path, fullpath))
|
||||
|
26
retroarch.c
26
retroarch.c
@ -254,7 +254,7 @@ static void set_basename(const char *path)
|
||||
char *dst = NULL;
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, (void*)path);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)path);
|
||||
strlcpy(global->name.base, path, sizeof(global->name.base));
|
||||
|
||||
#ifdef HAVE_COMPRESSION
|
||||
@ -745,7 +745,7 @@ static void parse_input(int argc, char *argv[])
|
||||
}
|
||||
else
|
||||
{
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, optarg);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, optarg);
|
||||
global->has_set.libretro = true;
|
||||
}
|
||||
break;
|
||||
@ -883,7 +883,7 @@ static void parse_input(int argc, char *argv[])
|
||||
case RA_OPT_MAX_FRAMES:
|
||||
{
|
||||
unsigned max_frames = strtoul(optarg, NULL, 10);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_MAX_FRAMES, &max_frames);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_MAX_FRAMES, &max_frames);
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1083,7 +1083,7 @@ void rarch_main_alloc(void)
|
||||
|
||||
event_command(EVENT_CMD_HISTORY_DEINIT);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_STATE, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1100,17 +1100,17 @@ void rarch_main_new(void)
|
||||
init_state();
|
||||
main_init_state_config();
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_MSG_QUEUE_INIT, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_MSG_QUEUE_INIT, NULL);
|
||||
}
|
||||
|
||||
void rarch_main_free(void)
|
||||
{
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_MSG_QUEUE_DEINIT, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, NULL);
|
||||
event_command(EVENT_CMD_DRIVERS_DEINIT);
|
||||
event_command(EVENT_CMD_LOG_FILE_DEINIT);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_STATE_FREE, NULL);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GLOBAL_FREE, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_STATE_FREE, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL);
|
||||
|
||||
rarch_main_data_deinit();
|
||||
config_free();
|
||||
@ -1185,7 +1185,7 @@ int rarch_main_init(int argc, char *argv[])
|
||||
settings->multimedia.builtin_imageviewer_enable))
|
||||
{
|
||||
char *fullpath = NULL;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
|
||||
|
||||
switch (rarch_path_is_media_type(fullpath))
|
||||
{
|
||||
@ -1348,7 +1348,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
|
||||
global->block_config_read = false;
|
||||
*settings->libretro = '\0'; /* Load core in new config. */
|
||||
}
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_PREPARE_DUMMY, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_PREPARE_DUMMY, NULL);
|
||||
return true;
|
||||
case RARCH_CTL_MENU_RUNNING:
|
||||
#ifdef HAVE_MENU
|
||||
@ -1547,7 +1547,7 @@ void rarch_playlist_load_content(void *data, unsigned idx)
|
||||
free(path_check);
|
||||
}
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, (void*)core_path);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
|
||||
|
||||
#ifdef HAVE_MENU
|
||||
if (menu)
|
||||
@ -1623,10 +1623,10 @@ int rarch_defer_core(core_info_list_t *core_info, const char *dir,
|
||||
if (supported != 1)
|
||||
return 0;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, s);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, s);
|
||||
|
||||
if (path_file_exists(new_core_path))
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, new_core_path);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, new_core_path);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
86
runloop.c
86
runloop.c
@ -450,7 +450,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
|
||||
switch (state)
|
||||
{
|
||||
case RARCH_MAIN_CTL_SET_WINDOWED_SCALE:
|
||||
case RUNLOOP_CTL_SET_WINDOWED_SCALE:
|
||||
{
|
||||
unsigned *idx = (unsigned*)data;
|
||||
if (!idx)
|
||||
@ -458,7 +458,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
global->pending.windowed_scale = *idx;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_LIBRETRO_PATH:
|
||||
case RUNLOOP_CTL_SET_LIBRETRO_PATH:
|
||||
{
|
||||
const char *fullpath = (const char*)data;
|
||||
if (!fullpath)
|
||||
@ -466,10 +466,10 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
strlcpy(settings->libretro, fullpath, sizeof(settings->libretro));
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CLEAR_CONTENT_PATH:
|
||||
case RUNLOOP_CTL_CLEAR_CONTENT_PATH:
|
||||
*global->path.fullpath = '\0';
|
||||
break;
|
||||
case RARCH_MAIN_CTL_GET_CONTENT_PATH:
|
||||
case RUNLOOP_CTL_GET_CONTENT_PATH:
|
||||
{
|
||||
char **fullpath = (char**)data;
|
||||
if (!fullpath)
|
||||
@ -477,7 +477,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
*fullpath = (char*)global->path.fullpath;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_CONTENT_PATH:
|
||||
case RUNLOOP_CTL_SET_CONTENT_PATH:
|
||||
{
|
||||
const char *fullpath = (const char*)data;
|
||||
if (!fullpath)
|
||||
@ -485,7 +485,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
strlcpy(global->path.fullpath, fullpath, sizeof(global->path.fullpath));
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CHECK_IDLE_STATE:
|
||||
case RUNLOOP_CTL_CHECK_IDLE_STATE:
|
||||
{
|
||||
event_cmd_state_t *cmd = (event_cmd_state_t*)data;
|
||||
bool focused = check_focus(settings);
|
||||
@ -493,13 +493,13 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
check_pause(settings, focused,
|
||||
cmd->pause_pressed, cmd->frameadvance_pressed);
|
||||
|
||||
if (!rarch_main_ctl(RARCH_MAIN_CTL_CHECK_PAUSE_STATE, cmd))
|
||||
if (!rarch_main_ctl(RUNLOOP_CTL_CHECK_PAUSE_STATE, cmd))
|
||||
return false;
|
||||
if (!focused)
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
case RARCH_MAIN_CTL_CHECK_STATE:
|
||||
case RUNLOOP_CTL_CHECK_STATE:
|
||||
{
|
||||
event_cmd_state_t *cmd = (event_cmd_state_t*)data;
|
||||
|
||||
@ -536,7 +536,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
if (!rarch_main_ctl(RARCH_MAIN_CTL_CHECK_IDLE_STATE, data))
|
||||
if (!rarch_main_ctl(RUNLOOP_CTL_CHECK_IDLE_STATE, data))
|
||||
return false;
|
||||
|
||||
check_fast_forward_button(
|
||||
@ -552,10 +552,10 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
|
||||
check_rewind(settings, global, cmd->rewind_pressed);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CHECK_SLOWMOTION, &cmd->slowmotion_pressed);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CHECK_SLOWMOTION, &cmd->slowmotion_pressed);
|
||||
|
||||
if (cmd->movie_record)
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CHECK_MOVIE, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CHECK_MOVIE, NULL);
|
||||
|
||||
check_shader_dir(global, cmd->shader_next_pressed,
|
||||
cmd->shader_prev_pressed);
|
||||
@ -581,7 +581,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
}
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CHECK_PAUSE_STATE:
|
||||
case RUNLOOP_CTL_CHECK_PAUSE_STATE:
|
||||
{
|
||||
bool check_is_oneshot;
|
||||
event_cmd_state_t *cmd = (event_cmd_state_t*)data;
|
||||
@ -604,7 +604,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CHECK_SLOWMOTION:
|
||||
case RUNLOOP_CTL_CHECK_SLOWMOTION:
|
||||
{
|
||||
bool *ptr = (bool*)data;
|
||||
|
||||
@ -625,13 +625,13 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
rarch_main_msg_queue_push_new(MSG_SLOW_MOTION, 0, 30, true);
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CHECK_MOVIE:
|
||||
case RUNLOOP_CTL_CHECK_MOVIE:
|
||||
if (global->bsv.movie_playback)
|
||||
return rarch_main_ctl(RARCH_MAIN_CTL_CHECK_MOVIE_PLAYBACK, NULL);
|
||||
return rarch_main_ctl(RUNLOOP_CTL_CHECK_MOVIE_PLAYBACK, NULL);
|
||||
if (!global->bsv.movie)
|
||||
return rarch_main_ctl(RARCH_MAIN_CTL_CHECK_MOVIE_INIT, NULL);
|
||||
return rarch_main_ctl(RARCH_MAIN_CTL_CHECK_MOVIE_RECORD, NULL);
|
||||
case RARCH_MAIN_CTL_CHECK_MOVIE_RECORD:
|
||||
return rarch_main_ctl(RUNLOOP_CTL_CHECK_MOVIE_INIT, NULL);
|
||||
return rarch_main_ctl(RUNLOOP_CTL_CHECK_MOVIE_RECORD, NULL);
|
||||
case RUNLOOP_CTL_CHECK_MOVIE_RECORD:
|
||||
if (!global->bsv.movie)
|
||||
return false;
|
||||
|
||||
@ -641,7 +641,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
|
||||
event_command(EVENT_CMD_BSV_MOVIE_DEINIT);
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CHECK_MOVIE_INIT:
|
||||
case RUNLOOP_CTL_CHECK_MOVIE_INIT:
|
||||
if (global->bsv.movie)
|
||||
return false;
|
||||
{
|
||||
@ -681,7 +681,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
}
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CHECK_MOVIE_PLAYBACK:
|
||||
case RUNLOOP_CTL_CHECK_MOVIE_PLAYBACK:
|
||||
if (!global->bsv.movie_end)
|
||||
return false;
|
||||
|
||||
@ -694,14 +694,14 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
global->bsv.movie_end = false;
|
||||
global->bsv.movie_playback = false;
|
||||
break;
|
||||
case RARCH_MAIN_CTL_STATE_FREE:
|
||||
case RUNLOOP_CTL_STATE_FREE:
|
||||
main_is_idle = false;
|
||||
main_is_paused = false;
|
||||
main_is_slowmotion = false;
|
||||
frame_limit_last_time = 0.0;
|
||||
main_max_frames = 0;
|
||||
break;
|
||||
case RARCH_MAIN_CTL_GLOBAL_FREE:
|
||||
case RUNLOOP_CTL_GLOBAL_FREE:
|
||||
event_command(EVENT_CMD_TEMPORARY_CONTENT_DEINIT);
|
||||
event_command(EVENT_CMD_SUBSYSTEM_FULLPATHS_DEINIT);
|
||||
event_command(EVENT_CMD_RECORD_DEINIT);
|
||||
@ -709,12 +709,12 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
|
||||
memset(&g_extern, 0, sizeof(g_extern));
|
||||
break;
|
||||
case RARCH_MAIN_CTL_CLEAR_STATE:
|
||||
case RUNLOOP_CTL_CLEAR_STATE:
|
||||
driver_clear_state();
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_STATE_FREE, NULL);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_GLOBAL_FREE, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_STATE_FREE, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL);
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_MAX_FRAMES:
|
||||
case RUNLOOP_CTL_SET_MAX_FRAMES:
|
||||
{
|
||||
unsigned *ptr = (unsigned*)data;
|
||||
if (!ptr)
|
||||
@ -722,7 +722,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
main_max_frames = *ptr;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_FRAME_LIMIT_LAST_TIME:
|
||||
case RUNLOOP_CTL_SET_FRAME_LIMIT_LAST_TIME:
|
||||
{
|
||||
struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
|
||||
float fastforward_ratio = settings->fastforward_ratio;
|
||||
@ -734,9 +734,9 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
frame_limit_minimum_time = (retro_time_t)roundf(1000000.0f / (av_info->timing.fps * fastforward_ratio));
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_IS_IDLE:
|
||||
case RUNLOOP_CTL_IS_IDLE:
|
||||
return main_is_idle;
|
||||
case RARCH_MAIN_CTL_SET_IDLE:
|
||||
case RUNLOOP_CTL_SET_IDLE:
|
||||
{
|
||||
bool *ptr = (bool*)data;
|
||||
if (!ptr)
|
||||
@ -744,7 +744,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
main_is_idle = *ptr;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_IS_SLOWMOTION:
|
||||
case RUNLOOP_CTL_IS_SLOWMOTION:
|
||||
{
|
||||
bool *ptr = (bool*)data;
|
||||
if (!ptr)
|
||||
@ -752,7 +752,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
*ptr = main_is_slowmotion;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_SLOWMOTION:
|
||||
case RUNLOOP_CTL_SET_SLOWMOTION:
|
||||
{
|
||||
bool *ptr = (bool*)data;
|
||||
if (!ptr)
|
||||
@ -760,7 +760,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
main_is_slowmotion = *ptr;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_PAUSED:
|
||||
case RUNLOOP_CTL_SET_PAUSED:
|
||||
{
|
||||
bool *ptr = (bool*)data;
|
||||
if (!ptr)
|
||||
@ -768,7 +768,7 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
main_is_paused = *ptr;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_IS_PAUSED:
|
||||
case RUNLOOP_CTL_IS_PAUSED:
|
||||
{
|
||||
bool *ptr = (bool*)data;
|
||||
if (!ptr)
|
||||
@ -776,14 +776,14 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
*ptr = main_is_paused;
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_MSG_QUEUE_DEINIT:
|
||||
case RUNLOOP_CTL_MSG_QUEUE_DEINIT:
|
||||
rarch_main_msg_queue_free();
|
||||
break;
|
||||
case RARCH_MAIN_CTL_MSG_QUEUE_INIT:
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_MSG_QUEUE_DEINIT, NULL);
|
||||
case RUNLOOP_CTL_MSG_QUEUE_INIT:
|
||||
rarch_main_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, NULL);
|
||||
rarch_main_msg_queue_init();
|
||||
break;
|
||||
case RARCH_MAIN_CTL_PREPARE_DUMMY:
|
||||
case RUNLOOP_CTL_PREPARE_DUMMY:
|
||||
{
|
||||
#ifdef HAVE_MENU
|
||||
menu_handle_t *menu = menu_driver_get_ptr();
|
||||
@ -792,15 +792,15 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
|
||||
#endif
|
||||
rarch_main_data_clear_state();
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
|
||||
rarch_ctl(RARCH_CTL_LOAD_CONTENT, NULL);
|
||||
}
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_CORE_SHUTDOWN:
|
||||
case RUNLOOP_CTL_SET_CORE_SHUTDOWN:
|
||||
main_core_shutdown_initiated = true;
|
||||
break;
|
||||
case RARCH_MAIN_CTL_SET_EXEC:
|
||||
case RUNLOOP_CTL_SET_EXEC:
|
||||
main_exec = true;
|
||||
break;
|
||||
default:
|
||||
@ -957,7 +957,7 @@ static INLINE int rarch_main_iterate_time_to_exit(event_cmd_state_t *cmd)
|
||||
if (main_core_shutdown_initiated
|
||||
&& settings->load_dummy_on_core_shutdown)
|
||||
{
|
||||
if (!rarch_main_ctl(RARCH_MAIN_CTL_PREPARE_DUMMY, NULL))
|
||||
if (!rarch_main_ctl(RUNLOOP_CTL_PREPARE_DUMMY, NULL))
|
||||
return -1;
|
||||
|
||||
system->shutdown = false;
|
||||
@ -1083,7 +1083,7 @@ int rarch_main_iterate(unsigned *sleep_ms)
|
||||
if (menu_driver_alive())
|
||||
{
|
||||
bool focused = check_focus(settings) && !ui_companion_is_on_foreground();
|
||||
bool is_idle = rarch_main_ctl(RARCH_MAIN_CTL_IS_IDLE, NULL);
|
||||
bool is_idle = rarch_main_ctl(RUNLOOP_CTL_IS_IDLE, NULL);
|
||||
|
||||
if (menu_driver_iterate((enum menu_action)menu_input_frame_retropad(input, trigger_input)) == -1)
|
||||
rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
|
||||
@ -1103,7 +1103,7 @@ int rarch_main_iterate(unsigned *sleep_ms)
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!rarch_main_ctl(RARCH_MAIN_CTL_CHECK_STATE, &cmd))
|
||||
if (!rarch_main_ctl(RUNLOOP_CTL_CHECK_STATE, &cmd))
|
||||
{
|
||||
/* RetroArch has been paused. */
|
||||
driver->retro_ctx.poll_cb();
|
||||
|
58
runloop.h
58
runloop.h
@ -37,42 +37,42 @@ extern "C" {
|
||||
|
||||
enum rarch_main_ctl_state
|
||||
{
|
||||
RARCH_MAIN_CTL_IS_IDLE = 0,
|
||||
RARCH_MAIN_CTL_SET_WINDOWED_SCALE,
|
||||
RARCH_MAIN_CTL_SET_IDLE,
|
||||
RARCH_MAIN_CTL_CHECK_IDLE_STATE,
|
||||
RARCH_MAIN_CTL_GET_CONTENT_PATH,
|
||||
RARCH_MAIN_CTL_SET_CONTENT_PATH,
|
||||
RARCH_MAIN_CTL_CLEAR_CONTENT_PATH,
|
||||
RARCH_MAIN_CTL_SET_LIBRETRO_PATH,
|
||||
RARCH_MAIN_CTL_IS_SLOWMOTION,
|
||||
RARCH_MAIN_CTL_SET_SLOWMOTION,
|
||||
RARCH_MAIN_CTL_IS_PAUSED,
|
||||
RARCH_MAIN_CTL_SET_PAUSED,
|
||||
RARCH_MAIN_CTL_SET_MAX_FRAMES,
|
||||
RARCH_MAIN_CTL_SET_FRAME_LIMIT_LAST_TIME,
|
||||
RARCH_MAIN_CTL_CLEAR_STATE,
|
||||
RARCH_MAIN_CTL_STATE_FREE,
|
||||
RARCH_MAIN_CTL_GLOBAL_FREE,
|
||||
RARCH_MAIN_CTL_SET_CORE_SHUTDOWN,
|
||||
RARCH_MAIN_CTL_SET_EXEC,
|
||||
RUNLOOP_CTL_IS_IDLE = 0,
|
||||
RUNLOOP_CTL_SET_WINDOWED_SCALE,
|
||||
RUNLOOP_CTL_SET_IDLE,
|
||||
RUNLOOP_CTL_CHECK_IDLE_STATE,
|
||||
RUNLOOP_CTL_GET_CONTENT_PATH,
|
||||
RUNLOOP_CTL_SET_CONTENT_PATH,
|
||||
RUNLOOP_CTL_CLEAR_CONTENT_PATH,
|
||||
RUNLOOP_CTL_SET_LIBRETRO_PATH,
|
||||
RUNLOOP_CTL_IS_SLOWMOTION,
|
||||
RUNLOOP_CTL_SET_SLOWMOTION,
|
||||
RUNLOOP_CTL_IS_PAUSED,
|
||||
RUNLOOP_CTL_SET_PAUSED,
|
||||
RUNLOOP_CTL_SET_MAX_FRAMES,
|
||||
RUNLOOP_CTL_SET_FRAME_LIMIT_LAST_TIME,
|
||||
RUNLOOP_CTL_CLEAR_STATE,
|
||||
RUNLOOP_CTL_STATE_FREE,
|
||||
RUNLOOP_CTL_GLOBAL_FREE,
|
||||
RUNLOOP_CTL_SET_CORE_SHUTDOWN,
|
||||
RUNLOOP_CTL_SET_EXEC,
|
||||
/* Checks for state changes in this frame. */
|
||||
RARCH_MAIN_CTL_CHECK_STATE,
|
||||
RARCH_MAIN_CTL_CHECK_MOVIE,
|
||||
RUNLOOP_CTL_CHECK_STATE,
|
||||
RUNLOOP_CTL_CHECK_MOVIE,
|
||||
/* Checks if movie is being played. */
|
||||
RARCH_MAIN_CTL_CHECK_MOVIE_PLAYBACK,
|
||||
RARCH_MAIN_CTL_CHECK_MOVIE_INIT,
|
||||
RUNLOOP_CTL_CHECK_MOVIE_PLAYBACK,
|
||||
RUNLOOP_CTL_CHECK_MOVIE_INIT,
|
||||
/* Checks if movie is being recorded. */
|
||||
RARCH_MAIN_CTL_CHECK_MOVIE_RECORD,
|
||||
RUNLOOP_CTL_CHECK_MOVIE_RECORD,
|
||||
/* Checks if slowmotion toggle/hold was being pressed and/or held. */
|
||||
RARCH_MAIN_CTL_CHECK_SLOWMOTION,
|
||||
RARCH_MAIN_CTL_CHECK_PAUSE_STATE,
|
||||
RUNLOOP_CTL_CHECK_SLOWMOTION,
|
||||
RUNLOOP_CTL_CHECK_PAUSE_STATE,
|
||||
/* Initializes message queue. */
|
||||
RARCH_MAIN_CTL_MSG_QUEUE_INIT,
|
||||
RUNLOOP_CTL_MSG_QUEUE_INIT,
|
||||
/* Deinitializes message queue. */
|
||||
RARCH_MAIN_CTL_MSG_QUEUE_DEINIT,
|
||||
RUNLOOP_CTL_MSG_QUEUE_DEINIT,
|
||||
/* Initializes dummy core. */
|
||||
RARCH_MAIN_CTL_PREPARE_DUMMY
|
||||
RUNLOOP_CTL_PREPARE_DUMMY
|
||||
};
|
||||
|
||||
typedef struct rarch_dir_list
|
||||
|
@ -268,7 +268,7 @@ bool take_screenshot(void)
|
||||
msg = msg_hash_to_str(MSG_FAILED_TO_TAKE_SCREENSHOT);
|
||||
}
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_IS_PAUSED, &is_paused);
|
||||
rarch_main_ctl(RUNLOOP_CTL_IS_PAUSED, &is_paused);
|
||||
|
||||
rarch_main_msg_queue_push(msg, 1, is_paused ? 1 : 180, true);
|
||||
|
||||
|
@ -36,7 +36,7 @@ int main(int argc, char *argv[])
|
||||
(argc - optind - 1) * sizeof(char*));
|
||||
argc--;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_STATE);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CLEAR_STATE);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -276,7 +276,7 @@ extern void action_ok_push_quick_menu(void);
|
||||
NSString *__core = [filenames objectAtIndex:0];
|
||||
const char *core_name = global ? global->menu.info.library_name : NULL;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, (void*)__core.UTF8String);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)__core.UTF8String);
|
||||
|
||||
if (core_name)
|
||||
ui_companion_event_command(EVENT_CMD_LOAD_CONTENT);
|
||||
@ -306,13 +306,13 @@ extern void action_ok_push_quick_menu(void);
|
||||
|
||||
if (__core)
|
||||
{
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, (void*)__core.UTF8String);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)__core.UTF8String);
|
||||
ui_companion_event_command(EVENT_CMD_LOAD_CORE);
|
||||
|
||||
if (menu->load_no_content && settings->core.set_supports_no_game_enable)
|
||||
{
|
||||
int ret = 0;
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
rarch_main_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
|
||||
ret = menu_common_load_content(NULL, NULL, false, CORE_TYPE_PLAIN);
|
||||
if (ret == -1)
|
||||
action_ok_push_quick_menu();
|
||||
@ -341,7 +341,7 @@ extern void action_ok_push_quick_menu(void);
|
||||
NSString *__core = url.path;
|
||||
const char *core_name = global ? global->menu.info.library_name : NULL;
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, (void*)__core.UTF8String);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)__core.UTF8String);
|
||||
|
||||
if (core_name)
|
||||
ui_companion_event_command(EVENT_CMD_LOAD_CONTENT);
|
||||
@ -412,7 +412,7 @@ extern void action_ok_push_quick_menu(void);
|
||||
if (sender_tag >= 10 && sender_tag <= 19)
|
||||
{
|
||||
unsigned idx = (sender_tag - (10-1));
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_WINDOWED_SCALE, &idx);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx);
|
||||
cmd = EVENT_CMD_RESIZE_WINDOWED_SCALE;
|
||||
}
|
||||
|
||||
|
@ -45,8 +45,8 @@ static void rarch_enable_ui(void)
|
||||
|
||||
ui_companion_set_foreground(true);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_IDLE, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_IDLE, &boolean);
|
||||
rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
|
||||
}
|
||||
|
||||
@ -56,8 +56,8 @@ static void rarch_disable_ui(void)
|
||||
|
||||
ui_companion_set_foreground(false);
|
||||
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_IDLE, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_IDLE, &boolean);
|
||||
rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
|
||||
return;
|
||||
}
|
||||
|
||||
if (rarch_main_ctl(RARCH_MAIN_CTL_IS_IDLE, NULL))
|
||||
if (rarch_main_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
|
||||
return;
|
||||
CFRunLoopWakeUp(CFRunLoopGetMain());
|
||||
}
|
||||
|
@ -524,10 +524,10 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
|
||||
switch (mode)
|
||||
{
|
||||
case ID_M_LOAD_CORE:
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_LIBRETRO_PATH, win32_file);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, win32_file);
|
||||
break;
|
||||
case ID_M_LOAD_CONTENT:
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_CONTENT_PATH, win32_file);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, win32_file);
|
||||
do_wm_close = true;
|
||||
break;
|
||||
}
|
||||
@ -582,7 +582,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
|
||||
if (mode >= ID_M_WINDOW_SCALE_1X && mode <= ID_M_WINDOW_SCALE_10X)
|
||||
{
|
||||
unsigned idx = (mode - (ID_M_WINDOW_SCALE_1X-1));
|
||||
rarch_main_ctl(RARCH_MAIN_CTL_SET_WINDOWED_SCALE, &idx);
|
||||
rarch_main_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx);
|
||||
cmd = EVENT_CMD_RESIZE_WINDOWED_SCALE;
|
||||
}
|
||||
else if (mode == ID_M_STATE_INDEX_AUTO)
|
||||
|
Loading…
x
Reference in New Issue
Block a user