From 83e73a69d5a1c6b94c5c83f91141f35d65d27f36 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Wed, 10 Mar 2010 10:01:11 +1000
Subject: Fixed invokeMethod in alsa implementation.

Reviewed-by:Dmytro Poplavskiy
---
 src/multimedia/audio/qaudiooutput_alsa_p.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index e49c75a..7eb38b6 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -648,7 +648,7 @@ void QAudioOutputPrivate::userFeed()
 
 void QAudioOutputPrivate::feedback()
 {
-    QMetaObject::invokeMethod(this, SLOT(updateAvailable()), Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, "updateAvailable", Qt::QueuedConnection);
 }
 
 void QAudioOutputPrivate::updateAvailable()
-- 
cgit v0.12


From 346b0f6247f1f8ca967f6686a849aa7464cb6b87 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Wed, 10 Mar 2010 12:06:52 +1000
Subject: Fixed deadlock introduced by change
 83e73a69d5a1c6b94c5c83f91141f35d65d27f36. alsa callback was deadlocking with
 QEventDispatcherGlib.

Reviewed-by:Dmytro Poplavskiy
---
 src/multimedia/audio/qaudiooutput_alsa_p.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 7eb38b6..1cef335 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -648,9 +648,10 @@ void QAudioOutputPrivate::userFeed()
 
 void QAudioOutputPrivate::feedback()
 {
-    QMetaObject::invokeMethod(this, "updateAvailable", Qt::QueuedConnection);
+    updateAvailable();
 }
 
+
 void QAudioOutputPrivate::updateAvailable()
 {
 #ifdef DEBUG_AUDIO
-- 
cgit v0.12