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

Remove GlobalWin.InputManager

This commit is contained in:
YoshiRulz 2020-11-30 15:56:05 +10:00
parent a83642fab2
commit 3a7ca89311
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/GlobalWin.cs
View File

@ -15,7 +15,5 @@ namespace BizHawk.Client.EmuHawk
public static Config Config { get; set; }
public static IMovieSession MovieSession => _mainForm.MovieSession;
public static InputManager InputManager { get; } = new InputManager();
}
}

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

@ -284,7 +284,7 @@ namespace BizHawk.Client.EmuHawk
_config = config; // skips assignment to GlobalWin.Config as Program already did that
GL = gl;
InputManager.ControllerInputCoalescer = new ControllerInputCoalescer();
InputManager = new InputManager { ControllerInputCoalescer = new ControllerInputCoalescer() };
FirmwareManager = new FirmwareManager();
MovieSession = new MovieSession(
Config.Movies,
@ -849,7 +849,7 @@ namespace BizHawk.Client.EmuHawk
public EmuClientApi EmuClient { get; set; }
private InputManager InputManager => GlobalWin.InputManager;
private readonly InputManager InputManager;
private IVideoProvider _currentVideoProvider = NullVideo.Instance;