removed: aac/mp1/mp2/mp3 passthrough options from the UI.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33580 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/xbmc/GUISettings.cpp b/xbmc/GUISettings.cpp
index c01f0dc..535b200 100644 (file)
--- a/xbmc/GUISettings.cpp
+++ b/xbmc/GUISettings.cpp
@@ -435,10 +435,10 @@ void CGUISettings::Initialize()
 
   AddBool(ao, "audiooutput.ac3passthrough", 364, true);
   AddBool(ao, "audiooutput.dtspassthrough", 254, true);
-  AddBool(ao, "audiooutput.aacpassthrough", 299, false);
-  AddBool(ao, "audiooutput.mp1passthrough", 300, false);
-  AddBool(ao, "audiooutput.mp2passthrough", 301, false);
-  AddBool(ao, "audiooutput.mp3passthrough", 302, false);
+  AddBool(NULL, "audiooutput.passthroughaac", 299, false);
+  AddBool(NULL, "audiooutput.passthroughmp1", 300, false);
+  AddBool(NULL, "audiooutput.passthroughmp2", 301, false);
+  AddBool(NULL, "audiooutput.passthroughmp3", 302, false);
 
 #ifdef __APPLE__
   AddString(ao, "audiooutput.audiodevice", 545, "Default", SPIN_CONTROL_TEXT);
@@ -1088,10 +1088,10 @@ void CGUISettings::LoadXML(TiXmlElement *pRootElement, bool hideSettings /* = fa
   CLog::Log(LOGINFO, "Using %s output", GetInt("audiooutput.mode") == AUDIO_ANALOG ? "analog" : "digital");
   CLog::Log(LOGINFO, "AC3 pass through is %s", GetBool("audiooutput.ac3passthrough") ? "enabled" : "disabled");
   CLog::Log(LOGINFO, "DTS pass through is %s", GetBool("audiooutput.dtspassthrough") ? "enabled" : "disabled");
-  CLog::Log(LOGINFO, "AAC pass through is %s", GetBool("audiooutput.aacpassthrough") ? "enabled" : "disabled");
-  CLog::Log(LOGINFO, "MP1 pass through is %s", GetBool("audiooutput.mp1passthrough") ? "enabled" : "disabled");
-  CLog::Log(LOGINFO, "MP2 pass through is %s", GetBool("audiooutput.mp2passthrough") ? "enabled" : "disabled");
-  CLog::Log(LOGINFO, "MP3 pass through is %s", GetBool("audiooutput.mp3passthrough") ? "enabled" : "disabled");
+  CLog::Log(LOGINFO, "AAC pass through is %s", GetBool("audiooutput.passthroughaac") ? "enabled" : "disabled");
+  CLog::Log(LOGINFO, "MP1 pass through is %s", GetBool("audiooutput.passthroughmp1") ? "enabled" : "disabled");
+  CLog::Log(LOGINFO, "MP2 pass through is %s", GetBool("audiooutput.passthroughmp2") ? "enabled" : "disabled");
+  CLog::Log(LOGINFO, "MP3 pass through is %s", GetBool("audiooutput.passthroughmp3") ? "enabled" : "disabled");
 
   g_guiSettings.m_LookAndFeelResolution = GetResolution();
 #ifdef __APPLE__

diff --git a/xbmc/GUIWindowSettingsCategory.cpp b/xbmc/GUIWindowSettingsCategory.cpp
index 5aae412..ed8adce 100644 (file)
--- a/xbmc/GUIWindowSettingsCategory.cpp
+++ b/xbmc/GUIWindowSettingsCategory.cpp
@@ -781,10 +781,10 @@ void CGUIWindowSettingsCategory::UpdateSettings()
              strSetting.Equals("audiooutput.passthroughdevice") ||
              strSetting.Equals("audiooutput.ac3passthrough") ||
              strSetting.Equals("audiooutput.dtspassthrough") ||
-             strSetting.Equals("audiooutput.aacpassthrough") ||
-             strSetting.Equals("audiooutput.mp1passthrough") ||
-             strSetting.Equals("audiooutput.mp2passthrough") ||
-             strSetting.Equals("audiooutput.mp3passthrough"))
+             strSetting.Equals("audiooutput.passthroughaac") ||
+             strSetting.Equals("audiooutput.passthroughmp1") ||
+             strSetting.Equals("audiooutput.passthroughmp2") ||
+             strSetting.Equals("audiooutput.passthroughmp3"))
     { // only visible if we are in digital mode
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
       if (pControl) pControl->SetEnabled(AUDIO_IS_BITSTREAM(g_guiSettings.GetInt("audiooutput.mode")));

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
index 2d35c2b..b5f521a 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
@@ -329,10 +329,10 @@ bool CDVDAudioCodecPassthroughFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptio
   {
     m_bSupportsAC3Out = g_guiSettings.GetBool("audiooutput.ac3passthrough");
     m_bSupportsDTSOut = g_guiSettings.GetBool("audiooutput.dtspassthrough");
-    m_bSupportsAACOut = g_guiSettings.GetBool("audiooutput.aacpassthrough");
-    m_bSupportsMP1Out = g_guiSettings.GetBool("audiooutput.mp1passthrough");
-    m_bSupportsMP2Out = g_guiSettings.GetBool("audiooutput.mp2passthrough");
-    m_bSupportsMP3Out = g_guiSettings.GetBool("audiooutput.mp3passthrough");
+    m_bSupportsAACOut = g_guiSettings.GetBool("audiooutput.passthroughaac");
+    m_bSupportsMP1Out = g_guiSettings.GetBool("audiooutput.passthroughmp1");
+    m_bSupportsMP2Out = g_guiSettings.GetBool("audiooutput.passthroughmp2");
+    m_bSupportsMP3Out = g_guiSettings.GetBool("audiooutput.passthroughmp3");
   }
   else
     return false;