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 in multihawk

This commit is contained in:
adelikat 2016-12-04 10:17:16 -06:00
parent 2f375388b5
commit 281b83fd40
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Client.MultiHawk/EmulatorWindow.cs
View File

@ -19,6 +19,8 @@ using System.IO;
namespace BizHawk.Client.MultiHawk namespace BizHawk.Client.MultiHawk
{ {
// TODO: we can safely assume videoprovider cores are a requirement of multihawk,
// but fail sooner and with a clear message instead of making misc calls to AsVideoProvider that will fail
public partial class EmulatorWindow : Form public partial class EmulatorWindow : Form
{ {
public EmulatorWindow(Mainform parent) public EmulatorWindow(Mainform parent)
@ -165,7 +167,7 @@ namespace BizHawk.Client.MultiHawk
var args = str.Split(' '); var args = str.Split(' ');
if (args[0] == "Framebuffer") if (args[0] == "Framebuffer")
{ {
Emulator.VideoProvider().GetVideoBuffer().ReadFromHex(args[1]); Emulator.AsVideoProvider().GetVideoBuffer().ReadFromHex(args[1]);
} }
} }
} }
@ -184,11 +186,11 @@ namespace BizHawk.Client.MultiHawk
try try
{ {
using (new SimpleTime("Load Framebuffer")) using (new SimpleTime("Load Framebuffer"))
QuickBmpFile.Load(Emulator.VideoProvider(), br.BaseStream); QuickBmpFile.Load(Emulator.AsVideoProvider(), br.BaseStream);
} }
catch catch
{ {
var buff = Emulator.VideoProvider().GetVideoBuffer(); var buff = Emulator.AsVideoProvider().GetVideoBuffer();
try try
{ {
for (int i = 0; i < buff.Length; i++) for (int i = 0; i < buff.Length; i++)
@ -264,9 +266,9 @@ namespace BizHawk.Client.MultiHawk
bs.PutLump(BinaryStateLump.Corestate, bw => core.SaveStateBinary(bw)); bs.PutLump(BinaryStateLump.Corestate, bw => core.SaveStateBinary(bw));
} }
if (true) //Global.Config.SaveScreenshotWithStates) if (true) //TODO: Global.Config.SaveScreenshotWithStates)
{ {
var vp = Emulator.VideoProvider(); var vp = Emulator.AsVideoProvider();
var buff = vp.GetVideoBuffer(); var buff = vp.GetVideoBuffer();
int out_w = vp.BufferWidth; int out_w = vp.BufferWidth;
@ -279,7 +281,7 @@ namespace BizHawk.Client.MultiHawk
out_h /= 2; out_h /= 2;
} }
using (new SimpleTime("Save Framebuffer")) using (new SimpleTime("Save Framebuffer"))
bs.PutLump(BinaryStateLump.Framebuffer, (s) => QuickBmpFile.Save(Emulator.VideoProvider(), s, out_w, out_h)); bs.PutLump(BinaryStateLump.Framebuffer, (s) => QuickBmpFile.Save(Emulator.AsVideoProvider(), s, out_w, out_h));
} }
if (IAmMaster) if (IAmMaster)
@ -311,7 +313,7 @@ namespace BizHawk.Client.MultiHawk
// run this entire thing exactly twice, since the first resize may adjust the menu stacking // run this entire thing exactly twice, since the first resize may adjust the menu stacking
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
var video = Emulator.VideoProvider(); var video = Emulator.AsVideoProvider();
int zoom = Global.Config.TargetZoomFactors[Global.Emulator.SystemId]; int zoom = Global.Config.TargetZoomFactors[Global.Emulator.SystemId];
var area = Screen.FromControl(this).WorkingArea; var area = Screen.FromControl(this).WorkingArea;
@ -355,7 +357,7 @@ namespace BizHawk.Client.MultiHawk
private Size _lastVideoSize = new Size(-1, -1), _lastVirtualSize = new Size(-1, -1); private Size _lastVideoSize = new Size(-1, -1), _lastVirtualSize = new Size(-1, -1);
public void Render() public void Render()
{ {
var video = Emulator.VideoProvider(); var video = Emulator.AsVideoProvider();
Size currVideoSize = new Size(video.BufferWidth, video.BufferHeight); Size currVideoSize = new Size(video.BufferWidth, video.BufferHeight);
Size currVirtualSize = new Size(video.VirtualWidth, video.VirtualWidth); Size currVirtualSize = new Size(video.VirtualWidth, video.VirtualWidth);

15
BizHawk.Emulation.Common/Extensions.cs
View File

@ -18,6 +18,21 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
return core == null || core is NullEmulator; return core == null || core is NullEmulator;
} }
public static bool HasVideoProvider(this IEmulator core)
{
if (core == null)
{
return false;
}
return core.ServiceProvider.HasService<IVideoProvider>();
}
public static IVideoProvider AsVideoProvider(this IEmulator core)
{
return core.ServiceProvider.GetService<IVideoProvider>();
}
public static bool HasMemoryDomains(this IEmulator core) public static bool HasMemoryDomains(this IEmulator core)
{ {
if (core == null) if (core == null)