mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove RUNLOOP_CTL_IS_FRAME_COUNT_END

Browse Source
This commit is contained in:
twinaphex 2016-05-08 06:36:52 +02:00
parent 8e599379f6
commit a9cec38c1d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
runloop.c
View File

@ -579,6 +579,13 @@ static bool runloop_is_focused(void)
return true; return true;
} }
static bool runloop_is_frame_count_end(void)
{
uint64_t *frame_count = NULL;
video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);
return runloop_max_frames && (*frame_count >= runloop_max_frames);
}
bool runloop_ctl(enum runloop_ctl_state state, void *data) bool runloop_ctl(enum runloop_ctl_state state, void *data)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -648,12 +655,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_CALLBACK, NULL); audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_CALLBACK, NULL);
memset(&runloop_system, 0, sizeof(rarch_system_info_t)); memset(&runloop_system, 0, sizeof(rarch_system_info_t));
break; break;
case RUNLOOP_CTL_IS_FRAME_COUNT_END:
{
uint64_t *frame_count = NULL;
video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);
return runloop_max_frames && (*frame_count >= runloop_max_frames);
}
case RUNLOOP_CTL_SET_FRAME_TIME_LAST: case RUNLOOP_CTL_SET_FRAME_TIME_LAST:
runloop_frame_time_last_enable = true; runloop_frame_time_last_enable = true;
break; break;
@ -1251,7 +1252,7 @@ static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed)
time_to_exit = time_to_exit || quit_key_pressed; time_to_exit = time_to_exit || quit_key_pressed;
time_to_exit = time_to_exit || !video_driver_ctl(RARCH_DISPLAY_CTL_IS_ALIVE, NULL); time_to_exit = time_to_exit || !video_driver_ctl(RARCH_DISPLAY_CTL_IS_ALIVE, NULL);
time_to_exit = time_to_exit || bsv_movie_ctl(BSV_MOVIE_CTL_END_EOF, NULL); time_to_exit = time_to_exit || bsv_movie_ctl(BSV_MOVIE_CTL_END_EOF, NULL);
time_to_exit = time_to_exit || runloop_ctl(RUNLOOP_CTL_IS_FRAME_COUNT_END, NULL); time_to_exit = time_to_exit || runloop_is_frame_count_end();
time_to_exit = time_to_exit || runloop_ctl(RUNLOOP_CTL_IS_EXEC, NULL); time_to_exit = time_to_exit || runloop_ctl(RUNLOOP_CTL_IS_EXEC, NULL);
if (!time_to_exit) if (!time_to_exit)

1
runloop.h
View File

@ -35,7 +35,6 @@ enum runloop_ctl_state
RUNLOOP_CTL_UNSET_FRAME_TIME_LAST, RUNLOOP_CTL_UNSET_FRAME_TIME_LAST,
RUNLOOP_CTL_TASK_INIT, RUNLOOP_CTL_TASK_INIT,
RUNLOOP_CTL_IS_FRAME_TIME_LAST, RUNLOOP_CTL_IS_FRAME_TIME_LAST,
RUNLOOP_CTL_IS_FRAME_COUNT_END,
RUNLOOP_CTL_IS_IDLE, RUNLOOP_CTL_IS_IDLE,
RUNLOOP_CTL_GET_WINDOWED_SCALE, RUNLOOP_CTL_GET_WINDOWED_SCALE,
RUNLOOP_CTL_SET_WINDOWED_SCALE, RUNLOOP_CTL_SET_WINDOWED_SCALE,