DSP must be set to LLE to select the decoder

5 files changed, 8 insertions, 7 deletions

diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp
index da515aa8f3..768ea38467 100644
--- a/Source/Core/AudioCommon/CubebStream.cpp
+++ b/Source/Core/AudioCommon/CubebStream.cpp
@@ -37,7 +37,7 @@ bool CubebStream::Init()
   if (!m_ctx)
     return false;
 
-  m_stereo = !SConfig::GetInstance().bDPL2Decoder;
+  m_stereo = !SConfig::GetInstance().bDPL2Decoder || SConfig::GetInstance().bDSPHLE;
 
   cubeb_stream_params params;
   params.rate = m_mixer->GetSampleRate();
diff --git a/Source/Core/AudioCommon/Enums.h b/Source/Core/AudioCommon/Enums.h
index 20c34779a5..ec979ff941 100644
--- a/Source/Core/AudioCommon/Enums.h
+++ b/Source/Core/AudioCommon/Enums.h
@@ -8,8 +8,8 @@ namespace AudioCommon
 {
 enum class DPL2Quality
 {
-  Low = 0,
-  Medium = 1,
+  Lowest = 0,
+  Low = 1,
   High = 2,
   Highest = 3
 };
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
index 1636c29018..e414538613 100644
--- a/Source/Core/AudioCommon/Mixer.cpp
+++ b/Source/Core/AudioCommon/Mixer.cpp
@@ -20,9 +20,9 @@ static u32 DPL2QualityToFrameBlockSize(AudioCommon::DPL2Quality quality)
 {
   switch (quality)
   {
-  case AudioCommon::DPL2Quality::Low:
+  case AudioCommon::DPL2Quality::Lowest:
     return 512;
-  case AudioCommon::DPL2Quality::Medium:
+  case AudioCommon::DPL2Quality::Low:
     return 1024;
   case AudioCommon::DPL2Quality::Highest:
     return 4096;
diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp
index 4852495d23..51530088b2 100644
--- a/Source/Core/AudioCommon/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/OpenALStream.cpp
@@ -221,7 +221,8 @@ void OpenALStream::SoundLoop()
 
   bool float32_capable = palIsExtensionPresent("AL_EXT_float32") != 0;
   bool surround_capable = palIsExtensionPresent("AL_EXT_MCFORMATS") || IsCreativeXFi();
-  bool use_surround = SConfig::GetInstance().bDPL2Decoder && surround_capable;
+  bool use_surround =
+      SConfig::GetInstance().bDPL2Decoder && surround_capable && !SConfig::GetInstance().bDSPHLE;
 
   // As there is no extension to check for 32-bit fixed point support
   // and we know that only a X-Fi with hardware OpenAL supports it,
diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp
index e480ed9e6e..3d05cc610b 100644
--- a/Source/Core/AudioCommon/PulseAudioStream.cpp
+++ b/Source/Core/AudioCommon/PulseAudioStream.cpp
@@ -19,7 +19,7 @@ PulseAudio::PulseAudio() = default;
 
 bool PulseAudio::Init()
 {
-  m_stereo = !SConfig::GetInstance().bDPL2Decoder;
+  m_stereo = !SConfig::GetInstance().bDPL2Decoder || SConfig::GetInstance().bDSPHLE;
   m_channels = m_stereo ? 2 : 6;  // will tell PA we use a Stereo or 5.0 channel setup
 
   NOTICE_LOG(AUDIO, "PulseAudio backend using %d channels", m_channels);