summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qsoundeffect_pulse_p.h
diff options
context:
space:
mode:
authorLev Zelenskiy <lev.zelenskiy@nokia.com>2012-04-20 17:02:35 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-25 04:03:02 +0200
commitc7180435887c55a76aca2948a76327d0d57a5645 (patch)
tree8284e861a56725364804cef311c03715cc9d2fc1 /src/multimedia/audio/qsoundeffect_pulse_p.h
parent7c84225cc877ef76143e1f476d0179bfb0594f02 (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.h')
-rw-r--r--src/multimedia/audio/qsoundeffect_pulse_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.h b/src/multimedia/audio/qsoundeffect_pulse_p.h
index 6c7202c24..1d5aa9305 100644
--- a/src/multimedia/audio/qsoundeffect_pulse_p.h
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.h
@@ -118,7 +118,7 @@ private Q_SLOTS:
void underRun();
void prepare();
void streamReady();
- void emptyComplete();
+ void emptyComplete(void *stream);
void updateVolume();
void updateMuted();