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>

3 files changed, 3 insertions, 37 deletions

diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 976f7bd49..568edf550 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -388,35 +388,6 @@ QList<QAudioFormat::SampleType> QAudioDeviceInfo::supportedSampleTypes() const
     return isNull() ? QList<QAudioFormat::SampleType>() : d->supportedSampleTypes();
 }
 
-/*!
-    Returns the information for the default input audio device.
-    All platform and audio plugin implementations provide a default audio device to use.
-*/
-QAudioDeviceInfo QAudioDeviceInfo::defaultInputDevice()
-{
-    return QMediaPlatformIntegration::instance()->deviceManager()->audioInputs().value(0);
-}
-
-/*!
-    Returns the information for the default output audio device.
-    All platform and audio plugin implementations provide a default audio device to use.
-*/
-QAudioDeviceInfo QAudioDeviceInfo::defaultOutputDevice()
-{
-    return QMediaPlatformIntegration::instance()->deviceManager()->audioOutputs().value(0);
-}
-
-/*!
-    Returns a list of audio devices that support \a mode.
-*/
-QList<QAudioDeviceInfo> QAudioDeviceInfo::availableDevices(QAudio::Mode mode)
-{
-    return mode == QAudio::AudioInput ?
-                QMediaPlatformIntegration::instance()->deviceManager()->audioInputs() :
-                QMediaPlatformIntegration::instance()->deviceManager()->audioOutputs();
-}
-
-
 QAudioDeviceInfo::QAudioDeviceInfo(QAudioDeviceInfoPrivate *p)
     : d(p)
 {}
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h
index ce65ec642..b194d593e 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -87,12 +87,6 @@ public:
     QList<QAudioFormat::Endian> supportedByteOrders() const;
     QList<QAudioFormat::SampleType> supportedSampleTypes() const;
 
-    // ### remove those, -> DeviceManager
-    static QAudioDeviceInfo defaultInputDevice();
-    static QAudioDeviceInfo defaultOutputDevice();
-
-    static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode);
-
     QAudioDeviceInfo(QAudioDeviceInfoPrivate *p);
 
     const QAudioDeviceInfoPrivate *handle() const { return d.get(); }
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index c3531d742..6e24a2288 100644
--- a/src/multimedia/audio/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
@@ -42,6 +42,7 @@
 #include "qsamplecache_p.h"
 #include "qaudiodeviceinfo.h"
 #include "qaudiooutput.h"
+#include "qmediadevicemanager.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -317,8 +318,8 @@ QSoundEffect::~QSoundEffect()
 QStringList QSoundEffect::supportedMimeTypes()
 {
     // Only return supported mime types if we have a audio device available
-    const QList<QAudioDeviceInfo> devices = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
-    if (devices.size() <= 0)
+    const QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs();
+    if (devices.isEmpty())
         return QStringList();
 
     return QStringList() << QLatin1String("audio/x-wav")