summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration/qsound
diff options
context:
space:
mode:
authorMithra Pattison <mithra.pattison@nokia.com>2012-01-06 12:54:26 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-06 08:42:54 +0100
commit13d75ce063eb6438215c1bbb1cdda1bd2aab10cd (patch)
tree5dcffb14fca65dfceda6722bcd51df28d7559d13 /tests/auto/integration/qsound
parent6b67a11032779ff3a7a78a57e8d2bb2cd8b7e525 (diff)
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 <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/integration/qsound')
-rw-r--r--tests/auto/integration/qsound/test2.wavbin38316 -> 0 bytes
-rw-r--r--tests/auto/integration/qsound/tst_qsound.cpp2
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/integration/qsound/test2.wav b/tests/auto/integration/qsound/test2.wav
deleted file mode 100644
index e4088a973..000000000
--- a/tests/auto/integration/qsound/test2.wav
+++ /dev/null
Binary files 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));