From eb3ddab060352b77e412cee8daa9d9ae4c4f0326 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 16 Apr 2020 10:19:02 -0500
Subject: [PATCH] Cleanup IMovieSession method names to be a bit more conscise

---
 BizHawk.Client.Common/SavestateManager.cs            |  4 ++--
 BizHawk.Client.Common/movie/MovieSession.cs          | 12 ++++++------
 .../movie/interfaces/IMovieSession.cs                |  8 ++++----
 BizHawk.Client.EmuHawk/MainForm.cs                   |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
index 88dd1fa06e..0e1a96d99c 100644
--- a/BizHawk.Client.Common/SavestateManager.cs
+++ b/BizHawk.Client.Common/SavestateManager.cs
@@ -71,7 +71,7 @@ namespace BizHawk.Client.Common
 					{
 						// this never should have been a core's responsibility
 						tw.WriteLine("Frame {0}", emulator.Frame);
-						Global.MovieSession.HandleMovieSaveState(tw);
+						Global.MovieSession.HandleSaveState(tw);
 					});
 			}
 
@@ -156,7 +156,7 @@ namespace BizHawk.Client.Common
 					// We must handle movie input AFTER the core is loaded to properly handle mode changes, and input latching
 					if (Global.MovieSession.Movie.IsActive())
 					{
-						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState(tr));
+						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleLoadState(tr));
 						if (!succeed)
 						{
 							return false;
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index d1afec0772..9c3c86a91e 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -91,7 +91,7 @@ namespace BizHawk.Client.Common
 			return new Bk2Controller("", definition ?? MovieController.Definition);
 		}
 
-		public void HandleMovieOnFrameLoop()
+		public void HandleFrameBefore()
 		{
 			if (!Movie.IsActive())
 			{
@@ -151,7 +151,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public void HandleMovieAfterFrameLoop()
+		public void HandleFrameAfter()
 		{
 			if (Movie is TasMovie tasMovie)
 			{
@@ -167,7 +167,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public void HandleMovieSaveState(TextWriter writer)
+		public void HandleSaveState(TextWriter writer)
 		{
 			if (Movie.IsActive())
 			{
@@ -190,7 +190,7 @@ namespace BizHawk.Client.Common
 			return true;
 		}
 
-		public bool HandleMovieLoadState(TextReader reader)
+		public bool HandleLoadState(TextReader reader)
 		{
 			if (Movie.NotActive())
 			{
@@ -452,12 +452,12 @@ namespace BizHawk.Client.Common
 			// adelikat: TODO: this is likely the source of frame 0 TAStudio bugs, I think the intent is to check if the movie is 0 length?
 			if (Global.Emulator.Frame == 0) // Hacky
 			{
-				HandleMovieAfterFrameLoop(); // Frame 0 needs to be handled.
+				HandleFrameAfter(); // Frame 0 needs to be handled.
 			}
 
 			if (input == null)
 			{
-				HandleMovieAfterFrameLoop();
+				HandleFrameAfter();
 				return;
 			}
 
diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
index 7efa14c54d..6c1b12094a 100644
--- a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
+++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
@@ -48,12 +48,12 @@ namespace BizHawk.Client.Common
 		/// </summary>
 		IMovieController GenerateMovieController(ControllerDefinition definition = null);
 
-		void HandleMovieOnFrameLoop();
-		void HandleMovieAfterFrameLoop();
-		void HandleMovieSaveState(TextWriter writer);
+		void HandleFrameBefore();
+		void HandleFrameAfter();
+		void HandleSaveState(TextWriter writer);
 
 		bool CheckSavestateTimeline(TextReader reader);
-		bool HandleMovieLoadState(TextReader reader);
+		bool HandleLoadState(TextReader reader);
 
 		void QueueNewMovie(IMovie movie, bool record, IEmulator emulator);
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 2c708e6881..a24af96305 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2942,7 +2942,7 @@ namespace BizHawk.Client.EmuHawk
 					}
 				}
 
-				MovieSession.HandleMovieOnFrameLoop();
+				MovieSession.HandleFrameBefore();
 
 				if (Config.AutosaveSaveRAM)
 				{
@@ -2962,7 +2962,7 @@ namespace BizHawk.Client.EmuHawk
 				bool render = !InvisibleEmulation && (!_throttle.skipNextFrame || (_currAviWriter?.UsesVideo ?? false));
 				bool newFrame = Emulator.FrameAdvance(Global.InputManager.ControllerOutput, render, renderSound);
 
-				MovieSession.HandleMovieAfterFrameLoop();
+				MovieSession.HandleFrameAfter();
 
 				if (returnToRecording)
 				{
@@ -2971,7 +2971,7 @@ namespace BizHawk.Client.EmuHawk
 
 				if (isRewinding && !IsRewindSlave && MovieSession.Movie.IsRecording())
 				{
-					MovieSession.Movie.Truncate(Global.Emulator.Frame);
+					MovieSession.Movie.Truncate(Emulator.Frame);
 				}
 
 				CheatList.Pulse();