Delete obsolete class methods and update related code

Delete obsolete methods from QAudioFormat and QAudioDeviceInfo
and update code that relied on the obsolete methods.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h
index c0313da4a..a003d3115 100644
--- a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h
@@ -71,9 +71,9 @@ public:
         , mPosition(-1)
         , mSerial(0)
     {
-        mFormat.setChannels(1);
+        mFormat.setChannelCount(1);
         mFormat.setSampleSize(8);
-        mFormat.setFrequency(1000);
+        mFormat.setSampleRate(1000);
         mFormat.setCodec("audio/x-raw");
         mFormat.setSampleType(QAudioFormat::UnSignedInt);
     }
@@ -184,7 +184,7 @@ public:
 
     qint64 duration() const
     {
-        return (sizeof(mSerial) * MOCK_DECODER_MAX_BUFFERS * qint64(1000)) / (mFormat.sampleRate() * mFormat.channels());
+        return (sizeof(mSerial) * MOCK_DECODER_MAX_BUFFERS * qint64(1000)) / (mFormat.sampleRate() * mFormat.channelCount());
     }
 
 private slots:
@@ -198,7 +198,7 @@ private slots:
         if (mBuffers.length() < 3) {
             QByteArray b(sizeof(mSerial), 0);
             memcpy(b.data(), &mSerial, sizeof(mSerial));
-            qint64 position = (sizeof(mSerial) * mSerial * qint64(1000000)) / (mFormat.sampleRate() * mFormat.channels());
+            qint64 position = (sizeof(mSerial) * mSerial * qint64(1000000)) / (mFormat.sampleRate() * mFormat.channelCount());
             mSerial++;
             mBuffers.push_back(QAudioBuffer(b, mFormat, position));
             emit bufferReady();