Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

settings: rename audiooutput.channellayout to audiooutput.channels as…

… it's not backwards-compatible
  • Loading branch information...
commit 938ea0289c16d83025ed98a03b992bc28e6c9d0b 1 parent 18c1537
Sascha Montellese Montellese authored
4 xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp
View
@@ -142,7 +142,7 @@ bool CCoreAudioAE::OpenCoreAudio(unsigned int sampleRate, bool forceRaw,
// on iOS devices we set fixed to two channels.
m_stdChLayout = AE_CH_LAYOUT_2_0;
#if defined(TARGET_DARWIN_OSX)
- switch (g_guiSettings.GetInt("audiooutput.channellayout"))
+ switch (g_guiSettings.GetInt("audiooutput.channels"))
{
default:
case 0: m_stdChLayout = AE_CH_LAYOUT_2_0; break; /* do not allow 1_0 output */
@@ -310,7 +310,7 @@ void CCoreAudioAE::OnSettingsChange(const std::string& setting)
setting == "audiooutput.mode" ||
setting == "audiooutput.ac3passthrough" ||
setting == "audiooutput.dtspassthrough" ||
- setting == "audiooutput.channellayout" ||
+ setting == "audiooutput.channels" ||
setting == "audiooutput.multichannellpcm")
{
// only reinit the engine if we not
2  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALOSX.cpp
View
@@ -92,7 +92,7 @@ bool CCoreAudioAEHALOSX::InitializePCM(ICoreAudioSource *pSource, AEAudioFormat
if (!m_audioGraph)
return false;
- AudioChannelLayoutTag layout = g_LayoutMap[ g_guiSettings.GetInt("audiooutput.channellayout") ];
+ AudioChannelLayoutTag layout = g_LayoutMap[ g_guiSettings.GetInt("audiooutput.channels") ];
// force optical/coax to 2.0 output channels
if (!m_Passthrough && g_guiSettings.GetInt("audiooutput.mode") == AUDIO_IEC958)
layout = g_LayoutMap[1];
4 xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
View
@@ -524,7 +524,7 @@ void CSoftAE::OnSettingsChange(const std::string& setting)
setting == "audiooutput.passthroughaac" ||
setting == "audiooutput.truehdpassthrough" ||
setting == "audiooutput.dtshdpassthrough" ||
- setting == "audiooutput.channellayout" ||
+ setting == "audiooutput.channels" ||
setting == "audiooutput.useexclusivemode" ||
setting == "audiooutput.multichannellpcm" ||
setting == "audiooutput.stereoupmix")
@@ -553,7 +553,7 @@ void CSoftAE::LoadSettings()
/* load the configuration */
m_stdChLayout = AE_CH_LAYOUT_2_0;
- switch (g_guiSettings.GetInt("audiooutput.channellayout"))
+ switch (g_guiSettings.GetInt("audiooutput.channels"))
{
default:
case 0: m_stdChLayout = AE_CH_LAYOUT_2_0; break; /* dont alow 1_0 output */
2  xbmc/settings/GUISettings.cpp
View
@@ -470,7 +470,7 @@ void CGUISettings::Initialize()
map<int,int> channelLayout;
for(int layout = AE_CH_LAYOUT_2_0; layout < AE_CH_LAYOUT_MAX; ++layout)
channelLayout.insert(make_pair(34100+layout, layout));
- AddInt(ao, "audiooutput.channellayout", 34100, AE_CH_LAYOUT_2_0, channelLayout, SPIN_CONTROL_TEXT);
+ AddInt(ao, "audiooutput.channels", 34100, AE_CH_LAYOUT_2_0, channelLayout, SPIN_CONTROL_TEXT);
AddBool(ao, "audiooutput.normalizelevels", 346, true);
AddBool(ao, "audiooutput.stereoupmix", 252, false);
Please sign in to comment.
Something went wrong with that request. Please try again.