From 13d75ce063eb6438215c1bbb1cdda1bd2aab10cd Mon Sep 17 00:00:00 2001 From: Mithra Pattison Date: Fri, 6 Jan 2012 12:54:26 +1000 Subject: Fix for QSoundEffect crash bug When multiple QSoundEffect instances play the same wav source file simultaneously, the system would crash due to some instances not waiting for the underlying pulse audio stream to complete its setup logic. QSoundEffect now waits for the stream to attain the correct state before playing the sound. Change-Id: Ib5a1e6bc3f1cc314054f9cdc89c10100ad546721 Reviewed-by: Ling Hu Reviewed-by: Michael Goddard --- src/multimedia/audio/qsoundeffect_pulse_p.cpp | 3 ++- tests/auto/integration/qsound/test2.wav | Bin 38316 -> 0 bytes tests/auto/integration/qsound/tst_qsound.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 tests/auto/integration/qsound/test2.wav diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 373586ef5..58143fcc2 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -567,7 +567,7 @@ void QSoundEffectPrivate::play() return; PulseDaemonLocker locker; - if (!m_sampleReady || !m_pulseStream || m_stopping || m_emptying) { + if (!m_pulseStream || m_status != QSoundEffect::Ready || m_stopping || m_emptying) { #ifdef QT_PA_DEBUG qDebug() << this << "play deferred"; #endif @@ -794,6 +794,7 @@ void QSoundEffectPrivate::playSample() qDebug() << this << "playSample"; #endif Q_ASSERT(m_pulseStream); + Q_ASSERT(pa_stream_get_state(m_pulseStream) == PA_STREAM_READY); pa_operation_unref(pa_stream_cork(m_pulseStream, 0, 0, 0)); } diff --git a/tests/auto/integration/qsound/test2.wav b/tests/auto/integration/qsound/test2.wav deleted file mode 100644 index e4088a973..000000000 Binary files a/tests/auto/integration/qsound/test2.wav and /dev/null differ diff --git a/tests/auto/integration/qsound/tst_qsound.cpp b/tests/auto/integration/qsound/tst_qsound.cpp index 6f98c45bb..3cb060c19 100644 --- a/tests/auto/integration/qsound/tst_qsound.cpp +++ b/tests/auto/integration/qsound/tst_qsound.cpp @@ -123,7 +123,7 @@ void tst_QSound::testStop() void tst_QSound::testStaticPlay() { // Check that you hear sound with static play also. - const QString testFileName = QStringLiteral("test2.wav"); + const QString testFileName = QStringLiteral("test.wav"); const QString fullPath = QFINDTESTDATA(testFileName); QVERIFY2(!fullPath.isEmpty(), qPrintable(QStringLiteral("Unable to locate ") + testFileName)); -- cgit v1.2.3