Add new implementation of QSound class

Added a re-implementation of QSound, using functionality derived from
QSoundEffect. QSound API remains the same as the original 4.x version.

It offers both a static interface (with auto resource cleanup on sound
completion), as well as an object instance interface for more detailed
control.

Change-Id: I85c00dd88547f8dea9b1e1ef2da31d2f2e28a172
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

6 files changed, 148 insertions, 2 deletions

diff --git a/tests/auto/integration/multimedia.pro b/tests/auto/integration/multimedia.pro
index 99eb434a5..2f43ffbfc 100644
--- a/tests/auto/integration/multimedia.pro
+++ b/tests/auto/integration/multimedia.pro
@@ -6,5 +6,6 @@ SUBDIRS += \
     qaudiooutput \
     qmediaplayerbackend \
     qcamerabackend \
-    qsoundeffect
+    qsoundeffect \
+    qsound
 
diff --git a/tests/auto/integration/qsound/qsound.pro b/tests/auto/integration/qsound/qsound.pro
new file mode 100644
index 000000000..da4f6d913
--- /dev/null
+++ b/tests/auto/integration/qsound/qsound.pro
@@ -0,0 +1,12 @@
+TARGET = tst_qsound
+
+QT += core declarative multimedia-private testlib
+CONFIG += no_private_qt_headers_warning
+
+# This is more of a system test
+# CONFIG += testcase
+
+SOURCES += tst_qsound.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
diff --git a/tests/auto/integration/qsound/test.wav b/tests/auto/integration/qsound/test.wav
new file mode 100644
index 000000000..e4088a973
--- /dev/null
+++ b/tests/auto/integration/qsound/test.wav
diff --git a/tests/auto/integration/qsound/test2.wav b/tests/auto/integration/qsound/test2.wav
new file mode 100644
index 000000000..e4088a973
--- /dev/null
+++ b/tests/auto/integration/qsound/test2.wav
diff --git a/tests/auto/integration/qsound/tst_qsound.cpp b/tests/auto/integration/qsound/tst_qsound.cpp
new file mode 100644
index 000000000..588619f15
--- /dev/null
+++ b/tests/auto/integration/qsound/tst_qsound.cpp
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <QtCore/QString>
+#include <QSound>
+
+class tst_QSound : public QObject
+{
+   Q_OBJECT
+
+public:
+   tst_QSound( QObject* parent=0) : QObject(parent) {}
+
+private slots:
+   void initTestCase();
+   void cleanupTestCase();
+   void testLooping();
+   void testPlay();
+   void testStop();
+
+   void testStaticPlay();
+
+private:
+    QSound* sound;
+};
+
+
+void tst_QSound::initTestCase()
+{
+    sound = new QSound(QString(SRCDIR "test.wav"), this);
+
+    QVERIFY(!sound->fileName().isEmpty());
+    QCOMPARE(sound->loops(),1);
+}
+
+void tst_QSound::cleanupTestCase()
+{
+    if (sound)
+    {
+        delete sound;
+        sound = NULL;
+    }
+}
+
+void tst_QSound::testLooping()
+{
+    sound->setLoops(5);
+    QCOMPARE(sound->loops(),5);
+
+    sound->play();
+    QVERIFY(!sound->isFinished());
+
+    // test.wav is about 200ms, wait until it has finished playing 5 times
+    QTest::qWait(3000);
+
+    QVERIFY(sound->isFinished());
+    QCOMPARE(sound->loopsRemaining(),0);
+}
+
+void tst_QSound::testPlay()
+{
+    sound->setLoops(1);
+    sound->play();
+    QVERIFY(!sound->isFinished());
+    QTest::qWait(1000);
+    QVERIFY(sound->isFinished());
+}
+
+void tst_QSound::testStop()
+{
+    sound->setLoops(10);
+    sound->play();
+    QVERIFY(!sound->isFinished());
+    QTest::qWait(1000);
+    sound->stop();
+    QTest::qWait(1000);
+    QVERIFY(sound->isFinished());
+}
+
+void tst_QSound::testStaticPlay()
+{
+    // Check that you hear sound with static play also.
+    QSound::play(QString(SRCDIR "test2.wav"));
+
+    QTest::qWait(1000);
+}
+
+QTEST_MAIN(tst_QSound);
+#include "tst_qsound.moc"
diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
index 678d2be36..f2c576a05 100644
--- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
+++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
@@ -106,16 +106,20 @@ void tst_QSoundEffect::testSource()
 
 void tst_QSoundEffect::testLooping()
 {
-    QSignalSpy readSignal(sound, SIGNAL(loopCountChanged()));
+    QSignalSpy readSignal_Count(sound, SIGNAL(loopCountChanged()));
+    QSignalSpy readSignal_Remaining(sound, SIGNAL(loopsRemainingChanged()));
 
     sound->setLoopCount(5);
     QCOMPARE(sound->loopCount(),5);
+    QCOMPARE(readSignal_Count.count(),1);
 
     sound->play();
 
     // test.wav is about 200ms, wait until it has finished playing 5 times
     QTest::qWait(3000);
 
+    QCOMPARE(sound->loopsRemaining(), 0);
+    QCOMPARE(readSignal_Remaining.count(),5);
 }
 
 void tst_QSoundEffect::testVolume()