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

Move calls of static methods *SoundOutput.GetDeviceNames to a delegate 

now only MainForm needs to reference *SoundOutput
This commit is contained in:
YoshiRulz 2020-11-22 11:23:03 +10:00
parent bffe2078d4
commit 9e5ab0706e
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Bizware.DirectX;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Client.EmuHawk.CustomControls; using BizHawk.Client.EmuHawk.CustomControls;
using BizHawk.Client.EmuHawk.ToolExtensions; using BizHawk.Client.EmuHawk.ToolExtensions;
@ -899,7 +901,14 @@ namespace BizHawk.Client.EmuHawk
private void SoundMenuItem_Click(object sender, EventArgs e) private void SoundMenuItem_Click(object sender, EventArgs e)
{ {
using var form = new SoundConfig(Config) { Owner = this }; static IEnumerable<string> GetDeviceNamesCallback(ESoundOutputMethod outputMethod) => outputMethod switch
{
ESoundOutputMethod.DirectSound => DirectSoundSoundOutput.GetDeviceNames(),
ESoundOutputMethod.XAudio2 => XAudio2SoundOutput.GetDeviceNames(),
ESoundOutputMethod.OpenAL => OpenALSoundOutput.GetDeviceNames(),
_ => Enumerable.Empty<string>()
};
using var form = new SoundConfig(Config, GetDeviceNamesCallback) { Owner = this };
if (form.ShowDialog().IsOk()) if (form.ShowDialog().IsOk())
{ {
Sound.StartSound(); Sound.StartSound();

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

@ -1,9 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Bizware.DirectX;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Common; using BizHawk.Common;
@ -12,11 +10,15 @@ namespace BizHawk.Client.EmuHawk
public partial class SoundConfig : Form public partial class SoundConfig : Form
{ {
private readonly Config _config; private readonly Config _config;
private readonly Func<ESoundOutputMethod, IEnumerable<string>> _getDeviceNamesCallback;
private bool _programmaticallyChangingValue; private bool _programmaticallyChangingValue;
public SoundConfig(Config config) public SoundConfig(Config config, Func<ESoundOutputMethod, IEnumerable<string>> getDeviceNamesCallback)
{ {
_config = config; _config = config;
_getDeviceNamesCallback = getDeviceNamesCallback;
InitializeComponent(); InitializeComponent();
} }
@ -49,6 +51,17 @@ namespace BizHawk.Client.EmuHawk
_programmaticallyChangingValue = false; _programmaticallyChangingValue = false;
} }
private ESoundOutputMethod GetSelectedOutputMethod()
{
if (!OSTailoredCode.IsUnixHost)
{
if (rbOutputMethodDirectSound.Checked) return ESoundOutputMethod.DirectSound;
if (rbOutputMethodXAudio2.Checked) return ESoundOutputMethod.XAudio2;
}
if (rbOutputMethodOpenAL.Checked) return ESoundOutputMethod.OpenAL;
return ESoundOutputMethod.Dummy;
}
private void Ok_Click(object sender, EventArgs e) private void Ok_Click(object sender, EventArgs e)
{ {
if (rbOutputMethodDirectSound.Checked && (int)BufferSizeNumeric.Value < 60) if (rbOutputMethodDirectSound.Checked && (int)BufferSizeNumeric.Value < 60)
@ -62,9 +75,7 @@ namespace BizHawk.Client.EmuHawk
_config.SoundEnabledNormal = cbEnableNormal.Checked; _config.SoundEnabledNormal = cbEnableNormal.Checked;
_config.SoundEnabledRWFF = cbEnableRWFF.Checked; _config.SoundEnabledRWFF = cbEnableRWFF.Checked;
_config.MuteFrameAdvance = cbMuteFrameAdvance.Checked; _config.MuteFrameAdvance = cbMuteFrameAdvance.Checked;
if (rbOutputMethodDirectSound.Checked) _config.SoundOutputMethod = ESoundOutputMethod.DirectSound; _config.SoundOutputMethod = GetSelectedOutputMethod();
if (rbOutputMethodXAudio2.Checked) _config.SoundOutputMethod = ESoundOutputMethod.XAudio2;
if (rbOutputMethodOpenAL.Checked) _config.SoundOutputMethod = ESoundOutputMethod.OpenAL;
_config.SoundBufferSizeMs = (int)BufferSizeNumeric.Value; _config.SoundBufferSizeMs = (int)BufferSizeNumeric.Value;
_config.SoundVolume = tbNormal.Value; _config.SoundVolume = tbNormal.Value;
_config.SoundVolumeRWFF = tbRWFF.Value; _config.SoundVolumeRWFF = tbRWFF.Value;
@ -87,18 +98,10 @@ namespace BizHawk.Client.EmuHawk
private void PopulateDeviceList() private void PopulateDeviceList()
{ {
IEnumerable<string> deviceNames = Enumerable.Empty<string>();
if (!OSTailoredCode.IsUnixHost)
{
if (rbOutputMethodDirectSound.Checked) deviceNames = DirectSoundSoundOutput.GetDeviceNames();
if (rbOutputMethodXAudio2.Checked) deviceNames = XAudio2SoundOutput.GetDeviceNames();
}
if (rbOutputMethodOpenAL.Checked) deviceNames = OpenALSoundOutput.GetDeviceNames();
listBoxSoundDevices.Items.Clear(); listBoxSoundDevices.Items.Clear();
listBoxSoundDevices.Items.Add("<default>"); listBoxSoundDevices.Items.Add("<default>");
listBoxSoundDevices.SelectedIndex = 0; listBoxSoundDevices.SelectedIndex = 0;
foreach (var name in deviceNames) foreach (var name in _getDeviceNamesCallback(GetSelectedOutputMethod()))
{ {
listBoxSoundDevices.Items.Add(name); listBoxSoundDevices.Items.Add(name);
if (name == _config.SoundDevice) if (name == _config.SoundDevice)