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

use constants for core string names and simplify core core name getting logic

This commit is contained in:
adelikat 2020-04-17 14:36:41 -05:00
parent 0d2daa24d5
commit b736d48911
11 changed files with 82 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -2,6 +2,7 @@
using System.IO;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores;
using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.NES;
@ -252,69 +253,59 @@ namespace BizHawk.Client.Common
// Don't set it to a movie instance of the adapter or you will lose the definition!
Global.InputManager.RewireInputChain();
if (!record && emulator.SystemId == "NES") // For NES we need special logic since the movie will drive which core to load
if (!record)
{
var quicknesName = typeof(QuickNES).CoreName();
var neshawkName = typeof(NES).CoreName();
// If either is specified use that, else use whatever is currently set
if (movie.Core == quicknesName)
switch (emulator.SystemId)
{
PreviousNesInQuickNES = Global.Config.NesInQuickNes;
Global.Config.NesInQuickNes = true;
}
else if (movie.Core == neshawkName)
{
PreviousNesInQuickNES = Global.Config.NesInQuickNes;
Global.Config.NesInQuickNes = false;
}
}
else if (!record && emulator.SystemId == "SNES") // ditto with snes9x vs bsnes
{
var snes9XName = typeof(Snes9x).CoreName();
var bsnesName = typeof(LibsnesCore).CoreName();
if (movie.Core == snes9XName)
{
PreviousSnesInSnes9x = Global.Config.SnesInSnes9x;
Global.Config.SnesInSnes9x = true;
}
else if (movie.Core == bsnesName)
{
PreviousSnesInSnes9x = Global.Config.SnesInSnes9x;
Global.Config.SnesInSnes9x = false;
}
}
else if (!record && emulator.SystemId == "GBA") // ditto with GBA, we should probably architect this at some point, this isn't sustainable
{
var mGBAName = typeof(MGBAHawk).CoreName();
var vbaNextName = typeof(VBANext).CoreName();
if (movie.Core == mGBAName)
{
PreviousGbaUsemGba = Global.Config.GbaUsemGba;
Global.Config.GbaUsemGba = true;
}
else if (movie.Core == vbaNextName)
{
PreviousGbaUsemGba = Global.Config.GbaUsemGba;
Global.Config.GbaUsemGba = false;
}
}
else if (!record && (emulator.SystemId == "GB" || emulator.SystemId == "GBC"))
{
var gbHawkName = typeof(GBHawk).CoreName();
var gambatteName = typeof(Gameboy).CoreName();
if (movie.Core == gbHawkName)
{
PreviousGbUseGbHawk = Global.Config.GbUseGbHawk;
Global.Config.GbUseGbHawk = true;
}
else if (movie.Core == gambatteName)
{
PreviousGbUseGbHawk = Global.Config.GbUseGbHawk;
Global.Config.GbUseGbHawk = false;
case "NES":
if (movie.Core == CoreNames.QuickNes)
{
PreviousNesInQuickNES = Global.Config.NesInQuickNes;
Global.Config.NesInQuickNes = true;
}
else if (movie.Core == CoreNames.NesHawk)
{
PreviousNesInQuickNES = Global.Config.NesInQuickNes;
Global.Config.NesInQuickNes = false;
}
break;
case "SNES":
if (movie.Core == CoreNames.Snes9X)
{
PreviousSnesInSnes9x = Global.Config.SnesInSnes9x;
Global.Config.SnesInSnes9x = true;
}
else if (movie.Core == CoreNames.Bsnes)
{
PreviousSnesInSnes9x = Global.Config.SnesInSnes9x;
Global.Config.SnesInSnes9x = false;
}
break;
case "GBA":
if (movie.Core == CoreNames.Mgba)
{
PreviousGbaUsemGba = Global.Config.GbaUsemGba;
Global.Config.GbaUsemGba = true;
}
else if (movie.Core == CoreNames.VbaNext)
{
PreviousGbaUsemGba = Global.Config.GbaUsemGba;
Global.Config.GbaUsemGba = false;
}
break;
case "GB":
case "GBC":
if (movie.Core == CoreNames.GbHawk)
{
PreviousGbUseGbHawk = Global.Config.GbUseGbHawk;
Global.Config.GbUseGbHawk = true;
}
else if (movie.Core == CoreNames.Gambatte)
{
PreviousGbUseGbHawk = Global.Config.GbUseGbHawk;
Global.Config.GbUseGbHawk = false;
}
break;
}
}

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

