QAudioDeviceInfo: drop Range type, simplify API

Adjust platform implementations accordingly.

Change-Id: I51a74c62d37d681ef3b604ac6742b1f0f489aa74
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 32 insertions, 36 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index ed25fc52a..c982b314b 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -151,18 +151,18 @@ void AudioTest::deviceChanged(int idx)
     m_deviceInfo = deviceBox->itemData(idx).value<QAudioDeviceInfo>();
 
     sampleRateSpinBox->clear();
-    auto sampleRates = m_deviceInfo.supportedSampleRates();
-    sampleRateSpinBox->setMinimum(sampleRates.minimum);
-    sampleRateSpinBox->setMaximum(sampleRates.maximum);
-    int sampleValue = qBound(sampleRates.minimum, 48000, sampleRates.maximum);
+    sampleRateSpinBox->setMinimum(m_deviceInfo.minimumSampleRate());
+    sampleRateSpinBox->setMaximum(m_deviceInfo.maximumSampleRate());
+    int sampleValue = qBound(m_deviceInfo.minimumSampleRate(), 48000,
+                             m_deviceInfo.maximumSampleRate());
     sampleRateSpinBox->setValue(sampleValue);
     m_settings.setSampleRate(sampleValue);
 
     channelsSpinBox->clear();
-    auto channelRates = m_deviceInfo.supportedChannelCounts();
-    channelsSpinBox->setMinimum(channelRates.minimum);
-    channelsSpinBox->setMaximum(channelRates.maximum);
-    int channelValue = qBound(channelRates.minimum, 2, channelRates.maximum);
+    channelsSpinBox->setMinimum(m_deviceInfo.minimumChannelCount());
+    channelsSpinBox->setMaximum(m_deviceInfo.maximumChannelCount());
+    int channelValue = qBound(m_deviceInfo.minimumChannelCount(), 2,
+                              m_deviceInfo.maximumChannelCount());
     channelsSpinBox->setValue(channelValue);
 
     sampleFormatBox->clear();
@@ -185,12 +185,12 @@ void AudioTest::populateTable()
         QTableWidgetItem *sampleTypeItem = new QTableWidgetItem(toString(sampleFormat));
         allFormatsTable->setItem(row, 2, sampleTypeItem);
 
-        auto sampleRates = m_deviceInfo.supportedSampleRates();
-        QTableWidgetItem *sampleRateItem = new QTableWidgetItem(QString("%1 - %2").arg(sampleRates.minimum).arg(sampleRates.maximum));
+        QTableWidgetItem *sampleRateItem = new QTableWidgetItem(QString("%1 - %2")
+            .arg(m_deviceInfo.minimumSampleRate()).arg(m_deviceInfo.maximumSampleRates()));
         allFormatsTable->setItem(row, 0, sampleRateItem);
 
-        auto channels = m_deviceInfo.supportedChannelCounts();
-        QTableWidgetItem *channelsItem = new QTableWidgetItem(QString("%1 - %2").arg(channels.minimum).arg(channels.maximum));
+        QTableWidgetItem *channelsItem = new QTableWidgetItem(QString("%1 - %2")
+            .arg(m_deviceInfo.minimumChannelCount()).arg(m_deviceInfo.maximumChannelCount()));
         allFormatsTable->setItem(row, 1, channelsItem);
 
         ++row;
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 0df27294c..0cbcaa993 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -98,9 +98,10 @@ AudioRecorder::AudioRecorder()
     }
 
     //sample rate
