[activeae] check whether the sink has a device for passthrough when loading settings
authorJonathan Marshall <jmarshall@xbmc.org>
Sun, 2 Feb 2014 02:04:27 +0000 (15:04 +1300)
committerJonathan Marshall <jmarshall@xbmc.org>
Sun, 2 Feb 2014 09:37:41 +0000 (22:37 +1300)
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp

index 76e0fa8..a3189c9 100644 (file)
@@ -2034,6 +2034,8 @@ void CActiveAE::LoadSettings()
   m_settings.guisoundmode = CSettings::Get().GetInt("audiooutput.guisoundmode");
 
   m_settings.passthrough = m_settings.config == AE_CONFIG_FIXED ? false : CSettings::Get().GetBool("audiooutput.passthrough");
+  if (!m_sink.HasPassthroughDevice())
+    m_settings.passthrough = false;
   m_settings.ac3passthrough = CSettings::Get().GetBool("audiooutput.ac3passthrough");
   m_settings.ac3transcode = CSettings::Get().GetBool("audiooutput.ac3transcode");
   m_settings.eac3passthrough = CSettings::Get().GetBool("audiooutput.eac3passthrough");