Advertisement
Guest User

Untitled

a guest
Apr 17th, 2012
54
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.47 KB | None | 0 0
  1. diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
  2. index 6beddd4..176252a 100644
  3. --- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
  4. +++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
  5. @@ -458,7 +458,7 @@ AudioOutputSettings* AudioOutputALSA::GetOutputSettings(bool passthrough)
  6. QMap<QString, QString> *alsadevs = GetDevices("pcm");
  7. while(1)
  8. {
  9. - QString real_device = (((passthru || enc) && m_discretedigital) ?
  10. + QString real_device = ((passthrough && m_discretedigital) ?
  11. passthru_device : main_device);
  12.  
  13. QString desc = alsadevs->value(real_device);
  14. diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
  15. index e749b20..dc54cd2 100644
  16. --- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
  17. +++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
  18. @@ -170,7 +170,8 @@ void AudioOutputBase::InitSettings(const AudioSettings &settings)
  19. output_settings = GetOutputSettingsUsers(false);
  20. output_settingsdigital = GetOutputSettingsUsers(true);
  21.  
  22. - max_channels = output_settings->BestSupportedChannels();
  23. + max_channels = max(output_settings->BestSupportedChannels(),
  24. + output_settingsdigital->BestSupportedChannels());
  25. configured_channels = max_channels;
  26.  
  27. upmix_default = max_channels > 2 ?
  28. diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
  29. index 7a676fd..7d40e09 100644
  30. --- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
  31. +++ b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp
  32. @@ -354,7 +354,8 @@ AudioOutputSettings AudioConfigSettings::UpdateCapabilities(
  33. m_MaxAudioChannels->resetMaxCount(3);
  34. for (int i = 1; i <= max_speakers; i++)
  35. {
  36. - if (invalid || settings.IsSupportedChannels(i))
  37. + if (invalid || settings.IsSupportedChannels(i) ||
  38. + settingsdigital.IsSupportedChannels(i))
  39. {
  40. QString txt;
  41.  
  42. @@ -415,6 +416,8 @@ void AudioConfigSettings::AudioAdvanced()
  43.  
  44. if (audiosettings.exec() == kDialogCodeAccepted)
  45. {
  46. + // Rescan audio list to check of override digital device
  47. + AudioRescan();
  48. bool LPCM2 = settings.canFeature(FEATURE_LPCM) &&
  49. gCoreContext->GetNumSetting("StereoPCM", false);
  50. // restore speakers configure only of StereoPCM has changed and
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement