CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-23 19:54:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of runloop_ctl actions

Browse Source
This commit is contained in:
twinaphex 2016-10-21 03:46:05 +02:00
parent 2f61d4db8c
commit 2350ef9234
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
runloop.c
View File

@ -545,12 +545,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
case RUNLOOP_CTL_SET_FRAME_TIME_LAST:
runloop_frame_time_last_enable = true;
break;
case RUNLOOP_CTL_UNSET_FRAME_TIME_LAST:
if (!runloop_ctl(RUNLOOP_CTL_IS_FRAME_TIME_LAST, NULL))
return false;
runloop_frame_time_last = 0;
runloop_frame_time_last_enable = false;
break;
case RUNLOOP_CTL_SET_OVERRIDES_ACTIVE:
runloop_overrides_active = true;
break;
@ -572,9 +566,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
case RUNLOOP_CTL_SET_FRAME_LIMIT:
runloop_set_frame_limit = true;
break;
case RUNLOOP_CTL_UNSET_FRAME_LIMIT:
runloop_set_frame_limit = false;
break;
case RUNLOOP_CTL_SHOULD_SET_FRAME_LIMIT:
return runloop_set_frame_limit;
case RUNLOOP_CTL_GET_PERFCNT:
@ -782,25 +773,16 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
case RUNLOOP_CTL_SET_CORE_SHUTDOWN:
runloop_core_shutdown_initiated = true;
break;
case RUNLOOP_CTL_UNSET_CORE_SHUTDOWN:
runloop_core_shutdown_initiated = false;
break;
case RUNLOOP_CTL_IS_CORE_SHUTDOWN:
return runloop_core_shutdown_initiated;
case RUNLOOP_CTL_SET_SHUTDOWN:
runloop_shutdown_initiated = true;
break;
case RUNLOOP_CTL_UNSET_SHUTDOWN:
runloop_shutdown_initiated = false;
break;
case RUNLOOP_CTL_IS_SHUTDOWN:
return runloop_shutdown_initiated;
case RUNLOOP_CTL_SET_EXEC:
runloop_exec = true;
break;
case RUNLOOP_CTL_UNSET_EXEC:
runloop_exec = false;
break;
case RUNLOOP_CTL_IS_EXEC:
return runloop_exec;
case RUNLOOP_CTL_DATA_DEINIT:
@ -1032,7 +1014,7 @@ static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed)
#endif
if (runloop_exec)
runloop_ctl(RUNLOOP_CTL_UNSET_EXEC, NULL);
runloop_exec = false;
if (runloop_core_shutdown_initiated &&
settings->load_dummy_on_core_shutdown)
@ -1048,8 +1030,8 @@ static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed)
/* Loads dummy core instead of exiting RetroArch completely.
* Aborts core shutdown if invoked. */
runloop_ctl(RUNLOOP_CTL_UNSET_SHUTDOWN, NULL);
runloop_ctl(RUNLOOP_CTL_UNSET_CORE_SHUTDOWN, NULL);
runloop_shutdown_initiated = false;
runloop_core_shutdown_initiated = false;
return 1;
}

5
runloop.h
View File

@ -33,14 +33,12 @@ enum runloop_ctl_state
RUNLOOP_CTL_NONE = 0,
RUNLOOP_CTL_SET_FRAME_LIMIT,
RUNLOOP_CTL_UNSET_FRAME_LIMIT,
RUNLOOP_CTL_SHOULD_SET_FRAME_LIMIT,
RUNLOOP_CTL_TASK_INIT,
RUNLOOP_CTL_FRAME_TIME_FREE,
RUNLOOP_CTL_SET_FRAME_TIME_LAST,
RUNLOOP_CTL_UNSET_FRAME_TIME_LAST,
RUNLOOP_CTL_IS_FRAME_TIME_LAST,
RUNLOOP_CTL_SET_FRAME_TIME,
@ -73,15 +71,12 @@ enum runloop_ctl_state
RUNLOOP_CTL_GLOBAL_FREE,
RUNLOOP_CTL_SET_CORE_SHUTDOWN,
RUNLOOP_CTL_UNSET_CORE_SHUTDOWN,
RUNLOOP_CTL_IS_CORE_SHUTDOWN,
RUNLOOP_CTL_SET_SHUTDOWN,
RUNLOOP_CTL_UNSET_SHUTDOWN,
RUNLOOP_CTL_IS_SHUTDOWN,
RUNLOOP_CTL_SET_EXEC,
RUNLOOP_CTL_UNSET_EXEC,
RUNLOOP_CTL_IS_EXEC,
/* Runloop state */