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

Cleanup Sound ctor

This commit is contained in:
YoshiRulz 2020-06-07 18:06:35 +10:00
parent 0326bf63d3
commit 347ed0d404
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/BizHawk.Client.EmuHawk/Sound/Sound.cs
View File

@ -22,25 +22,23 @@ namespace BizHawk.Client.EmuHawk
public Sound(IntPtr mainWindowHandle)
{
if (GlobalWin.Config.SoundOutputMethod != ESoundOutputMethod.Dummy)
if (OSTailoredCode.IsUnixHost)
{
if (OSTailoredCode.IsUnixHost)
{
// at the moment unix/mono can only support OpenAL (so ignore whatever is set in the config)
_outputDevice = new OpenALSoundOutput(this);
}
else
{
if (GlobalWin.Config.SoundOutputMethod == ESoundOutputMethod.OpenAL)
_outputDevice = new OpenALSoundOutput(this);
if (GlobalWin.Config.SoundOutputMethod == ESoundOutputMethod.DirectSound)
_outputDevice = new DirectSoundSoundOutput(this, mainWindowHandle, GlobalWin.Config.SoundDevice);
if (GlobalWin.Config.SoundOutputMethod == ESoundOutputMethod.XAudio2)
_outputDevice = new XAudio2SoundOutput(this);
}
// if DirectSound or XAudio is chosen, use OpenAL, otherwise comply with the user's choice
_outputDevice = GlobalWin.Config.SoundOutputMethod == ESoundOutputMethod.Dummy
? (ISoundOutput) new DummySoundOutput(this)
: new OpenALSoundOutput(this);
}
else
{
_outputDevice = GlobalWin.Config.SoundOutputMethod switch
{
ESoundOutputMethod.DirectSound => new DirectSoundSoundOutput(this, mainWindowHandle, GlobalWin.Config.SoundDevice),
ESoundOutputMethod.XAudio2 => new XAudio2SoundOutput(this),
ESoundOutputMethod.OpenAL => new OpenALSoundOutput(this),
_ => new DummySoundOutput(this)
};
}
if (_outputDevice == null)
_outputDevice = new DummySoundOutput(this);
}
/// <summary>