summaryrefslogtreecommitdiffstats
path: root/tests/auto/qaudioformat
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2009-11-10 03:07:46 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2009-11-10 03:07:46 (GMT)
commit74d3a4bf9654c8bbe9139951cc5c9352015438a6 (patch)
tree63cc04b5546454fcf668125169c6793fcdbdf04c /tests/auto/qaudioformat
parent8df98549a4d84b5877e50318140c2041e17632fb (diff)
downloadQt-74d3a4bf9654c8bbe9139951cc5c9352015438a6.zip
Qt-74d3a4bf9654c8bbe9139951cc5c9352015438a6.tar.gz
Qt-74d3a4bf9654c8bbe9139951cc5c9352015438a6.tar.bz2
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
Diffstat (limited to 'tests/auto/qaudioformat')
-rw-r--r--tests/auto/qaudioformat/tst_qaudioformat.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
index 0778a8e..286e63f 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()