diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-11 13:27:51 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-11 13:27:51 (GMT) |
| commit | 7f83a227ddfb22a373065c68e903b49ca590cef6 (patch) | |
| tree | 7063a643d519d91c5e52d4adfa43579e787c3ca5 /tests/auto/qaudioinput/tst_qaudioinput.cpp | |
| parent | bbac0f08d65b54eccadae7629a5eef10da3b3370 (diff) | |
| parent | 22d30bd6c1e8355cb4520885b0d0fef3526cc4e9 (diff) | |
| download | Qt-7f83a227ddfb22a373065c68e903b49ca590cef6.zip Qt-7f83a227ddfb22a373065c68e903b49ca590cef6.tar.gz Qt-7f83a227ddfb22a373065c68e903b49ca590cef6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tests/auto/qaudioinput/tst_qaudioinput.cpp')
| -rw-r--r-- | tests/auto/qaudioinput/tst_qaudioinput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp index 40b7fbb..9468413 100644 --- a/tests/auto/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp @@ -68,8 +68,8 @@ private: void tst_QAudioInput::initTestCase() { - format.setFrequency(8000); - format.setChannels(1); + format.setSampleRate(8000); + format.setChannelCount(1); format.setSampleSize(8); format.setCodec("audio/pcm"); format.setByteOrder(QAudioFormat::LittleEndian); @@ -94,8 +94,8 @@ void tst_QAudioInput::settings() // Confirm the setting we added in the init function. QAudioFormat f = audio->format(); - QVERIFY(format.channels() == f.channels()); - QVERIFY(format.frequency() == f.frequency()); + QVERIFY(format.channelCount() == f.channelCount()); + QVERIFY(format.sampleRate() == f.sampleRate()); QVERIFY(format.sampleSize() == f.sampleSize()); QVERIFY(format.codec() == f.codec()); QVERIFY(format.byteOrder() == f.byteOrder()); |