Remove the static methods from QAudioDeviceInfo

QMediaDeviceManager now has the information.

Change-Id: Iadba41d14c2a8d02d3e8eb3024e30a525ea0e14c
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

7 files changed, 23 insertions, 14 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index a7d8ea467..3ae05f69f 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -152,7 +152,9 @@ void AudioTest::modeChanged(int idx)
     testResult->clear();
     deviceBox->clear();
     const QAudio::Mode mode = idx == 0 ? QAudio::AudioInput : QAudio::AudioOutput;
-    for (auto &deviceInfo: QAudioDeviceInfo::availableDevices(mode))
+    auto *deviceManager = QMediaDeviceManager::instance();
+    const auto devices = mode == QAudio::AudioInput ? deviceManager->audioInputs() : deviceManager->audioOutputs();
+    for (auto &deviceInfo: devices)
         deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
 
     deviceBox->setCurrentIndex(0);
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index ac949f4e9..76194ff86 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -223,9 +223,10 @@ void RenderArea::setLevel(qreal value)
 
 
 InputTest::InputTest()
+    : m_deviceManager(QMediaDeviceManager::instance())
 {
     initializeWindow();
-    initializeAudio(QAudioDeviceInfo::defaultInputDevice());
+    initializeAudio(m_deviceManager->defaultAudioInput());
 }
 
 
@@ -238,9 +239,9 @@ void InputTest::initializeWindow()
     layout->addWidget(m_canvas);
 
     m_deviceBox = new QComboBox(this);
-    const QAudioDeviceInfo &defaultDeviceInfo = QAudioDeviceInfo::defaultInputDevice();
+    const QAudioDeviceInfo &defaultDeviceInfo = m_deviceManager->defaultAudioInput();
     m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
-    for (auto &deviceInfo: QAudioDeviceInfo::availableDevices(QAudio::AudioInput)) {
+    for (auto &deviceInfo: m_deviceManager->audioInputs()) {
         if (deviceInfo != defaultDeviceInfo)
             m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
     }
diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h
index 33ddd51af..7bfe3ea24 100644
--- a/examples/multimedia/audioinput/audioinput.h
+++ b/examples/multimedia/audioinput/audioinput.h
@@ -61,6 +61,7 @@
 #include <QSlider>
 #include <QWidget>
 #include <QScopedPointer>
+#include <QMediaDeviceManager>
 
 class AudioInfo : public QIODevice
 {
@@ -130,6 +131,7 @@ private:
     QComboBox *m_deviceBox = nullptr;
     QSlider *m_volumeSlider = nullptr;
 
+    QMediaDeviceManager *m_deviceManager = nullptr;
     QScopedPointer<AudioInfo> m_audioInfo;
     QScopedPointer<QAudioInput> m_audioInput;
     bool m_pullMode = true;
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index e9e30575c..d4fa0b9f2 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -149,10 +149,11 @@ qint64 Generator::bytesAvailable() const
 }
 
 AudioTest::AudioTest()
-    : m_pushTimer(new QTimer(this))
+    : m_deviceManager(QMediaDeviceManager::instance()),
+      m_pushTimer(new QTimer(this))
 {
     initializeWindow();
-    initializeAudio(QAudioDeviceInfo::defaultOutputDevice());
+    initializeAudio(m_deviceManager->defaultAudioOutput());
 }
 
 AudioTest::~AudioTest()
@@ -166,9 +167,9 @@ void AudioTest::initializeWindow()
     QVBoxLayout *layout = new QVBoxLayout;
 
     m_deviceBox = new QComboBox(this);
-    const QAudioDeviceInfo &defaultDeviceInfo = QAudioDeviceInfo::defaultOutputDevice();
+    const QAudioDeviceInfo &defaultDeviceInfo = m_deviceManager->defaultAudioOutput();
     m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
-    for (auto &deviceInfo: QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) {
+    for (auto &deviceInfo: m_deviceManager->audioOutputs()) {
         if (deviceInfo != defaultDeviceInfo)
             m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
     }
diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
index fc288481e..becd5ebfd 100644
--- a/examples/multimedia/audiooutput/audiooutput.h
+++ b/examples/multimedia/audiooutput/audiooutput.h
@@ -64,6 +64,7 @@
 #include <QSlider>
 #include <QTimer>
 #include <QScopedPointer>
+#include <QMediaDeviceManager>
 
 class Generator : public QIODevice
 {
@@ -101,6 +102,7 @@ private:
     void initializeAudio(const QAudioDeviceInfo &deviceInfo);
 
 private:
+    QMediaDeviceManager *m_deviceManager = nullptr;
     QTimer *m_pushTimer = nullptr;
 
     // Owned by layout
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 648b1e624..06ed21ad8 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -81,18 +81,17 @@ Engine::Engine(QObject *parent)
     :   QObject(parent)
     ,   m_mode(QAudio::AudioInput)
     ,   m_state(QAudio::StoppedState)
+    ,   m_deviceManager(QMediaDeviceManager::instance())
     ,   m_generateTone(false)
     ,   m_file(nullptr)
     ,   m_analysisFile(nullptr)
-    ,   m_availableAudioInputDevices
-            (QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
-    ,   m_audioInputDevice(QAudioDeviceInfo::defaultInputDevice())
+    ,   m_availableAudioInputDevices(m_deviceManager->audioInputs())
+    ,   m_audioInputDevice(m_deviceManager->defaultAudioInput())
     ,   m_audioInput(nullptr)
     ,   m_audioInputIODevice(nullptr)
     ,   m_recordPosition(0)
-    ,   m_availableAudioOutputDevices
-            (QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
-    ,   m_audioOutputDevice(QAudioDeviceInfo::defaultOutputDevice())
+    ,   m_availableAudioOutputDevices(m_deviceManager->audioOutputs())
+    ,   m_audioOutputDevice(m_deviceManager->defaultAudioOutput())
     ,   m_audioOutput(nullptr)
     ,   m_playPosition(0)
     ,   m_bufferPosition(0)
diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index 714af4d9d..ee3c3cb13 100644
--- a/examples/multimedia/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
@@ -62,6 +62,7 @@
 #include <QDir>
 #include <QList>
 #include <QObject>
+#include <QMediaDeviceManager>
 
 #ifdef DUMP_CAPTURED_AUDIO
 #define DUMP_DATA
@@ -277,6 +278,7 @@ private:
 private:
     QAudio::Mode        m_mode;
     QAudio::State       m_state;
+    QMediaDeviceManager *m_deviceManager;
 
     bool                m_generateTone;
     SweptTone           m_tone;