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

Actually respect the no sound output config variable

This commit is contained in:
nattthebear 2020-06-06 12:21:31 -04:00
parent 04223d2c81
commit b4517d8e0d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,23 +22,26 @@ namespace BizHawk.Client.EmuHawk
public Sound(IntPtr mainWindowHandle)
{
if (OSTailoredCode.IsUnixHost)
if (Global.Config.SoundOutputMethod != ESoundOutputMethod.Dummy)
{
// at the moment unix/mono can only support OpenAL (so ignore whatever is set in the config)
_outputDevice = new OpenALSoundOutput(this);
}
else
{
if (Global.Config.SoundOutputMethod == ESoundOutputMethod.OpenAL)
if (OSTailoredCode.IsUnixHost)
{
// at the moment unix/mono can only support OpenAL (so ignore whatever is set in the config)
_outputDevice = new OpenALSoundOutput(this);
if (Global.Config.SoundOutputMethod == ESoundOutputMethod.DirectSound)
_outputDevice = new DirectSoundSoundOutput(this, mainWindowHandle, Global.Config.SoundDevice);
if (Global.Config.SoundOutputMethod == ESoundOutputMethod.XAudio2)
_outputDevice = new XAudio2SoundOutput(this);
}
}
else
{
if (Global.Config.SoundOutputMethod == ESoundOutputMethod.OpenAL)
_outputDevice = new OpenALSoundOutput(this);
if (Global.Config.SoundOutputMethod == ESoundOutputMethod.DirectSound)
_outputDevice = new DirectSoundSoundOutput(this, mainWindowHandle, Global.Config.SoundDevice);
if (Global.Config.SoundOutputMethod == ESoundOutputMethod.XAudio2)
_outputDevice = new XAudio2SoundOutput(this);
}
if (_outputDevice == null)
_outputDevice = new DummySoundOutput(this);
if (_outputDevice == null)
_outputDevice = new DummySoundOutput(this);
}
}
/// <summary>