From bc157d01188458f20ac4a20cd7472b1df7b1fcaa Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 12 Jun 2014 23:22:15 +0000
Subject: [PATCH] Movies 2.0 - last bit of cleanup in emuhawk to make
 everything based on IMovie.  The only references to Movie.cs are just in the
 importer.

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs | 2 +-
 BizHawk.Client.EmuHawk/MainForm.Movie.cs  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 42c8c78e21..524cf40e59 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1903,7 +1903,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void BackupMovieContextMenuItem_Click(object sender, EventArgs e)
 		{
-			(Global.MovieSession.Movie as Movie).SaveBackup();
+			Global.MovieSession.Movie.SaveBackup();
 			GlobalWin.OSD.AddMessage("Backup movie saved.");
 		}
 
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 508edbee67..b4c088e9dd 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -41,13 +41,11 @@ namespace BizHawk.Client.EmuHawk
 				if (!record && Global.Emulator.SystemId == "NES") // For NES we need special logic since the movie will drive which core to load
 				{
 					// If either is specified use that, else use whatever is currently set
-					// Movies 2.0 TODO
-					if ((Global.MovieSession.Movie as Movie).Header[HeaderKeys.CORE] == quicknesName)
+					if (Global.MovieSession.Movie.Core == quicknesName)
 					{
 						Global.Config.NES_InQuickNES = true;
 					}
-					// Movies 2.0 TODO
-					else if ((Global.MovieSession.Movie as Movie).Header[HeaderKeys.CORE] == neshawkName)
+					else if (Global.MovieSession.Movie.Core == neshawkName)
 					{
 						Global.Config.NES_InQuickNES = false;
 					}