diff options
Diffstat (limited to 'tests/auto/qaudioformat')
| -rw-r--r-- | tests/auto/qaudioformat/tst_qaudioformat.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp index b36af03..0206798 100644 --- a/tests/auto/qaudioformat/tst_qaudioformat.cpp +++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp @@ -78,11 +78,7 @@ void tst_QAudioFormat::checkNull() QVERIFY(!audioFormat1.isValid()); audioFormat0.setFrequency(44100); -<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat0.setChannels(2); -======= - audioFormat0.setChannelCount(2); ->>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat0.setSampleSize(16); audioFormat0.setCodec("audio/pcm"); audioFormat0.setSampleType(QAudioFormat::SignedInt); @@ -99,11 +95,7 @@ void tst_QAudioFormat::checkFrequency() void tst_QAudioFormat::checkChannels() { QAudioFormat audioFormat; -<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat.setChannels(2); -======= - audioFormat.setChannelCount(2); ->>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp QVERIFY(audioFormat.channels() == 2); } @@ -146,22 +138,14 @@ void tst_QAudioFormat::checkEquality() // on filled formats audioFormat0.setFrequency(8000); -<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat0.setChannels(1); -======= - audioFormat0.setChannelCount(1); ->>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat0.setSampleSize(8); audioFormat0.setCodec("audio/pcm"); audioFormat0.setByteOrder(QAudioFormat::LittleEndian); audioFormat0.setSampleType(QAudioFormat::UnSignedInt); audioFormat1.setFrequency(8000); -<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat1.setChannels(1); -======= - audioFormat1.setChannelCount(1); ->>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat1.setSampleSize(8); audioFormat1.setCodec("audio/pcm"); audioFormat1.setByteOrder(QAudioFormat::LittleEndian); @@ -181,11 +165,7 @@ void tst_QAudioFormat::checkAssignment() QAudioFormat audioFormat1; audioFormat0.setFrequency(8000); -<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat0.setChannels(1); -======= - audioFormat0.setChannelCount(1); ->>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp audioFormat0.setSampleSize(8); audioFormat0.setCodec("audio/pcm"); audioFormat0.setByteOrder(QAudioFormat::LittleEndian); |