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

Move global Config to Program

This commit is contained in:
YoshiRulz 2021-11-16 01:01:56 +10:00
parent 8859f8f859
commit fc4da78e73
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,15 +283,17 @@ namespace BizHawk.Client.EmuHawk
public MainForm(
ParsedCLIFlags cliFlags,
Config config,
IGL gl,
Func<Config> getGlobalConfig,
Action<Sound> updateGlobalSound,
string[] args,
out IMovieSession movieSession)
{
movieSession = null;
if (config.SingleInstanceMode)
_getGlobalConfig = getGlobalConfig;
if (Config.SingleInstanceMode)
{
if (SingleInstanceInit(args))
{
@ -305,7 +307,6 @@ namespace BizHawk.Client.EmuHawk
BootGodDb.Initialize(Path.Combine(PathUtils.ExeDirectoryPath, "gamedb"));
_argParser = cliFlags;
Config = config;
GL = gl;
_updateGlobalSound = updateGlobalSound;
@ -903,13 +904,11 @@ namespace BizHawk.Client.EmuHawk
private ISoundProvider _currentSoundProvider = new NullSound(44100 / 60); // Reasonable default until we have a core instance
/// <remarks>don't use this, use <see cref="Config"/></remarks>
private Config _config;
private readonly Func<Config> _getGlobalConfig;
private new Config Config
{
get => _config;
set => base.Config = _config = value;
}
private new Config Config => _getGlobalConfig();
public Action<string> LoadGlobalConfigFromFile { get; set; }
private readonly IGL GL;
@ -2910,12 +2909,7 @@ namespace BizHawk.Client.EmuHawk
private void LoadConfigFile(string iniPath)
{
if (!VersionInfo.DeveloperBuild && !ConfigService.IsFromSameVersion(iniPath, out var msg))
{
new MsgBox(msg, "Mismatched version in config file", MessageBoxIcon.Warning).ShowDialog();
}
Config = ConfigService.Load<Config>(iniPath);
Config.ResolveDefaults();
LoadGlobalConfigFromFile(iniPath);
InitControls(); // rebind hotkeys
InputManager.SyncControls(Emulator, MovieSession, Config);
Tools.Restart(Config, Emulator, Game);

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

@ -152,8 +152,9 @@ namespace BizHawk.Client.EmuHawk
File.Delete(Config.DefaultIniPath);
initialConfig = ConfigService.Load<Config>(Config.DefaultIniPath);
}
initialConfig.ResolveDefaults();
// initialConfig should really be globalConfig as it's mutable
FFmpegService.FFmpegPath = Path.Combine(PathUtils.DllDirectoryPath, OSTC.IsUnixHost ? "ffmpeg" : "ffmpeg.exe");
StringLogUtil.DefaultToDisk = initialConfig.Movies.MoviesOnDisk;
@ -235,11 +236,21 @@ namespace BizHawk.Client.EmuHawk
{
MainForm mf = new(
cliFlags,
initialConfig,
workingGL,
() => initialConfig,
newSound => globalSound = newSound,
args,
out var movieSession);
mf.LoadGlobalConfigFromFile = iniPath =>
{
if (!VersionInfo.DeveloperBuild && !ConfigService.IsFromSameVersion(iniPath, out var msg))
{
new MsgBox(msg, "Mismatched version in config file", MessageBoxIcon.Warning).ShowDialog();
}
initialConfig = ConfigService.Load<Config>(iniPath);
initialConfig.ResolveDefaults();
mf.Config = initialConfig;
};
// var title = mf.Text;
mf.Show();
// mf.Text = title;