summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2013-03-08 15:18:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 14:36:28 +0200
commitb357c55f2dfe44e5c2a2524b93478aecf668ca0a (patch)
tree6dec038966d3a45e708a3c4f8d8bb4df1e55bd46 /tests/auto/integration
parent044e48d5a4e0281efb1f6d5136c9a732e3119559 (diff)
CoreAudio: Create an audio plugin supporting iOS and OS X
This removes the Mac audio backend that was hardcoded into QtMultimedia and adds a new audio plugin using the CoreAudio API. Change-Id: Ib15291825f9452a3763e0eeb281d952deb0bad3d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'tests/auto/integration')
-rwxr-xr-xtests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
index 3d2be8260..477727497 100755
--- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
@@ -829,8 +829,9 @@ void tst_QAudioOutput::pushSuspendResume()
audioOutput.resume();
- // Give backends running in separate threads a chance to resume.
- QTest::qWait(100);
+ // Give backends running in separate threads a chance to resume
+ // but not too much or the rest of the file may be processed
+ QTest::qWait(20);
// Check that QAudioOutput immediately transitions to ActiveState
QVERIFY2((stateSignal.count() == 1),