From 604ed74ff928764343dce4b7cb14e508f4b4b797 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 4 Dec 2016 10:30:51 -0600
Subject: [PATCH] remove some usages of VideoProviderGlue by checking for
 VideoProvider availability before doing some dependent processes

---
 BizHawk.Client.Common/SavestateManager.cs     | 19 ++++++++++++-------
 BizHawk.Client.EmuHawk/MainForm.Movie.cs      |  6 ++++--
 BizHawk.Client.EmuHawk/movie/RecordMovie.cs   |  4 ++--
 .../tools/TAStudio/BookmarksBranchesBox.cs    |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
index b82211153b..bc238cab4d 100644
--- a/BizHawk.Client.Common/SavestateManager.cs
+++ b/BizHawk.Client.Common/SavestateManager.cs
@@ -34,9 +34,9 @@ namespace BizHawk.Client.Common
 						bs.PutLump(BinaryStateLump.Corestate, bw => core.SaveStateBinary(bw));
 				}
 
-				if (Global.Config.SaveScreenshotWithStates)
+				if (Global.Config.SaveScreenshotWithStates && Global.Emulator.HasVideoProvider())
 				{
-					var vp = Global.Emulator.VideoProvider();
+					var vp = Global.Emulator.AsVideoProvider();
 					var buff = vp.GetVideoBuffer();
 					if (buff.Length == 1)
 					{
@@ -58,7 +58,7 @@ namespace BizHawk.Client.Common
 							out_h /= 2;
 						}
 						using (new SimpleTime("Save Framebuffer"))
-							bs.PutLump(BinaryStateLump.Framebuffer, (s) => QuickBmpFile.Save(Global.Emulator.VideoProvider(), s, out_w, out_h));
+							bs.PutLump(BinaryStateLump.Framebuffer, (s) => QuickBmpFile.Save(Global.Emulator.AsVideoProvider(), s, out_w, out_h));
 					}
 				}
 
@@ -96,14 +96,19 @@ namespace BizHawk.Client.Common
 
 		public static void PopulateFramebuffer(BinaryReader br)
 		{
+			if (!Global.Emulator.HasVideoProvider())
+			{
+				return;
+			}
+
 			try
 			{
 				using (new SimpleTime("Load Framebuffer"))
-					QuickBmpFile.Load(Global.Emulator.VideoProvider(), br.BaseStream);
+					QuickBmpFile.Load(Global.Emulator.AsVideoProvider(), br.BaseStream);
 			}
 			catch
 			{
-				var buff = Global.Emulator.VideoProvider().GetVideoBuffer();
+				var buff = Global.Emulator.AsVideoProvider().GetVideoBuffer();
 				try
 				{
 					for (int i = 0; i < buff.Length; i++)
@@ -219,9 +224,9 @@ namespace BizHawk.Client.Common
 							}
 
 							var args = str.Split(' ');
-							if (args[0] == "Framebuffer")
+							if (args[0] == "Framebuffer" && Global.Emulator.HasVideoProvider())
 							{
-								Global.Emulator.VideoProvider().GetVideoBuffer().ReadFromHex(args[1]);
+								Global.Emulator.AsVideoProvider().GetVideoBuffer().ReadFromHex(args[1]);
 							}
 						}
 					}
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 95ce24f0bf..ecd00201c2 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -73,16 +73,18 @@ namespace BizHawk.Client.EmuHawk
 				{
 					Global.Emulator.AsStatable().LoadStateBinary(new BinaryReader(new MemoryStream(movie.BinarySavestate, false)));
 				}
-				if (movie.SavestateFramebuffer != null)
+
+				if (movie.SavestateFramebuffer != null && Global.Emulator.HasVideoProvider())
 				{
 					var b1 = movie.SavestateFramebuffer;
-					var b2 = Global.Emulator.VideoProvider().GetVideoBuffer();
+					var b2 = Global.Emulator.AsVideoProvider().GetVideoBuffer();
 					int len = Math.Min(b1.Length, b2.Length);
 					for (int i = 0; i < len; i++)
 					{
 						b2[i] = b1[i];
 					}
 				}
+
 				Global.Emulator.ResetCounters();
 			}
 			else if (Global.Emulator.HasSaveRam() && movie.StartsFromSaveRam)
diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index 20a9ea91f2..47bd57628c 100644
--- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -112,9 +112,9 @@ namespace BizHawk.Client.EmuHawk
 					{
 						// hack: some IMovies eat the framebuffer, so don't bother with them
 						movieToRecord.SavestateFramebuffer = new int[0];
-						if (movieToRecord.SavestateFramebuffer != null)
+						if (movieToRecord.SavestateFramebuffer != null && Global.Emulator.HasVideoProvider())
 						{
-							movieToRecord.SavestateFramebuffer = (int[])Global.Emulator.VideoProvider().GetVideoBuffer().Clone();
+							movieToRecord.SavestateFramebuffer = (int[])Global.Emulator.AsVideoProvider().GetVideoBuffer().Clone();
 						}
 					}
 				}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
index cb587064df..d1238b9c2b 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
@@ -165,7 +165,7 @@ namespace BizHawk.Client.EmuHawk
 			Tastudio.CurrentTasMovie.LoadBranch(branch);
 			var stateInfo = new KeyValuePair<int, byte[]>(branch.Frame, branch.CoreData);
 			Tastudio.LoadState(stateInfo);
-			QuickBmpFile.Copy(new BitmapBufferVideoProvider(branch.OSDFrameBuffer), Global.Emulator.VideoProvider());
+			QuickBmpFile.Copy(new BitmapBufferVideoProvider(branch.OSDFrameBuffer), Tastudio.VideoProvider);
 			//GlobalWin.MainForm.PauseEmulator();
 			GlobalWin.MainForm.PauseOnFrame = null;
 			Tastudio.RefreshDialog();