-    auto sampleRates = m_captureSession.audioInput().supportedSampleRates();
-    ui->sampleRateBox->setRange(sampleRates.minimum, sampleRates.maximum);
-    ui->sampleRateBox->setValue(qBound(sampleRates.minimum, 44100, sampleRates.maximum));
+    ui->sampleRateBox->setRange(m_captureSession.audioInput().minimumSampleRate(),
+                                m_captureSession.audioInput().maximumSampleRate());
+    ui->sampleRateBox->setValue(qBound(m_captureSession.audioInput().minimumSampleRate(), 44100,
+                                m_captureSession.audioInput().maximumSampleRate());
 
     //channels
     ui->channelsBox->addItem(tr("Default"), QVariant(-1));
diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp
index d1bfca542..250d8c9a8 100644
--- a/examples/multimedia/devices/main.cpp
+++ b/examples/multimedia/devices/main.cpp
@@ -91,8 +91,6 @@ void printAudioDeviceInfo(QTextStream &out, const QAudioDeviceInfo &deviceInfo)
 {
     const auto isDefault = deviceInfo.isDefault() ? "Yes" : "No";
     const auto preferredFormat = deviceInfo.preferredFormat();
-    const auto ratesRange = deviceInfo.supportedSampleRates();
-    const auto channelsRange = deviceInfo.supportedChannelCounts();
     const auto supportedFormats = deviceInfo.supportedSampleFormats();
     out.setFieldWidth(30);
     out.setFieldAlignment(QTextStream::AlignLeft);
@@ -113,9 +111,11 @@ void printAudioDeviceInfo(QTextStream &out, const QAudioDeviceInfo &deviceInfo)
         out << qSetFieldWidth(0) << formatToString(format) << " ";
     out << Qt::endl;
     out.setFieldWidth(30);
-    out << "Supported Rates: " << qSetFieldWidth(0) << ratesRange.minimum << " - " << ratesRange.maximum << Qt::endl;
+    out << "Supported Rates: " << qSetFieldWidth(0) << deviceInfo.minimumSampleRate() << " - "
+                                                    << deviceInfo.maximumSampleRate() << Qt::endl;
     out.setFieldWidth(30);
-    out << "Supported Channels: " << qSetFieldWidth(0) << channelsRange.minimum << " - " << channelsRange.maximum << Qt::endl;
+    out << "Supported Channels: " << qSetFieldWidth(0) << deviceInfo.minimumChannelCount() << " - "
+                                                       << deviceInfo.maximumChannelCount() << Qt::endl;
 
     out << Qt::endl;
 }
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 42828fa5f..32c3673ec 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -559,24 +559,19 @@ bool Engine::selectFormat()
         }
     } else {
 
-        QAudioDeviceInfo::Range sampleRange = m_audioInputDevice.supportedSampleRates();
-        QAudioDeviceInfo::Range outputSampleRange = m_audioOutputDevice.supportedSampleRates();
-        if (sampleRange.minimum < outputSampleRange.minimum)
-            sampleRange.minimum = outputSampleRange.minimum;
-        if (sampleRange.maximum > outputSampleRange.maximum)
-            sampleRange.maximum = outputSampleRange.maximum;
-
-        QAudioDeviceInfo::Range channelRange = m_audioInputDevice.supportedChannelCounts();
-        QAudioDeviceInfo::Range outputChannelRange = m_audioOutputDevice.supportedChannelCounts();
-        if (channelRange.minimum < outputChannelRange.minimum)
-            channelRange.minimum = outputChannelRange.minimum;
-        if (channelRange.maximum > outputChannelRange.maximum)
-            channelRange.maximum = outputChannelRange.maximum;
+        int minSampleRate = qMin(m_audioInputDevice.minimumSampleRate(),
+                                 m_audioOutputDevice.minimumSampleRate());
+        int maxSampleRate = qMin(m_audioInputDevice.maximumSampleRate(),
+                                 m_audioOutputDevice.maximumSampleRate());
+        int minChannelCount = qMin(m_audioInputDevice.minimumChannelCount(),
+                                   m_audioOutputDevice.minimumChannelCount());
+        int maxChannelCount = qMin(m_audioInputDevice.maximumChannelCount(),
+                                   m_audioOutputDevice.maximumChannelCount());
 
         QAudioFormat format;
         format.setSampleFormat(QAudioFormat::Int16);
-        format.setSampleRate(qBound(sampleRange.minimum, 48000, sampleRange.maximum));
-        format.setChannelCount(qBound(channelRange.minimum, 2, channelRange.maximum));
+        format.setSampleRate(qBound(minSampleRate, 48000, maxSampleRate));
+        format.setChannelCount(qBound(minChannelCount, 2, maxChannelCount));
 
         setFormat(format);
     }
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index 42f8ba65a..b19bd2799 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -77,8 +77,8 @@ VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent)
     }
 
     //sample rate:
-    const auto sampleRates = mediaRecorder->captureSession()->audioInput().supportedSampleRates();
-    ui->audioSampleRateBox->setRange(sampleRates.minimum, sampleRates.maximum);
+    ui->audioSampleRateBox->setRange(mediaRecorder->captureSession()->audioInput().minimumSampleRate(),
+                                     mediaRecorder->captureSession()->audioInput().maximumSampleRate());
 
     //video codecs
     ui->videoCodecBox->addItem(tr("Default video codec"), QVariant::fromValue(QMediaFormat::VideoCodec::Unspecified));