Some simplifying of IMovieHeader

BizHawk.Client.Common/movie/bk2/MovieHeader2.cs

@@ -7,16 +7,6 @@ namespace BizHawk.Client.Common
 {
 	public class MovieHeader2 : IMovieHeader
 	{
-		public SubtitleList Subtitles
-		{
-			get { throw new NotImplementedException(); }
-		}
-
-		public List<string> Comments
-		{
-			get { throw new NotImplementedException(); }
-		}
-
 		public ulong Rerecords
 		{
 			get
@@ -77,18 +67,6 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public string SyncSettingsJson
-		{
-			get
-			{
-				throw new NotImplementedException();
-			}
-			set
-			{
-				throw new NotImplementedException();
-			}
-		}
-
 		public bool ParseLineFromFile(string line)
 		{
 			throw new NotImplementedException();
@@ -180,5 +158,19 @@ namespace BizHawk.Client.Common
 		{
 			throw new NotImplementedException();
 		}
+
+		#region Won't implement
+
+		public SubtitleList Subtitles
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public List<string> Comments
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		#endregion
 	}
 }

BizHawk.Client.Common/movie/bkm/Movie.cs

@@ -47,12 +47,12 @@ namespace BizHawk.Client.Common
 
 		public SubtitleList Subtitles
 		{
-			get { return Header.Subtitles; }
+			get { return (Header as MovieHeader).Subtitles; }
 		}
 
 		public IList<string> Comments
 		{
-			get { return Header.Comments; }
+			get { return (Header as MovieHeader).Comments; }
 		}
 
 		public string SyncSettingsJson
@@ -356,7 +356,7 @@ namespace BizHawk.Client.Common
 
 					if (string.IsNullOrWhiteSpace(line) || Header.ParseLineFromFile(line))
 						continue;
-					Header.Comments.Add(line);
+					(Header as MovieHeader).Comments.Add(line);
 				}
 			}
 
@@ -410,7 +410,7 @@ namespace BizHawk.Client.Common
 					}
 					else
 					{
-						Header.Comments.Add(line);
+						(Header as MovieHeader).Comments.Add(line);
 					}
 				}
 			}

BizHawk.Client.Common/movie/bkm/MovieHeader.cs

@@ -33,24 +33,6 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public string SyncSettingsJson
-		{
-			get
-			{
-				if (ContainsKey(HeaderKeys.SYNCSETTINGS))
-				{
-					return this[HeaderKeys.SYNCSETTINGS];
-				}
-
-				return string.Empty;
-			}
-
-			set
-			{
-				this[HeaderKeys.SYNCSETTINGS] = value;
-			}
-		}
-
 		public ulong Rerecords
 		{
 			get

BizHawk.Client.Common/movie/interfaces/IMovieHeader.cs

@@ -4,15 +4,11 @@ namespace BizHawk.Client.Common
 {
 	public interface IMovieHeader : IDictionary<string, string>
 	{
-		SubtitleList Subtitles { get; }
-		List<string> Comments { get; }
-
 		ulong Rerecords { get; set; }
 		bool StartsFromSavestate { get; set; }
 		string SavestateBinaryBase64Blob { get; set; }
 		string GameName { get; set; }
 		string SystemID { get; set; }
-		string SyncSettingsJson { get; set; }
 
 		/// <summary>
 		/// Receives a line and attempts to add as a header

BizHawk.Client.Common/movie/tasproj/TasMovie.cs

@@ -88,25 +88,12 @@ namespace BizHawk.Client.Common
 
 		public SubtitleList Subtitles
 		{
-			get { return Header.Subtitles; }
+			get { return (Header as MovieHeader).Subtitles; }
 		}
 
 		public IList<string> Comments
 		{
-			get { return Header.Comments; }
+			get { return (Header as MovieHeader).Comments; }
-		}
-
-		public string SyncSettingsJson
-		{
-			get
-			{
-				return Header[HeaderKeys.SYNCSETTINGS];
-			}
-
-			set
-			{
-				Header[HeaderKeys.SYNCSETTINGS] = value;
-			}
 		}
 
 		public string Filename { get; set; }
@@ -336,7 +323,7 @@ namespace BizHawk.Client.Common
 						string line;
 						while ((line = tr.ReadLine()) != null)
 							if (!Header.ParseLineFromFile(line))
-								Header.Comments.Add(line);
+								(Header as MovieHeader).Comments.Add(line);
 					});
 				bl.GetLump(BinaryStateLump.Input, true,
 					delegate(TextReader tr)