From bc2293a4820dbe48c640da602f7d63b67c5e437c Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Fri, 22 Jul 2011 00:19:25 +0000
Subject: [PATCH] Ripped out inputlog, for now

---
 BizHawk.MultiClient/MainForm.MenuItems.cs |  6 ----
 BizHawk.MultiClient/MainForm.cs           | 42 +----------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index 4e8a635ecc..27c928ab93 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -163,12 +163,6 @@ namespace BizHawk.MultiClient
 			}
 		}
 
-		public void StopInputLog()
-		{
-			if (InputLog.Mode == MOVIEMODE.RECORD)
-				InputLog.StopMovie();
-		}
-
 		private void stopMovieToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			StopUserMovie();
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 04ed367332..bbe313e138 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -24,7 +24,6 @@ namespace BizHawk.MultiClient
 		SavestateManager StateSlots = new SavestateManager();
 
 		//Movie variables
-		public Movie InputLog = new Movie();
 		public Movie UserMovie = new Movie();
 		
 		public bool PressFrameAdvance = false;
@@ -105,7 +104,6 @@ namespace BizHawk.MultiClient
 			Closing += (o, e) =>
 			{
 				CloseGame();
-				InputLog.StopMovie();
 				UserMovie.StopMovie();
 				SaveConfig();
 			};
@@ -173,7 +171,6 @@ namespace BizHawk.MultiClient
 					Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY);
 					ReadOnly = true;
 					StartNewMovie(m, false);
-					CreateNewInputLog(false);
 					Global.Config.RecentMovies.Add(cmdMovie);
 				}
 			}
@@ -186,13 +183,8 @@ namespace BizHawk.MultiClient
 					Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY);
 					ReadOnly = true;
 					StartNewMovie(m, false);
-					CreateNewInputLog(false);
 				}
 			}
-			else
-			{
-				CreateNewInputLog(true);
-			}
 
 			if (cmdLoadState != null && Global.Game != null)
 				LoadState("QuickSave" + cmdLoadState);
@@ -228,16 +220,6 @@ namespace BizHawk.MultiClient
 				PauseEmulator();
 		}
 
-		void CreateNewInputLog(bool active)
-		{
-			MOVIEMODE m;
-			if (active)
-				m = MOVIEMODE.RECORD;
-			else
-				m = MOVIEMODE.INACTIVE;
-			InputLog = new Movie(PathManager.MakeAbsolutePath(Global.Config.MoviesPath, "") + "\\log.tas", m);
-		}
-
 		void SyncCoreInputComm()
 		{
 			Global.CoreInputComm.NES_BackdropColor = Global.Config.NESBackgroundColor;
@@ -930,15 +912,6 @@ namespace BizHawk.MultiClient
 				if (File.Exists(game.SaveRamPath))
 					LoadSaveRam();
 
-				if (UserMovie.Mode == MOVIEMODE.INACTIVE)
-				{
-					InputLog.Header.SetHeaderLine(MovieHeader.PLATFORM, Global.Emulator.SystemId);
-					InputLog.Header.SetHeaderLine(MovieHeader.GAMENAME, Global.Game.FilesystemSafeName);
-					InputLog.Header.SetHeaderLine(MovieHeader.GUID, MovieHeader.MakeGUID());
-					InputLog.Header.SetHeaderLine(MovieHeader.AUTHOR, Global.Config.DefaultAuthor);
-					CreateNewInputLog(true);
-				}
-
 				//setup the throttle based on platform's specifications
 				//(one day later for some systems we will need to modify it at runtime as the display mode changes)
 				{
@@ -1043,7 +1016,6 @@ namespace BizHawk.MultiClient
 			Global.Emulator = new NullEmulator();
 			Global.ActiveController = Global.NullControls;
 			UserMovie.StopMovie();
-			InputLog.StopMovie();
 		}
 
 		void OnSelectSlot(int num)
@@ -1432,7 +1404,6 @@ namespace BizHawk.MultiClient
 				if (UserMovie.Mode == MOVIEMODE.INACTIVE)
 				{
 					UserMovie.LatchInputFromPlayer();
-					InputLog.CommitFrame();
 				}
 				
 				if (UserMovie.Mode == MOVIEMODE.PLAY)
@@ -1541,8 +1512,6 @@ namespace BizHawk.MultiClient
 			{
 				UserMovie.DumpLogIntoSavestateText(writer);
 			}
-			else if (InputLog.Mode != MOVIEMODE.INACTIVE)
-				InputLog.DumpLogIntoSavestateText(writer);
 		}
 
 		private void SaveState(string name)
@@ -1664,11 +1633,6 @@ namespace BizHawk.MultiClient
 					}
 				}
 			}
-			else
-			{
-				if (InputLog.Mode == MOVIEMODE.RECORD)
-					InputLog.LoadLogFromSavestateText(reader);
-			}
 		}
 
 		private void LoadStateFile(string path, string name)
@@ -2371,7 +2335,6 @@ namespace BizHawk.MultiClient
 		{
 
 			UserMovie = m;
-			InputLog.StopMovie();
 			LoadRom(Global.MainForm.CurrentlyOpenRom);
 			UserMovie.LoadMovie();
 			Global.Config.RecentMovies.Add(m.Filename);
@@ -2388,12 +2351,11 @@ namespace BizHawk.MultiClient
 			SetMainformMovieInfo();
 		}
 
+		/*TODO: remove this or make usermovie private*/
 		public Movie GetActiveMovie()
 		{
 			if (UserMovie.Mode != MOVIEMODE.INACTIVE)
 				return UserMovie;
-			else if (InputLog.Mode != MOVIEMODE.INACTIVE)
-				return InputLog;
 			else
 				return null;
 		}
@@ -2402,8 +2364,6 @@ namespace BizHawk.MultiClient
 		{
 			if (UserMovie.Mode != MOVIEMODE.INACTIVE)
 				return true;
-			else if (InputLog.Mode != MOVIEMODE.INACTIVE)
-				return true;
 			else
 				return false;
 		}