From 05b3f369eb5fa6115fa62d4c21105df7ad7ff2b6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 12 Jun 2014 21:27:49 +0000
Subject: [PATCH] Now that SGB is the BoardName, don't save a SGB row in the
 movie header

---
 BizHawk.Client.Common/movie/HeaderKeys.cs   | 4 ----
 BizHawk.Client.Common/movie/MovieImport.cs  | 4 +++-
 BizHawk.Client.EmuHawk/movie/RecordMovie.cs | 6 ------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/BizHawk.Client.Common/movie/HeaderKeys.cs b/BizHawk.Client.Common/movie/HeaderKeys.cs
index 4ca50f458a..bbf3fa0bf4 100644
--- a/BizHawk.Client.Common/movie/HeaderKeys.cs
+++ b/BizHawk.Client.Common/movie/HeaderKeys.cs
@@ -24,10 +24,6 @@ namespace BizHawk.Client.Common
 		// Core Setting
 		public const string CORE = "Core";
 
-		// Gameboy Settings that affect sync
-		// TODO: movie import references these but it shoudl be populating sync settings instead
-		public const string SGB = "SGB"; // A snes movie will set this to indicate that it's actually SGB
-
 		// Plugin Settings
 		public const string VIDEOPLUGIN = "VideoPlugin";
 
diff --git a/BizHawk.Client.Common/movie/MovieImport.cs b/BizHawk.Client.Common/movie/MovieImport.cs
index 91c36f8c59..85abfe5a5c 100644
--- a/BizHawk.Client.Common/movie/MovieImport.cs
+++ b/BizHawk.Client.Common/movie/MovieImport.cs
@@ -1119,7 +1119,9 @@ namespace BizHawk.Client.Common
 						case "sgb_ntsc":
 						case "sgb_pal":
 							platform = "SNES";
-							m.Header[HeaderKeys.SGB] = "True";
+							// Movies 2.0 TODO: populating this flag wasn't doing anything useful
+							// Figure out how to properly set sync settings to set it to sgb
+							//m.Header[HeaderKeys.SGB] = "True";
 							break;
 					}
 					bool pal = (gametype == "snes_pal" || gametype == "sgb_pal");
diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index 5e871b3bd9..591a7f7e55 100644
--- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -134,12 +134,6 @@ namespace BizHawk.Client.EmuHawk
 					}
 				}
 
-				if (Global.Emulator is LibsnesCore)
-				{
-					// TODO: shouldn't the Boardname property have sgb?
-					_movieToRecord.HeaderEntries[HeaderKeys.SGB] = (Global.Emulator as LibsnesCore).IsSGB.ToString();
-				}
-
 				_movieToRecord.Core = ((CoreAttributes)Attribute
 					.GetCustomAttribute(Global.Emulator.GetType(), typeof(CoreAttributes)))
 					.CoreName;