diff options
| author | Lev Zelenskiy <lev.zelenskiy@nokia.com> | 2012-04-20 17:02:35 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-25 04:03:02 +0200 |
| commit | c7180435887c55a76aca2948a76327d0d57a5645 (patch) | |
| tree | 8284e861a56725364804cef311c03715cc9d2fc1 /src/multimedia/audio/qsoundeffect_pulse_p.cpp | |
| parent | 7c84225cc877ef76143e1f476d0179bfb0594f02 (diff) | |
Do not try to complete flush operation if stream has changed.
There is a problem when sound effect already has a sound loaded and
we try to load new sound with setSource().
When sampleReady() is called between emptyStream() and emptyComplete()
it unloads the current stream and creates a new stream.
As a result pulse audio crashed in emptyComplete() while calling
pa_operation_unref(pa_stream_cork(
m_pulseStream, 1, stream_cork_callback, m_ref->getRef()))
with the new m_pulseStream.
Change-Id: Idff4fe6037d3f3f116734dc0facabaafa3db14a2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/multimedia/audio/qsoundeffect_pulse_p.cpp')
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_pulse_p.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 3b9278c7d..8cc49004a 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -628,11 +628,17 @@ void QSoundEffectPrivate::emptyStream() pa_operation_unref(pa_stream_flush(m_pulseStream, stream_flush_callback, m_ref->getRef())); } -void QSoundEffectPrivate::emptyComplete() +void QSoundEffectPrivate::emptyComplete(void *stream) { PulseDaemonLocker locker; +#ifdef QT_PA_DEBUG + qDebug() << this << "emptyComplete"; +#endif + m_emptying = false; - pa_operation_unref(pa_stream_cork(m_pulseStream, 1, stream_cork_callback, m_ref->getRef())); + + if ((pa_stream *)stream == m_pulseStream) + pa_operation_unref(pa_stream_cork(m_pulseStream, 1, stream_cork_callback, m_ref->getRef())); } void QSoundEffectPrivate::sampleReady() @@ -1122,7 +1128,7 @@ void QSoundEffectPrivate::stream_flush_callback(pa_stream *s, int success, void #ifdef QT_PA_DEBUG qDebug() << self << "stream_flush_callback"; #endif - QMetaObject::invokeMethod(self, "emptyComplete", Qt::QueuedConnection); + QMetaObject::invokeMethod(self, "emptyComplete", Qt::QueuedConnection, Q_ARG(void*, s)); } void QSoundEffectPrivate::stream_write_done_callback(void *p) |