From aaa75a19aa38844a3f4fa05c5183a5feef5dd819 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 5 May 2020 08:54:21 +1000 Subject: [PATCH] Force DummySoundOutput on Mono for now --- src/BizHawk.Client.Common/config/Config.cs | 2 +- src/BizHawk.Client.EmuHawk/Sound/Sound.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 9989a10dc2..ea0b0313c1 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -230,7 +230,7 @@ namespace BizHawk.Client.Common public int DispCropBottom { get; set; } = 0; // Sound options - public ESoundOutputMethod SoundOutputMethod { get; set; } = DetectDirectX() ? ESoundOutputMethod.DirectSound : ESoundOutputMethod.OpenAL; + public ESoundOutputMethod SoundOutputMethod { get; set; } = DetectDirectX() ? ESoundOutputMethod.DirectSound : ESoundOutputMethod.Dummy; // with OpenAL, Mono is trying to load openal.dll for some reason public bool SoundEnabled { get; set; } = true; public bool SoundEnabledNormal { get; set; } = true; public bool SoundEnabledRWFF { get; set; } = true; diff --git a/src/BizHawk.Client.EmuHawk/Sound/Sound.cs b/src/BizHawk.Client.EmuHawk/Sound/Sound.cs index cb92869efb..fb3e159981 100644 --- a/src/BizHawk.Client.EmuHawk/Sound/Sound.cs +++ b/src/BizHawk.Client.EmuHawk/Sound/Sound.cs @@ -25,7 +25,8 @@ namespace BizHawk.Client.EmuHawk if (OSTailoredCode.IsUnixHost) { // at the moment unix/mono can only support OpenAL (so ignore whatever is set in the config) - _outputDevice = new OpenALSoundOutput(this); +// _outputDevice = new OpenALSoundOutput(this); + // scratch that it's trying to load openal.dll for some reason } else {