summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Yves Avenard <jyavenard@mythtv.org>2010-11-24 12:48:48 (GMT)
committer Jean-Yves Avenard <jyavenard@mythtv.org>2010-11-24 12:48:48 (GMT)
commitc72be4afdf0810f9fb7cd8cfe0a6f11a56bf60f7 (patch)
tree88eaec9d295f40f3445ff988d2a92aea3e5be735
parent975461fea7f18ab8cb99202acb24fa834fba8a94 (diff)
Rename database settings MultiChannelsPCM to StereoPCM to avoid conflicts with behaviour introduced in [27318].
git-svn-id: http://svn.mythtv.org/svn/trunk@27331 7dbf422c-18fa-0310-86e9-fd20926502f2
-rw-r--r--mythtv/libs/libmyth/audiooutputsettings.cpp2
-rw-r--r--mythtv/programs/mythfrontend/globalsettings.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/mythtv/libs/libmyth/audiooutputsettings.cpp b/mythtv/libs/libmyth/audiooutputsettings.cpp
index 128b93f..fb89c41 100644
--- 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
index c854168..7b59cc7 100644
--- 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 "