From 817c798eabe0924e152ab3000a5d040332f013c4 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 22 Feb 2015 20:06:30 +0000 Subject: [PATCH] Remove Global.CoreComm since it was pointless --- BizHawk.Client.Common/CoreFileProvider.cs | 7 +------ BizHawk.Client.Common/Global.cs | 1 - BizHawk.Client.EmuHawk/MainForm.cs | 22 +++++++++++----------- BizHawk.Client.EmuHawk/Sound/Sound.cs | 2 +- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/BizHawk.Client.Common/CoreFileProvider.cs b/BizHawk.Client.Common/CoreFileProvider.cs index e11b4b8f6d..5c96ec540f 100644 --- a/BizHawk.Client.Common/CoreFileProvider.cs +++ b/BizHawk.Client.Common/CoreFileProvider.cs @@ -108,13 +108,8 @@ namespace BizHawk.Client.Common #endregion // this should go away now - public static void SyncCoreCommInputSignals(CoreComm target = null) + public static void SyncCoreCommInputSignals(CoreComm target) { - if (target == null) - { - target = Global.CoreComm; - } - var cfp = new CoreFileProvider(target.ShowMessage); target.CoreFileProvider = cfp; cfp.FirmwareManager = Global.FirmwareManager; diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs index c34a9459b4..dc8bca153e 100644 --- a/BizHawk.Client.Common/Global.cs +++ b/BizHawk.Client.Common/Global.cs @@ -8,7 +8,6 @@ namespace BizHawk.Client.Common public static class Global { public static IEmulator Emulator; - public static CoreComm CoreComm; public static Config Config; public static GameInfo Game; public static CheatCollection CheatList; diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 32434f2aeb..74e48d7de1 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -270,9 +270,10 @@ namespace BizHawk.Client.EmuHawk Input.Initialize(); InitControls(); - Global.CoreComm = CreateCoreComm(); - CoreFileProvider.SyncCoreCommInputSignals(); - Global.Emulator = new NullEmulator(Global.CoreComm, Global.Config.GetCoreSettings()); + + var comm = CreateCoreComm(); + CoreFileProvider.SyncCoreCommInputSignals(comm); + Global.Emulator = new NullEmulator(comm, Global.Config.GetCoreSettings()); Global.ActiveController = Global.NullControls; Global.AutoFireController = Global.AutofireNullControls; Global.AutofireStickyXORAdapter.SetOnOffPatternFromConfig(); @@ -3287,9 +3288,8 @@ namespace BizHawk.Client.EmuHawk if (result) { Global.Emulator = loader.LoadedEmulator; - Global.CoreComm = nextComm; Global.Game = loader.Game; - CoreFileProvider.SyncCoreCommInputSignals(); + CoreFileProvider.SyncCoreCommInputSignals(nextComm); InputManager.SyncControls(); if (Global.Emulator is TI83 && Global.Config.TI83autoloadKeyPad) @@ -3495,9 +3495,9 @@ namespace BizHawk.Client.EmuHawk Global.CheatList.SaveOnClose(); Global.Emulator.Dispose(); - Global.CoreComm = CreateCoreComm(); - CoreFileProvider.SyncCoreCommInputSignals(); - Global.Emulator = new NullEmulator(Global.CoreComm, Global.Config.GetCoreSettings()); + var coreComm = CreateCoreComm(); + CoreFileProvider.SyncCoreCommInputSignals(coreComm); + Global.Emulator = new NullEmulator(coreComm, Global.Config.GetCoreSettings()); Global.ActiveController = Global.NullControls; Global.AutoFireController = Global.AutofireNullControls; RewireSound(); @@ -3514,9 +3514,9 @@ namespace BizHawk.Client.EmuHawk if (GlobalWin.Tools.AskSave()) { CloseGame(clearSram); - Global.CoreComm = CreateCoreComm(); - CoreFileProvider.SyncCoreCommInputSignals(); - Global.Emulator = new NullEmulator(Global.CoreComm, Global.Config.GetCoreSettings()); + var coreComm = CreateCoreComm(); + CoreFileProvider.SyncCoreCommInputSignals(coreComm); + Global.Emulator = new NullEmulator(coreComm, Global.Config.GetCoreSettings()); Global.Game = GameInfo.NullInstance; GlobalWin.Tools.Restart(); diff --git a/BizHawk.Client.EmuHawk/Sound/Sound.cs b/BizHawk.Client.EmuHawk/Sound/Sound.cs index 4d629d4268..c8a607172d 100644 --- a/BizHawk.Client.EmuHawk/Sound/Sound.cs +++ b/BizHawk.Client.EmuHawk/Sound/Sound.cs @@ -126,7 +126,7 @@ namespace BizHawk.Client.EmuHawk } _asyncSoundProvider = source; _semiSync.BaseSoundProvider = source; - _semiSync.RecalculateMagic(Global.CoreComm.VsyncRate); + _semiSync.RecalculateMagic(Global.Emulator.CoreComm.VsyncRate); } public bool LogUnderruns { get; set; }