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

Mainform - property wrapper for GlobalWin.OSD

This commit is contained in:
adelikat 2020-07-03 10:49:59 -05:00
parent 910c37d434
commit 715e457a4e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ using BizHawk.Emulation.Cores.Nintendo.SNES9X;
using BizHawk.Emulation.Cores.Consoles.SNK; using BizHawk.Emulation.Cores.Consoles.SNK;
using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Consoles.Nintendo.Faust; using BizHawk.Emulation.Cores.Consoles.Nintendo.Faust;
using BizHawk.Client.EmuHawk.Filters;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -806,10 +807,7 @@ namespace BizHawk.Client.EmuHawk
private bool IsTurboSeeking => PauseOnFrame.HasValue && Config.TurboSeek; private bool IsTurboSeeking => PauseOnFrame.HasValue && Config.TurboSeek;
public bool IsTurboing => InputManager.ClientControls["Turbo"] || IsTurboSeeking; public bool IsTurboing => InputManager.ClientControls["Turbo"] || IsTurboSeeking;
public void AddOnScreenMessage(string message) public void AddOnScreenMessage(string message) => OSD.AddMessage(message);
{
GlobalWin.OSD.AddMessage(message);
}
public void ClearHolds() public void ClearHolds()
{ {
@ -844,6 +842,7 @@ namespace BizHawk.Client.EmuHawk
} }
private InputManager InputManager => GlobalWin.InputManager; private InputManager InputManager => GlobalWin.InputManager;
private OSDManager OSD => GlobalWin.OSD;
private IVideoProvider _currentVideoProvider = NullVideo.Instance; private IVideoProvider _currentVideoProvider = NullVideo.Instance;
@ -2831,7 +2830,7 @@ namespace BizHawk.Client.EmuHawk
_lastFastForwardingOrRewinding = isFastForwardingOrRewinding; _lastFastForwardingOrRewinding = isFastForwardingOrRewinding;
// client input-related duties // client input-related duties
GlobalWin.OSD.ClearGuiText(); OSD.ClearGuiText();
CheatList.Pulse(); CheatList.Pulse();
@ -3011,7 +3010,7 @@ namespace BizHawk.Client.EmuHawk
" >>"; " >>";
} }
GlobalWin.OSD.Fps = fpsString; OSD.Fps = fpsString;
// need to refresh window caption in this case // need to refresh window caption in this case
if (Config.DispSpeedupFeatures == 0) if (Config.DispSpeedupFeatures == 0)
@ -3510,7 +3509,7 @@ namespace BizHawk.Client.EmuHawk
ChooseArchive = LoadArchiveChooser, ChooseArchive = LoadArchiveChooser,
ChoosePlatform = ChoosePlatformForRom, ChoosePlatform = ChoosePlatformForRom,
Deterministic = deterministic, Deterministic = deterministic,
MessageCallback = GlobalWin.OSD.AddMessage, MessageCallback = OSD.AddMessage,
OpenAdvanced = args.OpenAdvanced OpenAdvanced = args.OpenAdvanced
}; };
GlobalWin.FirmwareManager.RecentlyServed.Clear(); GlobalWin.FirmwareManager.RecentlyServed.Clear();
@ -3950,7 +3949,7 @@ namespace BizHawk.Client.EmuHawk
if (new SavestateFile(Emulator, MovieSession, GlobalWin.UserBag).Load(path)) if (new SavestateFile(Emulator, MovieSession, GlobalWin.UserBag).Load(path))
{ {
GlobalWin.OSD.ClearGuiText(); OSD.ClearGuiText();
ClientApi.OnStateLoaded(this, userFriendlyStateName); ClientApi.OnStateLoaded(this, userFriendlyStateName);
if (Tools.Has<LuaConsole>()) if (Tools.Has<LuaConsole>())