diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 06:18:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 06:18:47 (GMT) |
| commit | c6ac172d82d7a76f39c473f55e073a6b6e40a37e (patch) | |
| tree | 36397a3c7d75a814327492e9450f546db016e643 | |
| parent | bd90a38b851e47ccc922838a71a5631437e5b43c (diff) | |
| parent | 0eb2aa1de730b0223bb0e2aa9cc53b6ee608b6bf (diff) | |
| download | Qt-c6ac172d82d7a76f39c473f55e073a6b6e40a37e.zip Qt-c6ac172d82d7a76f39c473f55e073a6b6e40a37e.tar.gz Qt-c6ac172d82d7a76f39c473f55e073a6b6e40a37e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed deadlock introduced by change
Fixed invokeMethod in alsa implementation.
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_alsa_p.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp index e49c75a..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, SLOT(updateAvailable()), Qt::QueuedConnection); + updateAvailable(); } + void QAudioOutputPrivate::updateAvailable() { #ifdef DEBUG_AUDIO |