Rename database settings MultiChannelsPCM to StereoPCM to avoid confl…

…icts with behaviour introduced in [27318]. git-svn-id: http://svn.mythtv.org/svn/trunk@27331 7dbf422c-18fa-0310-86e9-fd20926502f2
MythTV · Nov 24, 2010 · c72be4a · c72be4a
1 parent 975461f
commit c72be4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mythtv/libs/libmyth/audiooutputsettings.cpp b/mythtv/libs/libmyth/audiooutputsettings.cpp
@@ -308,7 +308,7 @@ AudioOutputSettings* AudioOutputSettings::GetUsers(bool newcopy)
         gCoreContext->GetNumSetting("DTSPassThru", false);
     bool bLPCM = aosettings->m_LPCM &&
         (aosettings->m_passthrough == -1 ||
-         (bAdv && !gCoreContext->GetNumSetting("MultiChannelPCM", false)));
+         (bAdv && !gCoreContext->GetNumSetting("StereoPCM", false)));
 
     if (max_channels > 2 && !bLPCM)
         max_channels = 2;

diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -420,8 +420,8 @@ HostCheckBox *AudioConfigSettings::DTSPassThrough()
 
 HostCheckBox *AudioConfigSettings::MPCM()
 {
-    HostCheckBox *gc = new HostCheckBox("MultiChannelPCM");
-    gc->setLabel(QObject::tr("Stereo PCM"));
+    HostCheckBox *gc = new HostCheckBox("StereoPCM");
+    gc->setLabel(QObject::tr("Stereo PCM Only"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder "
                     "only supports 2 channels PCM (typically an old HDMI 1.0 "