From ca48d12858a6154b9036ac4cc5fdfe5123195ef6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 1 Dec 2015 01:29:16 +0100 Subject: [PATCH] Get rid of global->bsv references --- movie.c | 5 +++++ movie.h | 2 ++ retroarch.c | 2 +- runloop.c | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/movie.c b/movie.c index ffdc4613c3..9891046202 100644 --- a/movie.c +++ b/movie.c @@ -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; diff --git a/movie.h b/movie.h index cddd0a12c1..bf2672d9dd 100644 --- a/movie.h +++ b/movie.h @@ -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 diff --git a/retroarch.c b/retroarch.c index d30dec2365..453c3db050 100644 --- a/retroarch.c +++ b/retroarch.c @@ -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: diff --git a/runloop.c b/runloop.c index 62e4ea5533..d045461e2f 100644 --- a/runloop.c +++ b/runloop.c @@ -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);