From dc9fa1acf393331f0aa6eed1f8c0814b291f760f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 18 Apr 2020 11:54:49 -0500
Subject: [PATCH] movie code cleanup

---
 BizHawk.Client.Common/movie/MovieSession.cs   | 24 ++++++-------
 .../movie/interfaces/IMovieSession.cs         |  3 +-
 BizHawk.Client.EmuHawk/MainForm.Movie.cs      | 36 +++++++++++++++++--
 BizHawk.Client.EmuHawk/MainForm.cs            | 34 ------------------
 .../tools/TAStudio/TAStudio.cs                |  5 +--
 5 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index a4e2140ed2..5070077eff 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -325,20 +325,20 @@ namespace BizHawk.Client.Common
 
 		public void StopMovie(bool saveChanges = true)
 		{
-			var message = "Movie ";
-			if (Movie.IsRecording())
-			{
-				message += "recording ";
-			}
-			else if (Movie.IsPlaying())
-			{
-				message += "playback ";
-			}
-
-			message += "stopped.";
-
 			if (Movie.IsActive())
 			{
+				var message = "Movie ";
+				if (Movie.IsRecording())
+				{
+					message += "recording ";
+				}
+				else if (Movie.IsPlaying())
+				{
+					message += "playback ";
+				}
+
+				message += "stopped.";
+
 				var result = Movie.Stop(saveChanges);
 				if (result)
 				{
diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
index b2c3380e32..9a03ecddc3 100644
--- a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
+++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index a4a0eea5c3..88b55cd718 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -61,18 +61,48 @@ namespace BizHawk.Client.EmuHawk
 			UpdateStatusSlots();
 		}
 
-		public void RestartMovie()
+		private void StopMovie(bool saveChanges = true)
+		{
+			if (IsSlave && Master.WantsToControlStopMovie)
+			{
+				Master.StopMovie(!saveChanges);
+			}
+			else
+			{
+				MovieSession.StopMovie(saveChanges);
+				SetMainformMovieInfo();
+			}
+		}
+
+		private void RestartMovie()
 		{
 			if (IsSlave && Master.WantsToControlRestartMovie)
 			{
 				Master.RestartMovie();
 			}
+			else if (MovieSession.Movie.IsActive())
+			{
+				StartNewMovie(MovieSession.Movie, false);
+				AddOnScreenMessage("Replaying movie file in read-only mode");
+			}
+		}
+
+		private void ToggleReadOnly()
+		{
+			if (IsSlave && Master.WantsToControlReadOnly)
+			{
+				Master.ToggleReadOnly();
+			}
 			else
 			{
 				if (MovieSession.Movie.IsActive())
 				{
-					StartNewMovie(MovieSession.Movie, false);
-					AddOnScreenMessage("Replaying movie file in read-only mode");
+					MovieSession.ReadOnly ^= true;
+					AddOnScreenMessage(MovieSession.ReadOnly ? "Movie read-only mode" : "Movie read+write mode");
+				}
+				else
+				{
+					AddOnScreenMessage("No movie active");
 				}
 			}
 		}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index a24af96305..9a184c7f8b 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -4351,40 +4351,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void ToggleReadOnly()
-		{
-			if (IsSlave && Master.WantsToControlReadOnly)
-			{
-				Master.ToggleReadOnly();
-			}
-			else
-			{
-				if (MovieSession.Movie.IsActive())
-				{
-					MovieSession.ReadOnly ^= true;
-					AddOnScreenMessage(MovieSession.ReadOnly ? "Movie read-only mode" : "Movie read+write mode");
-				}
-				else
-				{
-					AddOnScreenMessage("No movie active");
-				}
-			}
-		}
-
-		private void StopMovie(bool saveChanges = true)
-		{
-			if (IsSlave && Master.WantsToControlStopMovie)
-			{
-				Master.StopMovie(!saveChanges);
-			}
-			else
-			{
-				MovieSession.StopMovie(saveChanges);
-				SetMainformMovieInfo();
-				UpdateStatusSlots();
-			}
-		}
-
 		private void CaptureRewind(bool suppressCaptureRewind)
 		{
 			if (IsRewindSlave)
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 70d8abae28..ef7ae7cfe9 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -756,10 +756,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_initializing = true;
 
-			if (movie == null)
-			{
-				movie = CurrentTasMovie;
-			}
+			movie ??= CurrentTasMovie;
 			
 			SetTasMovieCallbacks(movie as TasMovie);