Skip to content

Commit

Permalink
Merge branch 'master' of github.com:MythTV/mythtv
Browse files Browse the repository at this point in the history
  • Loading branch information
wagnerrp committed Dec 7, 2010
2 parents 0a3fc07 + f00cd5d commit fbe4969
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mythtv/programs/mythfrontend/globalsettings.cpp
Expand Up @@ -311,7 +311,7 @@ void AudioConfigSettings::UpdateCapabilities(const QString &device)
m_DTSPassThrough->boolValue();
bool bLPCM = settings.canPassthrough() == -1 ||
(settings.canLPCM() &&
m_AdvancedAudioSettings->boolValue() && !m_MPCM->boolValue());
!(m_AdvancedAudioSettings->boolValue() && m_MPCM->boolValue()));

if (max_speakers > 2 && !bLPCM)
max_speakers = 2;
Expand Down

0 comments on commit fbe4969

Please sign in to comment.