DSP must be set to LLE to select the decoder

This commit is contained in:
LAGonauta
2019-06-15 08:36:47 -03:00
parent 3c9eb37381
commit 2ff646b796
7 changed files with 33 additions and 16 deletions

View File

@ -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();

View File

@ -8,8 +8,8 @@ namespace AudioCommon
{
enum class DPL2Quality
{
Low = 0,
Medium = 1,
Lowest = 0,
Low = 1,
High = 2,
Highest = 3
};

View File

@ -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;

View File

@ -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,

View File

@ -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);