ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove some usages of VideoProviderGlue by checking for VideoProvider availability before doing some dependent processes

This commit is contained in:
adelikat 2016-12-04 10:30:51 -06:00
parent 281b83fd40
commit 604ed74ff9
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BizHawk.Client.Common/SavestateManager.cs
View File

@ -34,9 +34,9 @@ namespace BizHawk.Client.Common
bs.PutLump(BinaryStateLump.Corestate, bw => core.SaveStateBinary(bw)); 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(); var buff = vp.GetVideoBuffer();
if (buff.Length == 1) if (buff.Length == 1)
{ {
@ -58,7 +58,7 @@ namespace BizHawk.Client.Common
out_h /= 2; out_h /= 2;
} }
using (new SimpleTime("Save Framebuffer")) 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) public static void PopulateFramebuffer(BinaryReader br)
{ {
if (!Global.Emulator.HasVideoProvider())
{
return;
}
try try
{ {
using (new SimpleTime("Load Framebuffer")) using (new SimpleTime("Load Framebuffer"))
QuickBmpFile.Load(Global.Emulator.VideoProvider(), br.BaseStream); QuickBmpFile.Load(Global.Emulator.AsVideoProvider(), br.BaseStream);
} }
catch catch
{ {
var buff = Global.Emulator.VideoProvider().GetVideoBuffer(); var buff = Global.Emulator.AsVideoProvider().GetVideoBuffer();
try try
{ {
for (int i = 0; i < buff.Length; i++) for (int i = 0; i < buff.Length; i++)
@ -219,9 +224,9 @@ namespace BizHawk.Client.Common
} }
var args = str.Split(' '); 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]);
} }
} }
} }

6
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -73,16 +73,18 @@ namespace BizHawk.Client.EmuHawk
{ {
Global.Emulator.AsStatable().LoadStateBinary(new BinaryReader(new MemoryStream(movie.BinarySavestate, false))); 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 b1 = movie.SavestateFramebuffer;
var b2 = Global.Emulator.VideoProvider().GetVideoBuffer(); var b2 = Global.Emulator.AsVideoProvider().GetVideoBuffer();
int len = Math.Min(b1.Length, b2.Length); int len = Math.Min(b1.Length, b2.Length);
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
b2[i] = b1[i]; b2[i] = b1[i];
} }
} }
Global.Emulator.ResetCounters(); Global.Emulator.ResetCounters();
} }
else if (Global.Emulator.HasSaveRam() && movie.StartsFromSaveRam) else if (Global.Emulator.HasSaveRam() && movie.StartsFromSaveRam)

4
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -112,9 +112,9 @@ namespace BizHawk.Client.EmuHawk
{ {
// hack: some IMovies eat the framebuffer, so don't bother with them // hack: some IMovies eat the framebuffer, so don't bother with them
movieToRecord.SavestateFramebuffer = new int[0]; 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();
} }
} }
} }

2
BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -165,7 +165,7 @@ namespace BizHawk.Client.EmuHawk
Tastudio.CurrentTasMovie.LoadBranch(branch); Tastudio.CurrentTasMovie.LoadBranch(branch);
var stateInfo = new KeyValuePair<int, byte[]>(branch.Frame, branch.CoreData); var stateInfo = new KeyValuePair<int, byte[]>(branch.Frame, branch.CoreData);
Tastudio.LoadState(stateInfo); 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.PauseEmulator();
GlobalWin.MainForm.PauseOnFrame = null; GlobalWin.MainForm.PauseOnFrame = null;
Tastudio.RefreshDialog(); Tastudio.RefreshDialog();