Skip to content
This repository
Browse code

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

… it's not backwards-compatible
  • Loading branch information...
commit 938ea0289c16d83025ed98a03b992bc28e6c9d0b 1 parent 18c1537
Sascha Montellese authored November 22, 2012
4  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp
@@ -142,7 +142,7 @@ bool CCoreAudioAE::OpenCoreAudio(unsigned int sampleRate, bool forceRaw,
142 142
   // on iOS devices we set fixed to two channels.
143 143
   m_stdChLayout = AE_CH_LAYOUT_2_0;
144 144
 #if defined(TARGET_DARWIN_OSX)
145  
-  switch (g_guiSettings.GetInt("audiooutput.channellayout"))
  145
+  switch (g_guiSettings.GetInt("audiooutput.channels"))
146 146
   {
147 147
     default:
148 148
     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)
310 310
       setting == "audiooutput.mode"              ||
311 311
       setting == "audiooutput.ac3passthrough"    ||
312 312
       setting == "audiooutput.dtspassthrough"    ||
313  
-      setting == "audiooutput.channellayout"     ||
  313
+      setting == "audiooutput.channels"     ||
314 314
       setting == "audiooutput.multichannellpcm")
315 315
   {
316 316
     // only reinit the engine if we not
2  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEHALOSX.cpp
@@ -92,7 +92,7 @@ bool CCoreAudioAEHALOSX::InitializePCM(ICoreAudioSource *pSource, AEAudioFormat
92 92
   if (!m_audioGraph)
93 93
     return false;
94 94
 
95  
-  AudioChannelLayoutTag layout = g_LayoutMap[ g_guiSettings.GetInt("audiooutput.channellayout") ];
  95
+  AudioChannelLayoutTag layout = g_LayoutMap[ g_guiSettings.GetInt("audiooutput.channels") ];
96 96
   // force optical/coax to 2.0 output channels
97 97
   if (!m_Passthrough && g_guiSettings.GetInt("audiooutput.mode") == AUDIO_IEC958)
98 98
     layout = g_LayoutMap[1];
4  xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@ -524,7 +524,7 @@ void CSoftAE::OnSettingsChange(const std::string& setting)
524 524
       setting == "audiooutput.passthroughaac"    ||
525 525
       setting == "audiooutput.truehdpassthrough" ||
526 526
       setting == "audiooutput.dtshdpassthrough"  ||
527  
-      setting == "audiooutput.channellayout"     ||
  527
+      setting == "audiooutput.channels"     ||
528 528
       setting == "audiooutput.useexclusivemode"  ||
529 529
       setting == "audiooutput.multichannellpcm"  ||
530 530
       setting == "audiooutput.stereoupmix")
@@ -553,7 +553,7 @@ void CSoftAE::LoadSettings()
553 553
 
554 554
   /* load the configuration */
555 555
   m_stdChLayout = AE_CH_LAYOUT_2_0;
556  
-  switch (g_guiSettings.GetInt("audiooutput.channellayout"))
  556
+  switch (g_guiSettings.GetInt("audiooutput.channels"))
557 557
   {
558 558
     default:
559 559
     case  0: m_stdChLayout = AE_CH_LAYOUT_2_0; break; /* dont alow 1_0 output */
2  xbmc/settings/GUISettings.cpp
@@ -470,7 +470,7 @@ void CGUISettings::Initialize()
470 470
   map<int,int> channelLayout;
471 471
   for(int layout = AE_CH_LAYOUT_2_0; layout < AE_CH_LAYOUT_MAX; ++layout)
472 472
     channelLayout.insert(make_pair(34100+layout, layout));
473  
-  AddInt(ao, "audiooutput.channellayout", 34100, AE_CH_LAYOUT_2_0, channelLayout, SPIN_CONTROL_TEXT);
  473
+  AddInt(ao, "audiooutput.channels", 34100, AE_CH_LAYOUT_2_0, channelLayout, SPIN_CONTROL_TEXT);
474 474
   AddBool(ao, "audiooutput.normalizelevels", 346, true);
475 475
   AddBool(ao, "audiooutput.stereoupmix", 252, false);
476 476
 

0 notes on commit 938ea02

Please sign in to comment.
Something went wrong with that request. Please try again.