From 508f1f594f1badcf97cd05208ce9f8b6d1d9b540 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 1 Dec 2015 00:19:15 +0100 Subject: [PATCH] rewind.c - get rid of global_t dependency --- movie.c | 3 +++ movie.h | 1 + rewind.c | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/movie.c b/movie.c index e4dcb6e8a6..0660891a4d 100644 --- a/movie.c +++ b/movie.c @@ -344,6 +344,9 @@ bool bsv_movie_ctl(enum bsv_ctl_state state, void *data) case BSV_MOVIE_CTL_SET_FRAME_END: bsv_movie_set_frame_end(global->bsv.movie); break; + case BSV_MOVIE_CTL_FRAME_REWIND: + bsv_movie_frame_rewind(global->bsv.movie); + break; default: return false; } diff --git a/movie.h b/movie.h index 10a4e30de9..bc4eb89dad 100644 --- a/movie.h +++ b/movie.h @@ -50,6 +50,7 @@ enum bsv_ctl_state BSV_MOVIE_CTL_UNSET_PLAYBACK, BSV_MOVIE_CTL_SET_FRAME_START, BSV_MOVIE_CTL_SET_FRAME_END, + BSV_MOVIE_CTL_FRAME_REWIND, BSV_MOVIE_CTL_DEINIT, BSV_MOVIE_CTL_INIT, BSV_MOVIE_CTL_END, diff --git a/rewind.c b/rewind.c index c707b4df43..f66c74f0db 100644 --- a/rewind.c +++ b/rewind.c @@ -654,7 +654,6 @@ void state_manager_event_deinit(void) void state_manager_check_rewind(bool pressed) { static bool first = true; - global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); if (state_manager_frame_is_reversed()) @@ -686,7 +685,7 @@ void state_manager_check_rewind(bool pressed) core.retro_unserialize(buf, rewind_state.size); if (bsv_movie_ctl(BSV_MOVIE_CTL_IS_INITED, NULL)) - bsv_movie_frame_rewind(global->bsv.movie); + bsv_movie_ctl(BSV_MOVIE_CTL_FRAME_REWIND, NULL); } else rarch_main_msg_queue_push_new(MSG_REWIND_REACHED_END,