From aabd3f4526f47e376786d81c8af8e7d5676ebad3 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 22 Feb 2015 23:23:36 +0000
Subject: [PATCH] create IMovieSession with the necessary API, instead of using
 an instance of MovieSession, the API though is completetly horrible, we need
 to address this

---
 .../BizHawk.Client.Common.csproj              |  1 +
 BizHawk.Client.Common/Global.cs               |  2 +-
 BizHawk.Client.Common/movie/MovieSession.cs   |  6 +--
 .../movie/interfaces/IMovieSession.cs         | 40 +++++++++++++++++++
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 BizHawk.Client.Common/movie/interfaces/IMovieSession.cs

diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index cb66b388fd..a01445b85c 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -187,6 +187,7 @@
     <Compile Include="movie\interfaces\ILogEntryGenerator.cs" />
     <Compile Include="movie\interfaces\IMovie.cs" />
     <Compile Include="movie\interfaces\IMovieController.cs" />
+    <Compile Include="movie\interfaces\IMovieSession.cs" />
     <Compile Include="movie\MovieService.cs" />
     <Compile Include="movie\MovieSession.cs" />
     <Compile Include="movie\MultitrackRecording.cs" />
diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index a7bf184556..2a9f4081c0 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -14,7 +14,7 @@ namespace BizHawk.Client.Common
 		public static FirmwareManager FirmwareManager;
 		public static Rewinder Rewinder;
 
-		public static MovieSession MovieSession = new MovieSession();
+		public static IMovieSession MovieSession = new MovieSession();
 
 		/// <summary>
 		/// Used to disable secondary throttling (e.g. vsync, audio) for unthrottled modes or when the primary (clock) throttle is taking over (e.g. during fast forward/rewind).
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 98cf347451..14e7a1999a 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -13,7 +13,7 @@ namespace BizHawk.Client.Common
 {
 	public enum MovieEndAction { Stop, Pause, Record, Finish }
 
-	public class MovieSession
+	public class MovieSession : IMovieSession
 	{
 		public MovieSession()
 		{
@@ -437,8 +437,8 @@ namespace BizHawk.Client.Common
 
 		// The behavior here is to only temporarily override these settings when playing a movie and then restore the user's preferred settings
 		// A more elegant approach would be appreciated
-		public bool? PreviousNES_InQuickNES = null;
-		public bool? PreviousSNES_InSnes9x = null;
+		public bool? PreviousNES_InQuickNES { get; set; }
+		public bool? PreviousSNES_InSnes9x { get; set; }
 
 		public void QueueNewMovie(IMovie movie, bool record, IEmulator emulator)
 		{
diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
new file mode 100644
index 0000000000..63bfe8cbeb
--- /dev/null
+++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.Common
+{
+	public interface IMovieSession
+	{
+		IMovie Movie { get; set; }
+		IMovie QueuedMovie { get; }
+		IMovieController MovieControllerAdapter { get; }
+		IMovieController MovieControllerInstance();
+		MultitrackRecorder MultiTrack { get; }
+
+		IController PreviousFrame { get; }
+		IController CurrentInput { get; }
+
+		bool ReadOnly { get; set; }
+		bool MovieIsQueued { get; }
+
+		bool? PreviousNES_InQuickNES { get; set; }
+		bool? PreviousSNES_InSnes9x { get; set; }
+
+		void HandleMovieOnFrameLoop();
+		void HandleMovieSaveState(TextWriter writer);
+		bool HandleMovieLoadState(string path);
+
+		// To function as a MovieSession, you must have hacky LoadState steps, non-hacky steps just won't do
+		bool HandleMovieLoadState_HackyStep1(TextReader reader);
+		bool HandleMovieLoadState_HackyStep2(TextReader reader);
+
+		ILogEntryGenerator LogGeneratorInstance();
+
+		void QueueNewMovie(IMovie movie, bool record, IEmulator emulator);
+		void RunQueuedMovie(bool recordMode);
+
+		void ToggleMultitrack();
+
+		void StopMovie(bool saveChanges = true);
+	}
+}