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

Move `SoundConfig.ApplyNewSoundDevice` logic to callsite

This commit is contained in:
YoshiRulz 2022-09-08 08:23:01 +10:00
parent 6f0953aaa3
commit 707ec53bd5
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -947,21 +947,22 @@ namespace BizHawk.Client.EmuHawk
ESoundOutputMethod.OpenAL => OpenALSoundOutput.GetDeviceNames(),
_ => Enumerable.Empty<string>()
};
var oldOutputMethod = Config.SoundOutputMethod;
var oldDevice = Config.SoundDevice;
using var form = new SoundConfig(this, Config, GetDeviceNamesCallback);
if (!form.ShowDialog().IsOk()) return;
AddOnScreenMessage("Sound settings saved");
if (form.ApplyNewSoundDevice)
AddOnScreenMessage("Sound settings saved");
if (Config.SoundOutputMethod == oldOutputMethod && Config.SoundDevice == oldDevice)
{
Sound.Dispose();
Sound = new Sound(Handle, Config, () => Emulator.VsyncRate());
Sound.StartSound();
Sound.StopSound();
}
else
{
Sound.StopSound();
Sound.StartSound();
Sound.Dispose();
Sound = new Sound(Handle, Config, () => Emulator.VsyncRate());
}
Sound.StartSound();
RewireSound();
}

5
src/BizHawk.Client.EmuHawk/config/SoundConfig.cs
View File

@ -15,8 +15,6 @@ namespace BizHawk.Client.EmuHawk
private bool _programmaticallyChangingValue;
public bool ApplyNewSoundDevice { get; private set; }
public IDialogController DialogController { get; }
public SoundConfig(IDialogController dialogController, Config config, Func<ESoundOutputMethod, IEnumerable<string>> getDeviceNamesCallback)
@ -69,8 +67,6 @@ namespace BizHawk.Client.EmuHawk
DialogController.ShowMessageBox("Buffer size must be at least 60 milliseconds for DirectSound.", "Error", EMsgBoxIcon.Error);
return;
}
var oldOutputMethod = _config.SoundOutputMethod;
var oldDevice = _config.SoundDevice;
_config.SoundEnabled = cbEnableMaster.Checked;
_config.SoundEnabledNormal = cbEnableNormal.Checked;
_config.SoundEnabledRWFF = cbEnableRWFF.Checked;
@ -80,7 +76,6 @@ namespace BizHawk.Client.EmuHawk
_config.SoundVolume = tbNormal.Value;
_config.SoundVolumeRWFF = tbRWFF.Value;
_config.SoundDevice = (string)listBoxSoundDevices.SelectedItem ?? "<default>";
ApplyNewSoundDevice = _config.SoundOutputMethod != oldOutputMethod || _config.SoundDevice != oldDevice; // read in MainForm at ShowDialog() callsite
DialogResult = DialogResult.OK;
}