From 09a3537d44df02a7d18ab33dd1bb3b8aeea0ce18 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 1 Dec 2015 01:25:36 +0100
Subject: [PATCH] Get rid of more global->bsv.movie references

---
 movie.c     | 12 ++++++++++++
 movie.h     |  4 ++++
 retroarch.c | 12 ++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/movie.c b/movie.c
index 2c0ee964ab..ffdc4613c3 100644
--- a/movie.c
+++ b/movie.c
@@ -322,8 +322,20 @@ bool bsv_movie_ctl(enum bsv_ctl_state state, void *data)
          return global->bsv.movie && !global->bsv.movie_playback;
       case BSV_MOVIE_CTL_START_RECORDING:
          return global->bsv.movie_start_recording;
+      case BSV_MOVIE_CTL_SET_START_RECORDING:
+         global->bsv.movie_start_recording = true;
+         break;
+      case BSV_MOVIE_CTL_UNSET_START_RECORDING:
+         global->bsv.movie_start_recording = false;
+         break;
       case BSV_MOVIE_CTL_START_PLAYBACK:
          return global->bsv.movie_start_playback;
+      case BSV_MOVIE_CTL_SET_START_PLAYBACK:
+         global->bsv.movie_start_playback = true;
+         break;
+      case BSV_MOVIE_CTL_UNSET_START_PLAYBACK:
+         global->bsv.movie_start_playback = false;
+         break;
       case BSV_MOVIE_CTL_END:
          return global->bsv.movie_end && global->bsv.eof_exit;
       case BSV_MOVIE_CTL_SET_END:
diff --git a/movie.h b/movie.h
index dc89ffe40d..cddd0a12c1 100644
--- a/movie.h
+++ b/movie.h
@@ -45,7 +45,11 @@ enum bsv_ctl_state
    BSV_MOVIE_CTL_IS_INITED = 0,
    BSV_MOVIE_CTL_PLAYBACK_ON,
    BSV_MOVIE_CTL_PLAYBACK_OFF,
+   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_SET_FRAME_START,
diff --git a/retroarch.c b/retroarch.c
index 0389862959..d30dec2365 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -760,8 +760,16 @@ static void parse_input(int argc, char *argv[])
          case 'R':
             strlcpy(global->bsv.movie_start_path, optarg,
                   sizeof(global->bsv.movie_start_path));
-            global->bsv.movie_start_playback  = (c == 'P');
-            global->bsv.movie_start_recording = (c == 'R');
+
+            if (c == 'P')
+               bsv_movie_ctl(BSV_MOVIE_CTL_SET_START_PLAYBACK, NULL);
+            else
+               bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_START_PLAYBACK, NULL);
+
+            if (c == 'R')
+               bsv_movie_ctl(BSV_MOVIE_CTL_SET_START_RECORDING, NULL);
+            else
+               bsv_movie_ctl(BSV_MOVIE_CTL_UNSET_START_RECORDING, NULL);
             break;
 
          case 'M':