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

Cache ApiContainer instead of GuiApi in Win32LuaLibraries

This commit is contained in:
YoshiRulz 2021-01-19 01:09:52 +10:00
parent 253a24edd6
commit 5c89d0cb15
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs
View File

@ -48,8 +48,7 @@ namespace BizHawk.Client.EmuHawk
_mainForm = mainForm; _mainForm = mainForm;
LuaWait = new AutoResetEvent(false); LuaWait = new AutoResetEvent(false);
Docs.Clear(); Docs.Clear();
var apiContainer = ApiManager.RestartLua(serviceProvider, LogToLuaConsole, _mainForm, _displayManager, _inputManager, _mainForm.MovieSession, _mainForm.Tools, config, emulator, game); _apiContainer = ApiManager.RestartLua(serviceProvider, LogToLuaConsole, _mainForm, _displayManager, _inputManager, _mainForm.MovieSession, _mainForm.Tools, config, emulator, game);
_guiAPI = (GuiApi) apiContainer.Gui;
// Register lua libraries // Register lua libraries
foreach (var lib in Client.Common.ReflectionCache.Types.Concat(EmuHawk.ReflectionCache.Types) foreach (var lib in Client.Common.ReflectionCache.Types.Concat(EmuHawk.ReflectionCache.Types)
@ -64,7 +63,7 @@ namespace BizHawk.Client.EmuHawk
if (addLibrary) if (addLibrary)
{ {
var instance = (LuaLibraryBase) Activator.CreateInstance(lib, this, apiContainer, (Action<string>) LogToLuaConsole); var instance = (LuaLibraryBase) Activator.CreateInstance(lib, this, _apiContainer, (Action<string>) LogToLuaConsole);
ServiceInjector.UpdateServices(serviceProvider, instance); ServiceInjector.UpdateServices(serviceProvider, instance);
// TODO: make EmuHawk libraries have a base class with common properties such as this // TODO: make EmuHawk libraries have a base class with common properties such as this
@ -105,9 +104,11 @@ namespace BizHawk.Client.EmuHawk
EnumerateLuaFunctions(nameof(LuaCanvas), typeof(LuaCanvas), null); // add LuaCanvas to Lua function reference table EnumerateLuaFunctions(nameof(LuaCanvas), typeof(LuaCanvas), null); // add LuaCanvas to Lua function reference table
} }
private ApiContainer _apiContainer;
private readonly IDisplayManagerForApi _displayManager; private readonly IDisplayManagerForApi _displayManager;
private GuiApi _guiAPI; private GuiApi GuiAPI => (GuiApi) _apiContainer.Gui;
private readonly InputManager _inputManager; private readonly InputManager _inputManager;
@ -148,11 +149,10 @@ namespace BizHawk.Client.EmuHawk
IEmulator emulator, IEmulator emulator,
IGameInfo game) IGameInfo game)
{ {
var apiContainer = ApiManager.RestartLua(newServiceProvider, LogToLuaConsole, _mainForm, _displayManager, _inputManager, _mainForm.MovieSession, _mainForm.Tools, config, emulator, game); _apiContainer = ApiManager.RestartLua(newServiceProvider, LogToLuaConsole, _mainForm, _displayManager, _inputManager, _mainForm.MovieSession, _mainForm.Tools, config, emulator, game);
_guiAPI = (GuiApi) apiContainer.Gui;
foreach (var lib in Libraries.Values) foreach (var lib in Libraries.Values)
{ {
lib.APIs = apiContainer; lib.APIs = _apiContainer;
ServiceInjector.UpdateServices(newServiceProvider, lib); ServiceInjector.UpdateServices(newServiceProvider, lib);
} }
} }
@ -292,9 +292,9 @@ namespace BizHawk.Client.EmuHawk
{ {
LuaLibraryBase.SetCurrentThread(lf); LuaLibraryBase.SetCurrentThread(lf);
_guiAPI.LockEmuSurfaceLua(); GuiAPI.LockEmuSurfaceLua();
var execResult = _currThread.Resume(0); var execResult = _currThread.Resume(0);
_guiAPI.UnlockEmuSurfaceLua(); GuiAPI.UnlockEmuSurfaceLua();
_lua.RunScheduledDisposes(); // TODO: I don't think this is needed anymore, we run this regularly anyway _lua.RunScheduledDisposes(); // TODO: I don't think this is needed anymore, we run this regularly anyway
@ -311,7 +311,7 @@ namespace BizHawk.Client.EmuHawk
} }
catch (Exception) catch (Exception)
{ {
_guiAPI.UnlockEmuSurfaceLua(); GuiAPI.UnlockEmuSurfaceLua();
throw; throw;
} }
finally finally