From 69a3bf6a31b62525b23fa4e96a2b70fce8186688 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 20 Apr 2017 10:40:11 +0200
Subject: [PATCH] Create bsv_movie_is_playback_{on|off}

---
 input/input_driver.c |  4 ++--
 movie.c              | 14 ++++++++++----
 movie.h              |  6 ++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index 77b0222eca..5f1bd49bbf 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -340,7 +340,7 @@ int16_t input_state(unsigned port, unsigned device,
 
    device &= RETRO_DEVICE_MASK;
 
-   if (bsv_movie_ctl(BSV_MOVIE_CTL_PLAYBACK_ON, NULL))
+   if (bsv_movie_is_playback_on())
    {
       int16_t bsv_result;
       if (bsv_movie_get_input(&bsv_result))
@@ -428,7 +428,7 @@ int16_t input_state(unsigned port, unsigned device,
       }
    }
 
-   if (bsv_movie_ctl(BSV_MOVIE_CTL_PLAYBACK_OFF, NULL))
+   if (bsv_movie_is_playback_off())
       bsv_movie_ctl(BSV_MOVIE_CTL_SET_INPUT, &res);
 
    return res;
diff --git a/movie.c b/movie.c
index 0d7702dbff..f812e95e56 100644
--- a/movie.c
+++ b/movie.c
@@ -371,16 +371,22 @@ bool bsv_movie_get_input(int16_t *bsv_data)
    return true;
 }
 
+bool bsv_movie_is_playback_on(void)
+{
+   return bsv_movie_state_handle && bsv_movie_state.movie_playback;
+}
+
+bool bsv_movie_is_playback_off(void)
+{
+   return bsv_movie_state_handle && !bsv_movie_state.movie_playback;
+}
+
 bool bsv_movie_ctl(enum bsv_ctl_state state, void *data)
 {
    switch (state)
    {
       case BSV_MOVIE_CTL_IS_INITED:
          return bsv_movie_state_handle;
-      case BSV_MOVIE_CTL_PLAYBACK_ON:
-         return bsv_movie_state_handle && bsv_movie_state.movie_playback;
-      case BSV_MOVIE_CTL_PLAYBACK_OFF:
-         return bsv_movie_state_handle && !bsv_movie_state.movie_playback;
       case BSV_MOVIE_CTL_START_RECORDING:
          return bsv_movie_state.movie_start_recording;
       case BSV_MOVIE_CTL_SET_START_RECORDING:
diff --git a/movie.h b/movie.h
index 4594571e28..45b78c4dcd 100644
--- a/movie.h
+++ b/movie.h
@@ -44,8 +44,6 @@ enum bsv_ctl_state
 {
    BSV_MOVIE_CTL_NONE = 0,
    BSV_MOVIE_CTL_IS_INITED,
-   BSV_MOVIE_CTL_PLAYBACK_ON,
-   BSV_MOVIE_CTL_PLAYBACK_OFF,
    BSV_MOVIE_CTL_SET_INPUT,
    BSV_MOVIE_CTL_SET_START_RECORDING,
    BSV_MOVIE_CTL_UNSET_START_RECORDING,
@@ -63,6 +61,10 @@ enum bsv_ctl_state
    BSV_MOVIE_CTL_UNSET_END
 };
 
+bool bsv_movie_is_playback_on(void);
+
+bool bsv_movie_is_playback_off(void);
+
 void bsv_movie_set_path(const char *path);
 
 void bsv_movie_set_start_path(const char *path);