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

Move FirmwareManager from Global to GlobalWin

This commit is contained in:
adelikat 2020-06-06 14:57:37 -05:00
parent 981dc95c62
commit cdd5c75488
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.Common/Global.cs
View File

@ -6,7 +6,6 @@ namespace BizHawk.Client.Common
public static class Global public static class Global
{ {
public static GameInfo Game { get; set; } public static GameInfo Game { get; set; }
public static FirmwareManager FirmwareManager { get; set; }
public static IMovieSession MovieSession { get; set; } public static IMovieSession MovieSession { get; set; }
public static InputManager InputManager { get; } = new InputManager(); public static InputManager InputManager { get; } = new InputManager();
} }

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

@ -43,5 +43,6 @@ namespace BizHawk.Client.EmuHawk
public static Dictionary<string, object> UserBag { get; set; } = new Dictionary<string, object>(); public static Dictionary<string, object> UserBag { get; set; } = new Dictionary<string, object>();
public static Config Config { get; set; } public static Config Config { get; set; }
public static FirmwareManager FirmwareManager { get; set; }
} }
} }

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

@ -162,7 +162,7 @@ namespace BizHawk.Client.EmuHawk
{ {
var cfp = new CoreFileProvider( var cfp = new CoreFileProvider(
ShowMessageCoreComm, ShowMessageCoreComm,
Global.FirmwareManager, GlobalWin.FirmwareManager,
Config.PathEntries, Config.PathEntries,
Config.FirmwareUserSpecifications); Config.FirmwareUserSpecifications);
var prefs = CoreComm.CorePreferencesFlags.None; var prefs = CoreComm.CorePreferencesFlags.None;
@ -279,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
Rewinder = new Rewinder(); Rewinder = new Rewinder();
Global.InputManager.ControllerInputCoalescer = new ControllerInputCoalescer(); Global.InputManager.ControllerInputCoalescer = new ControllerInputCoalescer();
Global.FirmwareManager = new FirmwareManager(); GlobalWin.FirmwareManager = new FirmwareManager();
MovieSession = new MovieSession( MovieSession = new MovieSession(
Config.Movies, Config.Movies,
Config.PathEntries.MovieBackupsAbsolutePath(), Config.PathEntries.MovieBackupsAbsolutePath(),
@ -899,7 +899,7 @@ namespace BizHawk.Client.EmuHawk
private Rewinder Rewinder { get; } private Rewinder Rewinder { get; }
private FirmwareManager FirmwareManager => Global.FirmwareManager; private FirmwareManager FirmwareManager => GlobalWin.FirmwareManager;
protected override void OnActivated(EventArgs e) protected override void OnActivated(EventArgs e)
{ {
@ -3628,7 +3628,7 @@ namespace BizHawk.Client.EmuHawk
return false; return false;
} }
var loader = new RomLoader(Config, Global.FirmwareManager) var loader = new RomLoader(Config, GlobalWin.FirmwareManager)
{ {
ChooseArchive = LoadArchiveChooser, ChooseArchive = LoadArchiveChooser,
ChoosePlatform = ChoosePlatformForRom, ChoosePlatform = ChoosePlatformForRom,
@ -3636,7 +3636,7 @@ namespace BizHawk.Client.EmuHawk
MessageCallback = GlobalWin.OSD.AddMessage, MessageCallback = GlobalWin.OSD.AddMessage,
OpenAdvanced = args.OpenAdvanced OpenAdvanced = args.OpenAdvanced
}; };
Global.FirmwareManager.RecentlyServed.Clear(); GlobalWin.FirmwareManager.RecentlyServed.Clear();
loader.OnLoadError += ShowLoadError; loader.OnLoadError += ShowLoadError;
loader.OnLoadSettings += CoreSettings; loader.OnLoadSettings += CoreSettings;

2
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -243,7 +243,7 @@ namespace BizHawk.Client.EmuHawk
DoScan(); DoScan();
} }
private FirmwareManager Manager => Global.FirmwareManager; private FirmwareManager Manager => GlobalWin.FirmwareManager;
private void DoScan() private void DoScan()
{ {

2
src/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -134,7 +134,7 @@ namespace BizHawk.Client.EmuHawk
movieToRecord.PopulateWithDefaultHeaderValues( movieToRecord.PopulateWithDefaultHeaderValues(
_emulator, _emulator,
Global.Game, Global.Game,
Global.FirmwareManager, GlobalWin.FirmwareManager,
AuthorBox.Text ?? _config.DefaultAuthor); AuthorBox.Text ?? _config.DefaultAuthor);
movieToRecord.Save(); movieToRecord.Save();
_mainForm.StartNewMovie(movieToRecord, true); _mainForm.StartNewMovie(movieToRecord, true);

2
src/BizHawk.Client.EmuHawk/tools/BatchRunner.cs
View File

@ -70,7 +70,7 @@ namespace BizHawk.Client.EmuHawk
_files = new List<string>(files); _files = new List<string>(files);
_numFrames = numFrames; _numFrames = numFrames;
_ldr = new RomLoader(GlobalWin.Config, Global.FirmwareManager); _ldr = new RomLoader(GlobalWin.Config, GlobalWin.FirmwareManager);
_ldr.OnLoadError += OnLoadError; _ldr.OnLoadError += OnLoadError;
_ldr.ChooseArchive = ChooseArchive; _ldr.ChooseArchive = ChooseArchive;
_comm = mainForm.CreateCoreComm(); _comm = mainForm.CreateCoreComm();

2
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -687,7 +687,7 @@ namespace BizHawk.Client.EmuHawk
tasMovie.PopulateWithDefaultHeaderValues( tasMovie.PopulateWithDefaultHeaderValues(
Emulator, Emulator,
Global.Game, Global.Game,
Global.FirmwareManager, GlobalWin.FirmwareManager,
Config.DefaultAuthor); Config.DefaultAuthor);
SetTasMovieCallbacks(tasMovie); SetTasMovieCallbacks(tasMovie);