Rename QMediaDeviceManager to QMediaDevices

Reflect that also in the plugins, where classes are renamed from
e.g. QXXXDeviceManager to QXXXMediaDevices. This is for consistency
with QPlatformMediaDevices, and because QDarwinDevices would be too
generic.

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

12 files changed, 64 insertions, 64 deletions

diff --git a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index 99c9c174e..05fb07d24 100644
--- a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -33,7 +33,7 @@
 
 #include <QStringList>
 #include <QList>
-#include <QMediaDeviceManager>
+#include <QMediaDevices>
 
 //TESTED_COMPONENT=src/multimedia
 
@@ -65,7 +65,7 @@ private:
 void tst_QAudioDeviceInfo::initTestCase()
 {
     // Only perform tests if audio output device exists!
-    QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs();
+    QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
     if (devices.size() == 0) {
         QSKIP("NOTE: no audio output device found, no tests will be performed");
     } else {
@@ -81,18 +81,18 @@ void tst_QAudioDeviceInfo::cleanupTestCase()
 void tst_QAudioDeviceInfo::checkAvailableDefaultInput()
 {
     // Only perform tests if audio input device exists!
-    QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioInputs();
+    QList<QAudioDeviceInfo> devices = QMediaDevices::audioInputs();
     if (devices.size() > 0) {
-        QVERIFY(!QMediaDeviceManager::defaultAudioInput().isNull());
+        QVERIFY(!QMediaDevices::defaultAudioInput().isNull());
     }
 }
 
 void tst_QAudioDeviceInfo::checkAvailableDefaultOutput()
 {
     // Only perform tests if audio input device exists!
-    QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs();
+    QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
     if (devices.size() > 0) {
-        QVERIFY(!QMediaDeviceManager::defaultAudioOutput().isNull());
+        QVERIFY(!QMediaDevices::defaultAudioOutput().isNull());
     }
 }
 
@@ -139,7 +139,7 @@ void tst_QAudioDeviceInfo::assignOperator()
     QVERIFY(dev.id().isNull());
     QVERIFY(dev.isNull() == true);
 
-    QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs();
+    QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
     QVERIFY(devices.size() > 0);
     QAudioDeviceInfo dev1(devices.at(0));
     dev = dev1;
@@ -150,7 +150,7 @@ void tst_QAudioDeviceInfo::assignOperator()
 void tst_QAudioDeviceInfo::id()
 {
     QVERIFY(!device->id().isNull());
-    QVERIFY(device->id() == QMediaDeviceManager::audioOutputs().at(0).id());
+    QVERIFY(device->id() == QMediaDevices::audioOutputs().at(0).id());
 }
 
 // QAudioDeviceInfo's defaultConstructor method
@@ -171,7 +171,7 @@ void tst_QAudioDeviceInfo::equalityOperator()
     QVERIFY(!(dev1 != dev2));
 
     // Make sure each available device is not equal to null
-    const auto infos = QMediaDeviceManager::audioOutputs();
+    const auto infos = QMediaDevices::audioOutputs();
     for (const QAudioDeviceInfo &info : infos) {
         QVERIFY(dev1 != info);
         QVERIFY(!(dev1 == info));
diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
index 8cf42830e..360f60b87 100644
--- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
@@ -36,7 +36,7 @@
 #include <qaudiodeviceinfo.h>
 #include <qaudioformat.h>
 #include <qaudio.h>
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 
 #include <qwavedecoder.h>
 
@@ -131,12 +131,12 @@ QString tst_QAudioInput::formatToFileName(const QAudioFormat &format)
 void tst_QAudioInput::initTestCase()
 {
     // Only perform tests if audio output device exists
-    const QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs();
+    const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
 
     if (devices.size() <= 0)
         QSKIP("No audio backend");
 
-    audioDevice = QMediaDeviceManager::defaultAudioInput();
+    audioDevice = QMediaDevices::defaultAudioInput();
 
 
     QAudioFormat format;
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
index 17ee8a875..87937b454 100644
--- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
@@ -38,7 +38,7 @@
 #include <qaudiodeviceinfo.h>
 #include <qaudioformat.h>
 #include <qaudio.h>
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 #include <qwavedecoder.h>
 
 #define AUDIO_BUFFER 192000
@@ -166,12 +166,12 @@ void tst_QAudioOutput::generate_audiofile_testrows()
 void tst_QAudioOutput::initTestCase()
 {
     // Only perform tests if audio output device exists
-    const QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs();
+    const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
 
     if (devices.size() <= 0)
         QSKIP("No audio backend");
 
-    audioDevice = QMediaDeviceManager::defaultAudioOutput();
+    audioDevice = QMediaDevices::defaultAudioOutput();
 
 
     QAudioFormat format;
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 275617235..ebe375f6c 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -42,7 +42,7 @@
 #include <qcameraimagecapture.h>
 #include <qmediacapturesession.h>
 #include <qobject.h>
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 #include <qmediaencoder.h>
 
 QT_USE_NAMESPACE
@@ -93,11 +93,11 @@ void tst_QCameraBackend::cleanupTestCase()
 
 void tst_QCameraBackend::testCameraInfo()
 {
-    int deviceCount = QMediaDeviceManager::videoInputs().count();
-    const QList<QCameraInfo> cameras = QMediaDeviceManager::videoInputs();
+    int deviceCount = QMediaDevices::videoInputs().count();
+    const QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
     QCOMPARE(cameras.count(), deviceCount);
     if (cameras.isEmpty()) {
-        QVERIFY(QMediaDeviceManager::defaultVideoInput().isNull());
+        QVERIFY(QMediaDevices::defaultVideoInput().isNull());
         QSKIP("Camera selection is not supported");
     }
 
@@ -109,17 +109,17 @@ void tst_QCameraBackend::testCameraInfo()
 
 void tst_QCameraBackend::testCtorWithCameraInfo()
 {
-    if (QMediaDeviceManager::videoInputs().isEmpty())
+    if (QMediaDevices::videoInputs().isEmpty())
         QSKIP("Camera selection not supported");
 
     {
-        QCameraInfo info = QMediaDeviceManager::defaultVideoInput();
+        QCameraInfo info = QMediaDevices::defaultVideoInput();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), info);
     }
     {
-        QCameraInfo info = QMediaDeviceManager::videoInputs().first();
+        QCameraInfo info = QMediaDevices::videoInputs().first();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), info);
@@ -188,8 +188,8 @@ void tst_QCameraBackend::testCameraStartError()
 {
     QMediaCaptureSession session1;
     QMediaCaptureSession session2;
-    QCamera camera1(QMediaDeviceManager::defaultVideoInput());
-    QCamera camera2(QMediaDeviceManager::defaultVideoInput());
+    QCamera camera1(QMediaDevices::defaultVideoInput());
+    QCamera camera2(QMediaDevices::defaultVideoInput());
     session1.setCamera(&camera1);
     session2.setCamera(&camera2);
     QSignalSpy errorSpy1(&camera1, &QCamera::errorOccurred);
@@ -394,7 +394,7 @@ void tst_QCameraBackend::testVideoRecording_data()
 {
     QTest::addColumn<QCameraInfo>("device");
 
-    const auto devices = QMediaDeviceManager::videoInputs();
+    const auto devices = QMediaDevices::videoInputs();
 
     for (const auto &device : devices) {
         QTest::newRow(device.description().toUtf8())
diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
index f48a2d29b..f98693522 100644
--- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
+++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
@@ -34,7 +34,7 @@
 #include <qaudiodeviceinfo.h>
 #include <qaudio.h>
 #include "qsoundeffect.h"
-#include "qmediadevicemanager.h"
+#include "qmediadevices.h"
 
 class tst_QSoundEffect : public QObject
 {
@@ -394,7 +394,7 @@ void tst_QSoundEffect::testSupportedMimeTypes_data()
     // Verify also passing of audio device info as parameter
     QTest::addColumn<QSoundEffect*>("instance");
     QTest::newRow("without QAudioDeviceInfo") << sound;
-    QAudioDeviceInfo deviceInfo(QMediaDeviceManager::defaultAudioOutput());
+    QAudioDeviceInfo deviceInfo(QMediaDevices::defaultAudioOutput());
     QTest::newRow("with QAudioDeviceInfo")    << new QSoundEffect(deviceInfo, this);
 }
 
diff --git a/tests/auto/unit/mockbackend/CMakeLists.txt b/tests/auto/unit/mockbackend/CMakeLists.txt
index 9824fafcc..5bddb393b 100644
--- a/tests/auto/unit/mockbackend/CMakeLists.txt
+++ b/tests/auto/unit/mockbackend/CMakeLists.txt
@@ -23,8 +23,8 @@ target_sources(QtMultimediaMockBackend INTERFACE
     qmockmediaencoder.h
     qmockmediacapturesession.h
     qmockvideosink.h
-    qmockdevicemanager.cpp
-    qmockdevicemanager_p.h
+    qmockmediadevices.cpp
+    qmockmediadevices_p.h
     qmockintegration.cpp
     qmockintegration_p.h
 )
diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp
index 5468b10b6..698ecfed9 100644
--- a/tests/auto/unit/mockbackend/qmockintegration.cpp
+++ b/tests/auto/unit/mockbackend/qmockintegration.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qmockintegration_p.h"
-#include "qmockdevicemanager_p.h"
+#include "qmockmediadevices_p.h"
 #include "qmockmediaplayer.h"
 #include "qmockaudiodecoder.h"
 #include "qmockcamera.h"
@@ -56,14 +56,14 @@ QMockIntegration::QMockIntegration()
 QMockIntegration::~QMockIntegration()
 {
     setIntegration(nullptr);
-    delete m_manager;
+    delete m_devices;
 }
 
-QPlatformMediaDeviceManager *QMockIntegration::deviceManager()
+QPlatformMediaDevices *QMockIntegration::devices()
 {
-    if (!m_manager)
-        m_manager = new QMockDeviceManager();
-    return m_manager;
+    if (!m_devices)
+        m_devices = new QMockMediaDevices();
+    return m_devices;
 }
 
 QPlatformAudioDecoder *QMockIntegration::createAudioDecoder()
diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h
index feef106b1..11ca8eccc 100644
--- a/tests/auto/unit/mockbackend/qmockintegration_p.h
+++ b/tests/auto/unit/mockbackend/qmockintegration_p.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QMockDeviceManager;
+class QMockMediaDevices;
 class QMockMediaPlayer;
 class QMockAudioDecoder;
 class QMockCamera;
@@ -68,7 +68,7 @@ public:
     QMockIntegration();
     ~QMockIntegration();
 
-    QPlatformMediaDeviceManager *deviceManager() override;
+    QPlatformMediaDevices *devices() override;
     QPlatformMediaFormatInfo *formatInfo() override { return nullptr; }
 
     QPlatformAudioDecoder *createAudioDecoder() override;
@@ -98,7 +98,7 @@ public:
 
 private:
     Flags m_flags = {};
-    QMockDeviceManager *m_manager = nullptr;
+    QMockMediaDevices *m_devices = nullptr;
     QMockMediaPlayer *m_lastPlayer = nullptr;
     QMockAudioDecoder *m_lastAudioDecoderControl = nullptr;
     QMockCamera *m_lastCamera = nullptr;
diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp b/tests/auto/unit/mockbackend/qmockmediadevices.cpp
index a5ef956c8..72242ce01 100644
--- a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp
+++ b/tests/auto/unit/mockbackend/qmockmediadevices.cpp
@@ -37,13 +37,13 @@
 **
 ****************************************************************************/
 
-#include "qmockdevicemanager_p.h"
+#include "qmockmediadevices_p.h"
 #include "private/qcamerainfo_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QMockDeviceManager::QMockDeviceManager()
-    : QPlatformMediaDeviceManager()
+QMockMediaDevices::QMockMediaDevices()
+    : QPlatformMediaDevices()
 {
     QCameraInfoPrivate *info = new QCameraInfoPrivate;
     info->description = QString::fromUtf8("defaultCamera");
@@ -65,30 +65,30 @@ QMockDeviceManager::QMockDeviceManager()
 
 }
 
-QMockDeviceManager::~QMockDeviceManager() = default;
+QMockMediaDevices::~QMockMediaDevices() = default;
 
-QList<QAudioDeviceInfo> QMockDeviceManager::audioInputs() const
+QList<QAudioDeviceInfo> QMockMediaDevices::audioInputs() const
 {
     return m_inputDevices;
 }
 
-QList<QAudioDeviceInfo> QMockDeviceManager::audioOutputs() const
+QList<QAudioDeviceInfo> QMockMediaDevices::audioOutputs() const
 {
     return m_outputDevices;
 }
 
-QList<QCameraInfo> QMockDeviceManager::videoInputs() const
+QList<QCameraInfo> QMockMediaDevices::videoInputs() const
 {
     return m_cameraDevices;
 }
 
-QAbstractAudioInput *QMockDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &info)
+QAbstractAudioInput *QMockMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &info)
 {
     Q_UNUSED(info);
     return nullptr;// ###
 }
 
-QAbstractAudioOutput *QMockDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &info)
+QAbstractAudioOutput *QMockMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &info)
 {
     Q_UNUSED(info);
     return nullptr; //###
diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h b/tests/auto/unit/mockbackend/qmockmediadevices_p.h
index 100fe610f..30afa2276 100644
--- a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h
+++ b/tests/auto/unit/mockbackend/qmockmediadevices_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMOCKDEVICEMANAGER_H
-#define QMOCKDEVICEMANAGER_H
+#ifndef QMOCKMEDIADEVICES_H
+#define QMOCKMEDIADEVICES_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <private/qplatformmediadevicemanager_p.h>
+#include <private/qplatformmediadevices_p.h>
 #include <qelapsedtimer.h>
 #include <qaudiodeviceinfo.h>
 #include <qcamerainfo.h>
@@ -62,11 +62,11 @@ Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession);
 
 class QCameraInfo;
 
-class QMockDeviceManager : public QPlatformMediaDeviceManager
+class QMockMediaDevices : public QPlatformMediaDevices
 {
 public:
-    QMockDeviceManager();
-    ~QMockDeviceManager();
+    QMockMediaDevices();
+    ~QMockMediaDevices();
 
     QList<QAudioDeviceInfo> audioInputs() const override;
     QList<QAudioDeviceInfo> audioOutputs() const override;
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index b4e159540..08cb621bc 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -42,7 +42,7 @@
 #include <qcameraimagecapture.h>
 #include <qmediacapturesession.h>
 #include <qobject.h>
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 
 #include "qmockintegration_p.h"
 #include "qmockmediacapturesession.h"
@@ -690,8 +690,8 @@ void tst_QCamera::testCameraControl()
 
 void tst_QCamera::testConstructor()
 {
-    auto cameras = QMediaDeviceManager::videoInputs();
-    QCameraInfo defaultCamera = QMediaDeviceManager::defaultVideoInput();
+    auto cameras = QMediaDevices::videoInputs();
+    QCameraInfo defaultCamera = QMediaDevices::defaultVideoInput();
     QCameraInfo frontCamera, backCamera;
     for (const auto &c : cameras) {
         if (frontCamera.isNull() && c.position() == QCameraInfo::FrontFace)
@@ -718,14 +718,14 @@ void tst_QCamera::testConstructor()
     }
 
     {
-        QCamera camera(QMediaDeviceManager::defaultVideoInput());
+        QCamera camera(QMediaDevices::defaultVideoInput());
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), defaultCamera);
     }
 
     {
-        QCameraInfo cameraInfo = QMediaDeviceManager::videoInputs().at(0);
+        QCameraInfo cameraInfo = QMediaDevices::videoInputs().at(0);
         QCamera camera(cameraInfo);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
diff --git a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
index 673607c88..5582c82dc 100644
--- a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
+++ b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
@@ -31,7 +31,7 @@
 
 #include <qcamera.h>
 #include <qcamerainfo.h>
-#include <qmediadevicemanager.h>
+#include <qmediadevices.h>
 
 #include "qmockintegration_p.h"
 #include "qmockmediacapturesession.h"
@@ -81,7 +81,7 @@ void tst_QCameraInfo::constructor()
         QCOMPARE(info.position(), QCameraInfo::UnspecifiedPosition);
     }
 
-    auto cameras = QMediaDeviceManager::videoInputs();
+    auto cameras = QMediaDevices::videoInputs();
     QCameraInfo info;
     for (const auto &c : cameras) {
         if (c.position() == QCameraInfo::BackFace)
@@ -105,7 +105,7 @@ void tst_QCameraInfo::constructor()
 
 void tst_QCameraInfo::defaultCamera()
 {
-    QCameraInfo info = QMediaDeviceManager::defaultVideoInput();
+    QCameraInfo info = QMediaDevices::defaultVideoInput();
 
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("default"));
@@ -118,7 +118,7 @@ void tst_QCameraInfo::defaultCamera()
 
 void tst_QCameraInfo::availableCameras()
 {
-    QList<QCameraInfo> cameras = QMediaDeviceManager::videoInputs();
+    QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
     QCOMPARE(cameras.count(), 3);
 
     QCameraInfo info = cameras.at(0);
@@ -143,8 +143,8 @@ void tst_QCameraInfo::availableCameras()
 
 void tst_QCameraInfo::equality_operators()
 {
-    QCameraInfo defaultCamera = QMediaDeviceManager::defaultVideoInput();
-    QList<QCameraInfo> cameras = QMediaDeviceManager::videoInputs();
+    QCameraInfo defaultCamera = QMediaDevices::defaultVideoInput();
+    QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
 
     QVERIFY(defaultCamera == cameras.at(0));
     QVERIFY(defaultCamera != cameras.at(1));