@ -297,18 +297,6 @@ namespace BizHawk.Emulation.Common
return core.VsyncNumerator() / (double)core.VsyncDenominator();
}
// TODO: a better place for these
public static string CoreName(this Type type)
{
if (type == null)
{
return "";
}
var attr = (CoreAttribute)Attribute.GetCustomAttribute(type, typeof(CoreAttribute));
return attr?.CoreName ?? "";
}
public static bool IsImplemented(this MethodInfo info)
{
return !info.GetCustomAttributes(false).Any(a => a is FeatureNotImplementedAttribute);

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
View File

@ -4,7 +4,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.GBA
{
[Core("mGBA", "endrift", true, true, "0.8", "https://mgba.io/", false)]
[Core(CoreNames.Mgba, "endrift", true, true, "0.8", "https://mgba.io/", false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight), typeof(IRegionable) })]
public partial class MGBAHawk : IEmulator, IVideoProvider, ISoundProvider, IGBAGPUViewable,
ISaveRam, IStatable, IInputPollable, ISettable<MGBAHawk.Settings, MGBAHawk.SyncSettings>,

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
[Core(
"GBHawk",
CoreNames.GbHawk,
"",
isPorted: false,
isReleased: true)]

2
BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
/// a gameboy/gameboy color emulator wrapped around native C++ libgambatte
/// </summary>
[Core(
"Gambatte",
CoreNames.Gambatte,
"",
isPorted: true,
isReleased: true,

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -10,7 +10,7 @@ using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
[Core(
"NesHawk",
CoreNames.NesHawk,
"zeromus, natt, alyosha, adelikat",
isPorted: false,
isReleased: true)]

2
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
View File

@ -14,7 +14,7 @@ using BizHawk.Common.BufferExtensions;
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
{
[Core(
"QuickNes",
CoreNames.QuickNes,
"",
isPorted: true,
isReleased: true,

2
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -18,7 +18,7 @@ using BizHawk.Emulation.Cores.Components.W65816;
namespace BizHawk.Emulation.Cores.Nintendo.SNES
{
[Core(
"BSNES",
CoreNames.Bsnes,
"byuu",
isPorted: true,
isReleased: true,

2
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9x.cs
View File

@ -9,7 +9,7 @@ using System.Linq;
namespace BizHawk.Emulation.Cores.Nintendo.SNES9X
{
[Core("Snes9x", "", true, true,
[Core(CoreNames.Snes9X, "", true, true,
"5e0319ab3ef9611250efb18255186d0dc0d7e125", "https://github.com/snes9xgit/snes9x", false)]
[ServiceNotApplicable(new[] { typeof(IDriveLight) })]
public class Snes9x : WaterboxCore,

2
BizHawk.Emulation.Cores/Consoles/Nintendo/SubNESHawk/SubNESHawk.cs
View File

@ -4,7 +4,7 @@ using BizHawk.Emulation.Cores.Nintendo.NES;
namespace BizHawk.Emulation.Cores.Nintendo.SubNESHawk
{
[Core(
"SubNESHawk",
CoreNames.SubNesHawk,
"",
isPorted: false,
isReleased: true)]

22
BizHawk.Emulation.Cores/CoreNames.cs Normal file
View File

@ -0,0 +1,22 @@
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
{
/// <summary>
/// Constant class for the names of cores, that should be used in every <see cref="CoreAttribute"/>
/// For now we are only including ones that can be picked as a core preference,
/// but all cores should be included ere
/// </summary>
public class CoreNames
{
public const string NesHawk = "NesHawk";
public const string SubNesHawk = "SubNESHawk";
public const string QuickNes = "QuickNes";
public const string Snes9X = "Snes9x";
public const string Bsnes = "BSNES";
public const string Mgba = "mGBA";
public const string VbaNext = "VBA-Next";
public const string GbHawk = "GBHawk";
public const string Gambatte = "Gambatte";
}
}