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

Remove CoreComm link cable properties and turn it into an ILInkable service instead

This commit is contained in:
adelikat 2016-02-28 13:52:17 -05:00
parent 7a4a210ccc
commit f1f45afd83
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -2503,14 +2503,14 @@ namespace BizHawk.Client.EmuHawk
}
}
if (Global.Emulator.CoreComm.UsesLinkCable)
if (Global.Emulator.UsesLinkCable())
{
if (!LinkConnectStatusBarButton.Visible)
{
LinkConnectStatusBarButton.Visible = true;
}
LinkConnectStatusBarButton.Image = Global.Emulator.CoreComm.LinkConnected
LinkConnectStatusBarButton.Image = Global.Emulator.AsLinkable().LinkConnected
? LinkCableOn
: LinkCableOff;
}

1
BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
View File

@ -88,6 +88,7 @@
<Compile Include="Interfaces\IEmulatorService.cs" />
<Compile Include="Interfaces\IInputCallbackSystem.cs" />
<Compile Include="Interfaces\IInputPollable.cs" />
<Compile Include="Interfaces\ILinkable.cs" />
<Compile Include="Interfaces\IMemoryCallbackSystem.cs" />
<Compile Include="Interfaces\IMemoryDomains.cs" />
<Compile Include="Interfaces\IRegionable.cs" />

3
BizHawk.Emulation.Common/CoreComms.cs
View File

@ -33,9 +33,6 @@ namespace BizHawk.Emulation.Common
public int NominalWidth = 640;
public int NominalHeight = 480;
public bool LinkConnected = false;
public bool UsesLinkCable = false;
//I know we want to get rid of CoreComm, but while it's still here, I'll use it for this
public string LaunchLibretroCore;

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

@ -255,6 +255,21 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions
return core.ServiceProvider.GetService<ICodeDataLogger>();
}
public static ILinkable AsLinkable(this IEmulator core)
{
return core.ServiceProvider.GetService<ILinkable>();
}
public static bool UsesLinkCable(this IEmulator core)
{
if (core == null)
{
return false;
}
return core.ServiceProvider.HasService<ILinkable>();
}
// TODO: a better place for these
public static bool IsImplemented(this MethodInfo info)
{

10
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
isReleased: true
)]
[ServiceNotApplicable(typeof(IDriveLight))]
public partial class GambatteLink : IEmulator, IVideoProvider, ISyncSoundProvider, IInputPollable, ISaveRam, IStatable,
public partial class GambatteLink : IEmulator, IVideoProvider, ISyncSoundProvider, IInputPollable, ISaveRam, IStatable, ILinkable,
IDebuggable, ISettable<GambatteLink.GambatteLinkSettings, GambatteLink.GambatteLinkSyncSettings>
{
public GambatteLink(CoreComm comm, GameInfo leftinfo, byte[] leftrom, GameInfo rightinfo, byte[] rightrom, object Settings, object SyncSettings, bool deterministic)
@ -48,8 +48,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
comm.RomStatusDetails = "LEFT:\r\n" + L.CoreComm.RomStatusDetails + "RIGHT:\r\n" + R.CoreComm.RomStatusDetails;
comm.NominalWidth = L.CoreComm.NominalWidth + R.CoreComm.NominalWidth;
comm.NominalHeight = L.CoreComm.NominalHeight;
comm.UsesLinkCable = true;
comm.LinkConnected = true;
LinkConnected = true;
Frame = 0;
LagCount = 0;
@ -63,6 +63,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
SetMemoryDomains();
}
public bool LinkConnected { get; private set; }
bool disposed = false;
Gameboy L;
@ -126,7 +128,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{
cableconnected ^= true;
Console.WriteLine("Cable connect status to {0}", cableconnected);
CoreComm.LinkConnected = cableconnected;
LinkConnected = cableconnected;
}
cablediscosignal = cablediscosignal_new;