Movies 2.0 work - play movie dialog is now complete IMovie based and no specific implementation

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

@@ -146,6 +146,14 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public IDictionary<string, string> HeaderEntries
+		{
+			get
+			{
+				throw new NotImplementedException();
+			}
+		}
+
 		public bool IsActive
 		{
 			get { return _mode != Moviemode.Inactive; }

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

@@ -146,6 +146,14 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public IDictionary<string, string> HeaderEntries
+		{
+			get
+			{
+				return Header;
+			}
+		}
+
 		public string PreferredExtension { get { return "bkm"; } }
 
 		// Movies 2.0 TODO: delete me

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

@@ -66,6 +66,11 @@ namespace BizHawk.Client.Common
 		string SystemID { get; set; }
 		string Hash { get; set; }
 		bool PreLoadText(HawkFile hawkFile); // Movies 2.0 TODO: find a better way to not need this
+		
+		/// <summary>
+		/// Returns header key value pairs stored in the movie file
+		/// </summary>
+		IDictionary<string, string> HeaderEntries { get; }
 
 		#endregion
 

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

@@ -71,11 +71,6 @@ namespace BizHawk.Client.Common
 
 		#region IMovie Implementation
 
-		public bool PreLoadText(HawkFile hawkFile)
-		{
-			throw new NotImplementedException();
-		}
-
 		public TasMovie(string filename, bool startsFromSavestate = false)
 			: this(startsFromSavestate)
 		{
@@ -194,6 +189,19 @@ namespace BizHawk.Client.Common
 			}
 		}
 
+		public bool PreLoadText(HawkFile hawkFile)
+		{
+			throw new NotImplementedException();
+		}
+
+		public IDictionary<string, string> HeaderEntries
+		{
+			get
+			{
+				return Header;
+			}
+		}
+
 		public string Filename { get; set; }
 
 		public MovieHeader Header { get; private set; }

BizHawk.Client.EmuHawk/movie/PlayMovie.cs

@@ -14,7 +14,6 @@ namespace BizHawk.Client.EmuHawk
 {
 	public partial class PlayMovie : Form
 	{
-		// Movies 2.0 TODO: this is hopelessly Movie.cs specific, make it generic, 
 		private List<IMovie> _movieList = new List<IMovie>();
 		private bool _sortReverse;
 		private string _sortedCol;
@@ -446,8 +445,7 @@ namespace BizHawk.Client.EmuHawk
 			var firstIndex = MovieView.SelectedIndices[0];
 			MovieView.ensureVisible(firstIndex);
 
-			// Movies 2.0 TODO - what responsibility should a mvoie implementation have here?
-			foreach (var kvp in (_movieList[firstIndex] as Movie).Header)
+			foreach (var kvp in _movieList[firstIndex].HeaderEntries)
 			{
 				var item = new ListViewItem(kvp.Key);
 				item.SubItems.Add(kvp.Value);