diff options
| -rwxr-xr-x | language/English/strings.po | 10 | ||||
| -rw-r--r-- | system/settings/darwin.xml | 3 | ||||
| -rw-r--r-- | system/settings/rbp.xml | 3 | ||||
| -rw-r--r-- | system/settings/settings.xml | 13 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/AEFactory.cpp | 2 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h | 1 | ||||
| -rw-r--r-- | xbmc/settings/Settings.cpp | 1 |
8 files changed, 2 insertions, 33 deletions
diff --git a/language/English/strings.po b/language/English/strings.po index a403c5d576..009e1c0e78 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1242,10 +1242,7 @@ msgctxt "#298" msgid "Bookmarks" msgstr "" -#: system/settings/settings.xml -msgctxt "#299" -msgid "AAC capable receiver" -msgstr "" +#empty string with id 299 msgctxt "#300" msgid "MP1 capable receiver" @@ -14236,10 +14233,7 @@ msgctxt "#36366" msgid "Select this option if your receiver is capable of decoding DTS streams." msgstr "" -#: system/settings/settings.xml -msgctxt "#36367" -msgid "Select this option if your receiver is capable of decoding AAC streams." -msgstr "" +#empty string with id 36367 #: system/settings/settings.xml msgctxt "#36368" diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml index 817a99023f..2cf4df6ea9 100644 --- a/system/settings/darwin.xml +++ b/system/settings/darwin.xml @@ -8,9 +8,6 @@ </category> <category id="audiooutput"> <group id="1"> - <setting id="audiooutput.passthroughaac"> - <visible>false</visible> - </setting> <setting id="audiooutput.truehdpassthrough"> <visible>false</visible> </setting> diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml index ddd6635bb6..b890555605 100644 --- a/system/settings/rbp.xml +++ b/system/settings/rbp.xml @@ -41,9 +41,6 @@ <setting id="audiooutput.stereoupmix"> <visible>false</visible> </setting> - <setting id="audiooutput.passthroughaac"> - <visible>false</visible> - </setting> <setting id="audiooutput.multichannellpcm"> <visible>false</visible> </setting> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index baab060344..a2dfa9dd3f 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2133,19 +2133,6 @@ </dependency> </dependencies> </setting> - <setting id="audiooutput.passthroughaac" type="boolean" label="299" help="36367"> - <level>2</level> - <default>false</default> - <dependencies> - <dependency type="visible"> - <and> - <condition setting="audiooutput.passthrough" operator="is">true</condition> - <condition on="property" name="aesettingvisible" setting="audiooutput.passthrough">audiooutput.passthrough</condition> - <condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.passthrough</condition> - </and> - </dependency> - </dependencies> - </setting> <setting id="audiooutput.truehdpassthrough" type="boolean" label="349" help="36369"> <level>2</level> <default>false</default> diff --git a/xbmc/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp index ba97a6ba75..4c1dc86632 100644 --- a/xbmc/cores/AudioEngine/AEFactory.cpp +++ b/xbmc/cores/AudioEngine/AEFactory.cpp @@ -251,8 +251,6 @@ bool CAEFactory::SupportsRaw(AEDataFormat format) return false; if (format == AE_FMT_EAC3 && !CSettings::Get().GetBool("audiooutput.eac3passthrough")) return false; - if (format == AE_FMT_AAC && !CSettings::Get().GetBool("audiooutput.passthroughaac")) - return false; if (format == AE_FMT_TRUEHD && !CSettings::Get().GetBool("audiooutput.truehdpassthrough")) return false; if (format == AE_FMT_DTSHD && !CSettings::Get().GetBool("audiooutput.dtshdpassthrough")) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index cc9fd75eca..e5e4c5c1ca 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -1978,7 +1978,6 @@ void CActiveAE::LoadSettings() m_settings.truehdpassthrough = CSettings::Get().GetBool("audiooutput.truehdpassthrough"); m_settings.dtspassthrough = CSettings::Get().GetBool("audiooutput.dtspassthrough"); m_settings.dtshdpassthrough = CSettings::Get().GetBool("audiooutput.dtshdpassthrough"); - m_settings.aacpassthrough = CSettings::Get().GetBool("audiooutput.passthroughaac"); m_settings.resampleQuality = static_cast<AEQuality>(CSettings::Get().GetInt("audiooutput.processquality")); } @@ -2041,7 +2040,6 @@ void CActiveAE::OnSettingsChange(const std::string& setting) setting == "audiooutput.ac3passthrough" || setting == "audiooutput.eac3passthrough" || setting == "audiooutput.dtspassthrough" || - setting == "audiooutput.passthroughaac" || setting == "audiooutput.truehdpassthrough" || setting == "audiooutput.dtshdpassthrough" || setting == "audiooutput.channels" || diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h index 2ae047699d..1ac70310c7 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h @@ -52,7 +52,6 @@ struct AudioSettings bool ac3passthrough; bool eac3passthrough; bool dtspassthrough; - bool aacpassthrough; bool truehdpassthrough; bool dtshdpassthrough; bool stereoupmix; diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index 41e5d0471a..e61bce40dc 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -896,7 +896,6 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert("audiooutput.ac3passthrough"); settingSet.insert("audiooutput.eac3passthrough"); settingSet.insert("audiooutput.dtspassthrough"); - settingSet.insert("audiooutput.passthroughaac"); settingSet.insert("audiooutput.truehdpassthrough"); settingSet.insert("audiooutput.dtshdpassthrough"); settingSet.insert("audiooutput.audiodevice"); |