From 83dec6751815607e7e4dd65068ae43410d8c5e67 Mon Sep 17 00:00:00 2001 From: Colin Guthrie <colin@mageia.org> Date: Thu, 3 Mar 2011 16:28:15 +0000 Subject: [PATCH 102/105] pulse: Do not suspend PA when using alsa:default This makes no sense as 99 times out of 100, a system with PA enabled will also map ALSA's default device to PA and issuing a suspend would result in a kind of deadlock. --- mythtv/libs/libmyth/audio/audiooutput.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mythtv/libs/libmyth/audio/audiooutput.cpp b/mythtv/libs/libmyth/audio/audiooutput.cpp index cbb5a42..b31f2e4 100644 --- a/mythtv/libs/libmyth/audio/audiooutput.cpp +++ b/mythtv/libs/libmyth/audio/audiooutput.cpp @@ -135,7 +135,8 @@ AudioOutput *AudioOutput::OpenAudio(AudioSettings &settings, delete alsadevs; } #endif - if (main_device.contains("pulse", Qt::CaseInsensitive)) + if (main_device.contains("pulse", Qt::CaseInsensitive) + || main_device.contains("alsa:default", Qt::CaseInsensitive)) { ispulse = true; } -- 1.8.4