diff --git a/BizHawk.Client.EmuHawk/GlobalWin.cs b/BizHawk.Client.EmuHawk/GlobalWin.cs index 8b49300aae..51745800d4 100644 --- a/BizHawk.Client.EmuHawk/GlobalWin.cs +++ b/BizHawk.Client.EmuHawk/GlobalWin.cs @@ -16,10 +16,5 @@ namespace BizHawk.Client.EmuHawk public static OSDManager OSD = new OSDManager(); public static DisplayManager DisplayManager; public static GLManager GLManager; - - //input state which has been destined for game controller inputs are coalesced here - //public static ControllerInputCoalescer ControllerInputCoalescer = new ControllerInputCoalescer(); - //input state which has been destined for client hotkey consumption are colesced here - public static InputCoalescer HotkeyCoalescer = new InputCoalescer(); } } diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 625d014503..d916148dfb 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -433,7 +433,7 @@ namespace BizHawk.Client.EmuHawk // handle events and dispatch as a hotkey action, or a hotkey button, or an input button ProcessInput(); - Global.ClientControls.LatchFromPhysical(GlobalWin.HotkeyCoalescer); + Global.ClientControls.LatchFromPhysical(HotkeyCoalescer); Global.ActiveController.LatchFromPhysical(Global.ControllerInputCoalescer); @@ -773,7 +773,7 @@ namespace BizHawk.Client.EmuHawk // hotkeys which arent handled as actions get coalesced as pollable virtual client buttons if (!handled) { - GlobalWin.HotkeyCoalescer.Receive(ie); + HotkeyCoalescer.Receive(ie); } break; @@ -790,7 +790,7 @@ namespace BizHawk.Client.EmuHawk // hotkeys which arent handled as actions get coalesced as pollable virtual client buttons if (!handled) { - GlobalWin.HotkeyCoalescer.Receive(ie); + HotkeyCoalescer.Receive(ie); } } break; @@ -804,7 +804,7 @@ namespace BizHawk.Client.EmuHawk // hotkeys which arent handled as actions get coalesced as pollable virtual client buttons if (!handled) { - GlobalWin.HotkeyCoalescer.Receive(ie); + HotkeyCoalescer.Receive(ie); conInput.Receive(ie); } @@ -1280,6 +1280,11 @@ namespace BizHawk.Client.EmuHawk Bitmap StatusBarDiskLightOnImage, StatusBarDiskLightOffImage; Bitmap LinkCableOn, LinkCableOff; + // input state which has been destined for game controller inputs are coalesced here + // public static ControllerInputCoalescer ControllerInputCoalescer = new ControllerInputCoalescer(); + // input state which has been destined for client hotkey consumption are colesced here + private readonly InputCoalescer HotkeyCoalescer = new InputCoalescer(); + #endregion #region Private methods