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

Pass EmuClientApi instance to MainForm when restarting in ToolManager

This commit is contained in:
YoshiRulz 2020-11-26 14:22:12 +10:00
parent 87a4f1186e
commit 781976f18e
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -821,12 +821,14 @@ namespace BizHawk.Client.EmuHawk
private set
{
GlobalWin.Emulator = value;
if (GlobalWin.ClientApi != null) GlobalWin.ClientApi.Emulator = value; // first call to this setter is in the ctor, before the APIs have been registered by the ToolManager ctor
if (EmuClient != null) EmuClient.Emulator = value; // first call to this setter is in the ctor, before the APIs have been registered by the ToolManager ctor
_currentVideoProvider = GlobalWin.Emulator.AsVideoProviderOrDefault();
_currentSoundProvider = GlobalWin.Emulator.AsSoundProviderOrDefault();
}
}
public EmuClientApi EmuClient { get; set; }
private InputManager InputManager => GlobalWin.InputManager;
private OSDManager OSD => GlobalWin.OSD;
@ -3602,7 +3604,7 @@ namespace BizHawk.Client.EmuHawk
var oldGame = GlobalWin.Game;
var result = loader.LoadRom(path, nextComm, ioaRetro?.CorePath);
GlobalWin.ClientApi.Game = GlobalWin.Game = result ? loader.Game : oldGame;
EmuClient.Game = GlobalWin.Game = result ? loader.Game : oldGame;
// we need to replace the path in the OpenAdvanced with the canonical one the user chose.
// It can't be done until loader.LoadRom happens (for CanonicalFullPath)
@ -3762,20 +3764,20 @@ namespace BizHawk.Client.EmuHawk
}
}
ClientApi.OnRomLoaded(Emulator);
EmuClient.OnRomLoaded(Emulator);
return true;
}
else if (Emulator.IsNull())
{
// This shows up if there's a problem
ClientApi.UpdateEmulatorAndVP(Emulator);
EmuClient.UpdateEmulatorAndVP(Emulator);
OnRomChanged();
return false;
}
else
{
// The ROM has been loaded by a recursive invocation of the LoadROM method.
ClientApi.OnRomLoaded(Emulator);
EmuClient.OnRomLoaded(Emulator);
return true;
}
}
@ -3863,7 +3865,7 @@ namespace BizHawk.Client.EmuHawk
CheatList.SaveOnClose();
Emulator.Dispose();
Emulator = new NullEmulator();
ClientApi.UpdateEmulatorAndVP(Emulator);
EmuClient.UpdateEmulatorAndVP(Emulator);
InputManager.ActiveController = new Controller(NullController.Instance.Definition);
InputManager.AutoFireController = _autofireNullControls;
RewireSound();
@ -3881,7 +3883,7 @@ namespace BizHawk.Client.EmuHawk
{
CloseGame(clearSram);
Emulator = new NullEmulator();
GlobalWin.ClientApi.Game = GlobalWin.Game = GameInfo.NullInstance;
EmuClient.Game = GlobalWin.Game = GameInfo.NullInstance;
CreateRewinder();
Tools.Restart(Emulator, Game);
RewireSound();
@ -3992,7 +3994,7 @@ namespace BizHawk.Client.EmuHawk
if (new SavestateFile(Emulator, MovieSession, GlobalWin.UserBag).Load(path))
{
OSD.ClearGuiText();
ClientApi.OnStateLoaded(this, userFriendlyStateName);
EmuClient.OnStateLoaded(this, userFriendlyStateName);
if (Tools.Has<LuaConsole>())
{
@ -4030,7 +4032,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
ClientApi.OnBeforeQuickLoad(this, quickSlotName, out var handled);
EmuClient.OnBeforeQuickLoad(this, quickSlotName, out var handled);
if (handled)
{
return;
@ -4070,7 +4072,7 @@ namespace BizHawk.Client.EmuHawk
{
new SavestateFile(Emulator, MovieSession, GlobalWin.UserBag).Create(path, Config.Savestates);
ClientApi.OnStateSaved(this, userFriendlyStateName);
EmuClient.OnStateSaved(this, userFriendlyStateName);
if (!suppressOSD)
{
@ -4096,7 +4098,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
ClientApi.OnBeforeQuickSave(this, quickSlotName, out var handled);
EmuClient.OnBeforeQuickSave(this, quickSlotName, out var handled);
if (handled)
{
return;

14
src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
View File

@ -31,6 +31,12 @@ namespace BizHawk.Client.EmuHawk
// Also a UsesRam, and similar method
private readonly List<IToolForm> _tools = new List<IToolForm>();
private IExternalApiProvider ApiProvider
{
get => _apiProvider;
set => _owner.EmuClient = (EmuClientApi) (_apiProvider = value).GetApi<IEmuClientApi>();
}
/// <summary>
/// Initializes a new instance of the <see cref="ToolManager"/> class.
/// </summary>
@ -48,7 +54,7 @@ namespace BizHawk.Client.EmuHawk
_emulator = emulator;
_movieSession = movieSession;
_game = game;
_apiProvider = ApiManager.Restart(_emulator.ServiceProvider, _owner, GlobalWin.DisplayManager, _inputManager, _config, _emulator, _game);
ApiProvider = ApiManager.Restart(_emulator.ServiceProvider, _owner, GlobalWin.DisplayManager, _inputManager, _config, _emulator, _game);
}
/// <summary>
@ -165,7 +171,7 @@ namespace BizHawk.Client.EmuHawk
var newTool = (IExternalToolForm) CreateInstance(typeof(IExternalToolForm), toolPath, customFormTypeName, skipExtToolWarning: skipExtToolWarning);
if (newTool == null) return null;
if (newTool is Form form) form.Owner = _owner;
ApiInjector.UpdateApis(_apiProvider, newTool);
ApiInjector.UpdateApis(ApiProvider, newTool);
ServiceInjector.UpdateServices(_emulator.ServiceProvider, newTool);
SetBaseProperties(newTool);
// auto settings
@ -499,7 +505,7 @@ namespace BizHawk.Client.EmuHawk
{
_emulator = emulator;
_game = game;
_apiProvider = ApiManager.Restart(_emulator.ServiceProvider, _owner, GlobalWin.DisplayManager, _inputManager, _config, _emulator, _game);
ApiProvider = ApiManager.Restart(_emulator.ServiceProvider, _owner, GlobalWin.DisplayManager, _inputManager, _config, _emulator, _game);
// If Cheat tool is loaded, restarting will restart the list too anyway
if (!Has<Cheats>())
{
@ -518,7 +524,7 @@ namespace BizHawk.Client.EmuHawk
if ((tool.IsHandleCreated && !tool.IsDisposed) || tool is RamWatch) // Hack for RAM Watch - in display watches mode it wants to keep running even closed, it will handle disposed logic
{
if (tool is IExternalToolForm)
ApiInjector.UpdateApis(_apiProvider, tool);
ApiInjector.UpdateApis(ApiProvider, tool);
tool.Restart();
}
}