From 96718b281e34f6fd9ec101d3b9421141ef58b764 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 6 May 2017 18:14:16 +0200 Subject: [PATCH] Get rid of some bsv_movie_ctl actions --- movie.c | 6 +----- movie.h | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/movie.c b/movie.c index f79c53bbf4..68a7815d74 100644 --- a/movie.c +++ b/movie.c @@ -319,7 +319,7 @@ static void bsv_movie_init_state(void) { bool set_granularity = false; - if (bsv_movie_ctl(BSV_MOVIE_CTL_START_PLAYBACK, NULL)) + if (bsv_movie_state.movie_start_playback) { if (!(bsv_movie_init_handle(bsv_movie_state.movie_start_path, RARCH_MOVIE_PLAYBACK))) @@ -401,16 +401,12 @@ bool bsv_movie_ctl(enum bsv_ctl_state state, void *data) { case BSV_MOVIE_CTL_IS_INITED: return bsv_movie_state_handle; - case BSV_MOVIE_CTL_START_RECORDING: - return bsv_movie_state.movie_start_recording; case BSV_MOVIE_CTL_SET_START_RECORDING: bsv_movie_state.movie_start_recording = true; break; case BSV_MOVIE_CTL_UNSET_START_RECORDING: bsv_movie_state.movie_start_recording = false; break; - case BSV_MOVIE_CTL_START_PLAYBACK: - return bsv_movie_state.movie_start_playback; case BSV_MOVIE_CTL_SET_START_PLAYBACK: bsv_movie_state.movie_start_playback = true; break; diff --git a/movie.h b/movie.h index b6744ec608..3118330509 100644 --- a/movie.h +++ b/movie.h @@ -47,10 +47,8 @@ enum bsv_ctl_state BSV_MOVIE_CTL_SET_INPUT, BSV_MOVIE_CTL_SET_START_RECORDING, BSV_MOVIE_CTL_UNSET_START_RECORDING, - BSV_MOVIE_CTL_START_RECORDING, BSV_MOVIE_CTL_SET_START_PLAYBACK, BSV_MOVIE_CTL_UNSET_START_PLAYBACK, - BSV_MOVIE_CTL_START_PLAYBACK, BSV_MOVIE_CTL_UNSET_PLAYBACK, BSV_MOVIE_CTL_FRAME_REWIND, BSV_MOVIE_CTL_DEINIT,