Changes to low-level audio API.

QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() ->
QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void
start(QIODevice*), QIODevice*
start()

Reviewed-by:Justin McPherson

4 files changed, 25 insertions, 28 deletions

diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index 715f21936d..7b9a422314 100644
--- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -77,7 +77,7 @@ private:
 void tst_QAudioDeviceInfo::initTestCase()
 {
     // Only perform tests if audio output device exists!
-    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
+    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput);
     if(devices.size() > 0)
         available = true;
     else {
@@ -90,7 +90,7 @@ void tst_QAudioDeviceInfo::checkAvailableDefaultInput()
 {
     // Only perform tests if audio input device exists!
     bool storeAvailable = available;
-    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
+    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::deviceList(QAudio::AudioInput);
     if(devices.size() > 0)
         available = true;
     else {
@@ -111,7 +111,7 @@ void tst_QAudioDeviceInfo::checkAvailableDefaultOutput()
 void tst_QAudioDeviceInfo::outputList()
 {
     if(available) {
-        QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
+        QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput);
         QVERIFY(devices.size() > 0);
         device = new QAudioDeviceInfo(devices.at(0));
     }
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
index 0778a8e4a3..286e63fbde 100644
--- a/tests/auto/qaudioformat/tst_qaudioformat.cpp
+++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp
@@ -69,20 +69,17 @@ private slots:
 
 void tst_QAudioFormat::checkNull()
 {
-    // Default constructed QAudioFormat is invalid.
+    // Default constructed QAudioFormat is null.
     QAudioFormat    audioFormat0;
-    QVERIFY(!audioFormat0.isValid());
+    QVERIFY(audioFormat0.isNull());
 
-    // validity is transferred
+    // Null is transferred
     QAudioFormat    audioFormat1(audioFormat0);
-    QVERIFY(!audioFormat1.isValid());
+    QVERIFY(audioFormat1.isNull());
 
+    // Null is voided on activity
     audioFormat0.setFrequency(44100);
-    audioFormat0.setChannels(2);
-    audioFormat0.setSampleSize(16);
-    audioFormat0.setCodec("audio/pcm");
-    audioFormat0.setSampleType(QAudioFormat::SignedInt);
-    QVERIFY(audioFormat0.isValid());
+    QVERIFY(!audioFormat0.isNull());
 }
 
 void tst_QAudioFormat::checkFrequency()
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index 744ce38cbe..3efc346ddc 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -76,7 +76,7 @@ void tst_QAudioInput::initTestCase()
     format.setSampleType(QAudioFormat::UnSignedInt);
 
     // Only perform tests if audio input device exists!
-    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
+    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::deviceList(QAudio::AudioInput);
     if(devices.size() > 0)
         available = true;
     else {
@@ -137,16 +137,16 @@ void tst_QAudioInput::pullFile()
         QSignalSpy stateSignal(audio, SIGNAL(stateChanged(QAudio::State)));
 
         // Always have default states, before start
-        QVERIFY(audio->state() == QAudio::StoppedState);
+        QVERIFY(audio->state() == QAudio::StopState);
         QVERIFY(audio->error() == QAudio::NoError);
-        QVERIFY(audio->elapsedUSecs() == 0);
+        QVERIFY(audio->clock() == 0);
 
         audio->start(&filename);
         QTest::qWait(20);
         // Check state and periodSize() are valid non-zero values.
         QVERIFY(audio->state() == QAudio::ActiveState);
         QVERIFY(audio->error() == QAudio::NoError);
-        QVERIFY(audio->elapsedUSecs() > 10000 && audio->elapsedUSecs() < 800000);
+        QVERIFY(audio->clock() > 10000 && audio->clock() < 800000);
         QVERIFY(audio->periodSize() > 0);
         QVERIFY(stateSignal.count() == 1); // State changed to QAudio::ActiveState
 
@@ -154,12 +154,12 @@ void tst_QAudioInput::pullFile()
         QTest::qWait(5000);
 
         QVERIFY(readSignal.count() > 0);
-        QVERIFY(audio->processedUSecs() > 0);
+        QVERIFY(audio->totalTime() > 0);
 
         audio->stop();
         QTest::qWait(20);
-        QVERIFY(audio->state() == QAudio::StoppedState);
-        QVERIFY(audio->elapsedUSecs() == 0);
+        QVERIFY(audio->state() == QAudio::StopState);
+        QVERIFY(audio->clock() == 0);
         // Can only check to make sure we got at least 1 more signal, but can be more.
         QVERIFY(stateSignal.count() > 1);
 
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index 26694cc3e0..b001af1c79 100644
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -79,7 +79,7 @@ void tst_QAudioOutput::initTestCase()
     format.setSampleType(QAudioFormat::UnSignedInt);
 
     // Only perform tests if audio output device exists!
-    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
+    QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput);
     if(devices.size() > 0)
         available = true;
     else {
@@ -140,9 +140,9 @@ void tst_QAudioOutput::pullFile()
         audio->setNotifyInterval(100);
 
         // Always have default states, before start
-        QVERIFY(audio->state() == QAudio::StoppedState);
+        QVERIFY(audio->state() == QAudio::StopState);
         QVERIFY(audio->error() == QAudio::NoError);
-        QVERIFY(audio->elapsedUSecs() == 0);
+        QVERIFY(audio->clock() == 0);
 
         audio->start(&file);
         QTest::qWait(20); // wait 20ms
@@ -150,12 +150,12 @@ void tst_QAudioOutput::pullFile()
         QVERIFY(audio->state() == QAudio::ActiveState);
         QVERIFY(audio->error() == QAudio::NoError);
         QVERIFY(audio->periodSize() > 0);
-        QVERIFY(audio->elapsedUSecs() > 10000 && audio->elapsedUSecs() < 800000);
+        QVERIFY(audio->clock() > 10000 && audio->clock() < 800000);
         QVERIFY(stateSignal.count() == 1); // State changed to QAudio::ActiveState
 
         // Wait until finished...
         QTestEventLoop::instance().enterLoop(1);
-        QCOMPARE(audio->processedUSecs(), qint64(692250));
+        QCOMPARE(audio->totalTime(), qint64(692250));
 
 #ifdef Q_OS_WINCE
         // 4.wav is a little less than 700ms, so notify should fire 4 times on Wince!
@@ -166,8 +166,8 @@ void tst_QAudioOutput::pullFile()
 #endif
         audio->stop();
         QTest::qWait(20); // wait 20ms
-        QVERIFY(audio->state() == QAudio::StoppedState);
-        QVERIFY(audio->elapsedUSecs() == 0);
+        QVERIFY(audio->state() == QAudio::StopState);
+        QVERIFY(audio->clock() == 0);
         // Can only check to make sure we got at least 1 more signal, but can be more.
         QVERIFY(stateSignal.count() > 1);
 
@@ -184,7 +184,7 @@ void tst_QAudioOutput::pushFile()
 
         const qint64 fileSize = file.size();
 
-        QIODevice* feed = audio->start();
+        QIODevice* feed = audio->start(0);
 
         char* buffer = new char[fileSize];
         file.read(buffer, fileSize);
@@ -199,7 +199,7 @@ void tst_QAudioOutput::pushFile()
         QTestEventLoop::instance().enterLoop(1);
 
         QVERIFY(written == fileSize);
-        QVERIFY(audio->processedUSecs() == 692250);
+        QVERIFY(audio->totalTime() == 692250);
 
         audio->stop();
         file.close();