mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-26 15:08:52 +02:00
parent ce36506734
commit fd4ce8659c
1 changed files with 34 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
runloop.c
View File

@ -315,54 +315,7 @@ static void do_state_check_menu_toggle(settings_t *settings, global_t *global)
} }
#endif #endif
/** static bool do_pause_state_checks(
* do_pre_state_checks:
*
* Checks for state changes in this frame.
*
* Unlike do_state_checks(), this is performed for both
* the menu and the regular loop.
*
* Returns: 0.
**/
static int do_pre_state_checks(settings_t *settings,
global_t *global, event_cmd_state_t *cmd)
{
if (cmd->overlay_next_pressed)
event_command(EVENT_CMD_OVERLAY_NEXT);
if (!main_is_paused || menu_driver_alive())
{
if (cmd->fullscreen_toggle)
event_command(EVENT_CMD_FULLSCREEN_TOGGLE);
}
if (cmd->grab_mouse_pressed)
event_command(EVENT_CMD_GRAB_MOUSE_TOGGLE);
#ifdef HAVE_MENU
if (cmd->menu_pressed || (global->inited.core.type == CORE_TYPE_DUMMY))
do_state_check_menu_toggle(settings, global);
#endif
return 0;
}
#ifdef HAVE_NETPLAY
static int do_netplay_state_checks(
bool netplay_flip_pressed,
bool fullscreen_toggle)
{
if (netplay_flip_pressed)
event_command(EVENT_CMD_NETPLAY_FLIP_PLAYERS);
if (fullscreen_toggle)
event_command(EVENT_CMD_FULLSCREEN_TOGGLE);
return 0;
}
#endif
static int do_pause_state_checks(
bool frameadvance_pressed, bool frameadvance_pressed,
bool fullscreen_toggle_pressed, bool fullscreen_toggle_pressed,
bool rewind_pressed) bool rewind_pressed)
@ -370,7 +323,7 @@ static int do_pause_state_checks(
bool check_is_oneshot = frameadvance_pressed || rewind_pressed; bool check_is_oneshot = frameadvance_pressed || rewind_pressed;
if (!main_is_paused) if (!main_is_paused)
return 0; return true;
if (fullscreen_toggle_pressed) if (fullscreen_toggle_pressed)
{ {
@ -379,9 +332,9 @@ static int do_pause_state_checks(
} }
if (!check_is_oneshot) if (!check_is_oneshot)
return 1; return false;
return 0; return true;
} }
global_t *global_get_ptr(void) global_t *global_get_ptr(void)
@ -578,11 +531,11 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
* *
* Returns: 1 if RetroArch is in pause mode, 0 otherwise. * Returns: 1 if RetroArch is in pause mode, 0 otherwise.
**/ **/
static int do_state_checks(driver_t *driver, settings_t *settings, static bool do_state_checks(driver_t *driver, settings_t *settings,
global_t *global, event_cmd_state_t *cmd) global_t *global, event_cmd_state_t *cmd)
{ {
if (main_is_idle) if (main_is_idle)
return 1; return false;
if (cmd->screenshot_pressed) if (cmd->screenshot_pressed)
event_command(EVENT_CMD_TAKE_SCREENSHOT); event_command(EVENT_CMD_TAKE_SCREENSHOT);
@ -600,18 +553,24 @@ static int do_state_checks(driver_t *driver, settings_t *settings,
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
if (driver->netplay_data) if (driver->netplay_data)
return do_netplay_state_checks(cmd->netplay_flip_pressed, {
cmd->fullscreen_toggle); if (cmd->netplay_flip_pressed)
event_command(EVENT_CMD_NETPLAY_FLIP_PLAYERS);
if (cmd->fullscreen_toggle)
event_command(EVENT_CMD_FULLSCREEN_TOGGLE);
return true;
}
#endif #endif
check_pause(driver, settings, check_pause(driver, settings,
cmd->pause_pressed, cmd->frameadvance_pressed); cmd->pause_pressed, cmd->frameadvance_pressed);
if (do_pause_state_checks( if (!do_pause_state_checks(
cmd->frameadvance_pressed, cmd->frameadvance_pressed,
cmd->fullscreen_toggle, cmd->fullscreen_toggle,
cmd->rewind_pressed)) cmd->rewind_pressed))
return 1; return false;
check_fast_forward_button(driver, check_fast_forward_button(driver,
cmd->fastforward_pressed, cmd->fastforward_pressed,
@ -654,7 +613,7 @@ static int do_state_checks(driver_t *driver, settings_t *settings,
cheat_manager_toggle(global->cheat); cheat_manager_toggle(global->cheat);
} }
return 0; return true;
} }
/** /**
@ -878,7 +837,6 @@ static void rarch_main_iterate_linefeed_overlay(driver_t *driver,
} }
#endif #endif
void rarch_main_state_free(void) void rarch_main_state_free(void)
{ {
main_is_idle = false; main_is_idle = false;
@ -1047,7 +1005,22 @@ int rarch_main_iterate(unsigned *sleep_ms)
if (system->frame_time.callback) if (system->frame_time.callback)
rarch_update_frame_time(driver, settings->slowmotion_ratio, system); rarch_update_frame_time(driver, settings->slowmotion_ratio, system);
do_pre_state_checks(settings, global, &cmd); if (cmd.overlay_next_pressed)
event_command(EVENT_CMD_OVERLAY_NEXT);
if (!main_is_paused || menu_driver_alive())
{
if (cmd.fullscreen_toggle)
event_command(EVENT_CMD_FULLSCREEN_TOGGLE);
}
if (cmd.grab_mouse_pressed)
event_command(EVENT_CMD_GRAB_MOUSE_TOGGLE);
#ifdef HAVE_MENU
if (cmd.menu_pressed || (global->inited.core.type == CORE_TYPE_DUMMY))
do_state_check_menu_toggle(settings, global);
#endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
rarch_main_iterate_linefeed_overlay(driver, settings); rarch_main_iterate_linefeed_overlay(driver, settings);
@ -1095,7 +1068,7 @@ int rarch_main_iterate(unsigned *sleep_ms)
} }
#endif #endif
if (do_state_checks(driver, settings, global, &cmd)) if (!do_state_checks(driver, settings, global, &cmd))
{ {
/* RetroArch has been paused. */ /* RetroArch has been paused. */
driver->retro_ctx.poll_cb(); driver->retro_ctx.poll_cb();