Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
- index 6beddd4..176252a 100644
- --- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
- +++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
- @@ -458,7 +458,7 @@ AudioOutputSettings* AudioOutputALSA::GetOutputSettings(bool passthrough)
- QMap<QString, QString> *alsadevs = GetDevices("pcm");
- while(1)
- {
- - QString real_device = (((passthru || enc) && m_discretedigital) ?
- + QString real_device = ((passthrough && m_discretedigital) ?
- passthru_device : main_device);
- QString desc = alsadevs->value(real_device);
- diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
- index e749b20..dc54cd2 100644
- --- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
- +++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
- @@ -170,7 +170,8 @@ void AudioOutputBase::InitSettings(const AudioSettings &settings)
- output_settings = GetOutputSettingsUsers(false);
- output_settingsdigital = GetOutputSettingsUsers(true);
- - max_channels = output_settings->BestSupportedChannels();
- + max_channels = max(output_settings->BestSupportedChannels(),
- + output_settingsdigital->BestSupportedChannels());
- configured_channels = max_channels;
- upmix_default = max_channels > 2 ?
- diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
- index 7a676fd..7d40e09 100644
- --- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
- +++ b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
- @@ -354,7 +354,8 @@ AudioOutputSettings AudioConfigSettings::UpdateCapabilities(
- m_MaxAudioChannels->resetMaxCount(3);
- for (int i = 1; i <= max_speakers; i++)
- {
- - if (invalid || settings.IsSupportedChannels(i))
- + if (invalid || settings.IsSupportedChannels(i) ||
- + settingsdigital.IsSupportedChannels(i))
- {
- QString txt;
- @@ -415,6 +416,8 @@ void AudioConfigSettings::AudioAdvanced()
- if (audiosettings.exec() == kDialogCodeAccepted)
- {
- + // Rescan audio list to check of override digital device
- + AudioRescan();
- bool LPCM2 = settings.canFeature(FEATURE_LPCM) &&
- gCoreContext->GetNumSetting("StereoPCM", false);
- // restore speakers configure only of StereoPCM has changed and
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement