libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 14:23:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Get rid of global->bsv references

Browse Source
This commit is contained in:
twinaphex 2015-12-01 01:29:16 +01:00
parent 09a3537d44
commit ca48d12858
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
movie.c
View File

@ -337,6 +337,11 @@ bool bsv_movie_ctl(enum bsv_ctl_state state, void *data)
global->bsv.movie_start_playback = false;
break;
case BSV_MOVIE_CTL_END:
return global->bsv.movie_end;
case BSV_MOVIE_CTL_SET_END_EOF:
global->bsv.eof_exit = true;
break;
case BSV_MOVIE_CTL_END_EOF:
return global->bsv.movie_end && global->bsv.eof_exit;
case BSV_MOVIE_CTL_SET_END:
global->bsv.movie_end = true;

2
movie.h
View File

@ -57,6 +57,8 @@ enum bsv_ctl_state
BSV_MOVIE_CTL_FRAME_REWIND,
BSV_MOVIE_CTL_DEINIT,
BSV_MOVIE_CTL_INIT,
BSV_MOVIE_CTL_END_EOF,
BSV_MOVIE_CTL_SET_END_EOF,
BSV_MOVIE_CTL_END,
BSV_MOVIE_CTL_SET_END,
BSV_MOVIE_CTL_UNSET_END

2
retroarch.c
View File

@ -910,7 +910,7 @@ static void parse_input(int argc, char *argv[])
exit(0);
case RA_OPT_EOF_EXIT:
global->bsv.eof_exit = true;
bsv_movie_ctl(BSV_MOVIE_CTL_SET_END_EOF, NULL);
break;
case RA_OPT_VERSION:

4
runloop.c
View File

@ -616,7 +616,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
}
break;
case RUNLOOP_CTL_CHECK_MOVIE_PLAYBACK:
if (!global->bsv.movie_end)
if (!bsv_movie_ctl(BSV_MOVIE_CTL_END, NULL))
return false;
rarch_main_msg_queue_push_new(
@ -868,7 +868,7 @@ static INLINE int rarch_main_iterate_time_to_exit(event_cmd_state_t *cmd)
rarch_system_info_t *system = rarch_system_info_get_ptr();
bool shutdown_pressed = (system && system->shutdown) || cmd->quit_key_pressed;
bool video_alive = video_driver_ctl(RARCH_DISPLAY_CTL_IS_ALIVE, NULL);
bool movie_end = bsv_movie_ctl(BSV_MOVIE_CTL_END, NULL);
bool movie_end = bsv_movie_ctl(BSV_MOVIE_CTL_END_EOF, NULL);
bool frame_count_end = false;
video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);