Permalink
Browse files

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
  • Loading branch information...
1 parent 975461f commit c72be4afdf0810f9fb7cd8cfe0a6f11a56bf60f7 @jyavenard jyavenard committed Nov 24, 2010
Showing with 3 additions and 3 deletions.
  1. +1 −1 mythtv/libs/libmyth/audiooutputsettings.cpp
  2. +2 −2 mythtv/programs/mythfrontend/globalsettings.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;
@@ -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 "

0 comments on commit c72be4a

Please sign in to comment.