ActiveAE: fix broken transcode for SPDIF if hidden channel layout has more than 2...
authorRainer Hochecker <fernetmenta@online.de>
Mon, 18 Nov 2013 20:43:36 +0000 (21:43 +0100)
committerRainer Hochecker <fernetmenta@online.de>
Tue, 19 Nov 2013 09:29:54 +0000 (10:29 +0100)
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp

index 6c63092..3fc6645 100644 (file)
@@ -1994,7 +1994,7 @@ void CActiveAE::LoadSettings()
   m_settings.passthoughdevice = CSettings::Get().GetString("audiooutput.passthroughdevice");
 
   m_settings.config = CSettings::Get().GetInt("audiooutput.config");
-  m_settings.channels = CSettings::Get().GetInt("audiooutput.channels");
+  m_settings.channels = (m_sink.GetDeviceType(m_settings.device) == AE_DEVTYPE_IEC958) ? AE_CH_LAYOUT_2_0 : CSettings::Get().GetInt("audiooutput.channels");
   m_settings.samplerate = CSettings::Get().GetInt("audiooutput.samplerate");
 
   m_settings.stereoupmix = (m_settings.channels > AE_CH_LAYOUT_2_0) ? CSettings::Get().GetBool("audiooutput.stereoupmix") : false;