Move the list of QMediaDevices to QPlatformMediaIntegration

This makes it possible to split up the backend interfaces for
audio and camera devices handling and simplifies combining
ffmpeg with a platform specific backend for audio.

Pick-to: 6.2
Change-Id: I01992bfbeac79ba2d413a4b918f9f304cf33f35b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/multimedia/windows/qwindowsintegration.cpp b/src/plugins/multimedia/windows/qwindowsintegration.cpp
index 2607e15cb..e380ce0eb 100644
--- a/src/plugins/multimedia/windows/qwindowsintegration.cpp
+++ b/src/plugins/multimedia/windows/qwindowsintegration.cpp
@@ -96,7 +96,7 @@ QWindowsMediaIntegration::~QWindowsMediaIntegration()
 QPlatformMediaDevices *QWindowsMediaIntegration::devices()
 {
     if (!m_devices)
-        m_devices = new QWindowsMediaDevices();
+        m_devices = new QWindowsMediaDevices(this);
     return m_devices;
 }
 
diff --git a/src/plugins/multimedia/windows/qwindowsmediadevices.cpp b/src/plugins/multimedia/windows/qwindowsmediadevices.cpp
index 4a8bd667c..0bbabfd11 100644
--- a/src/plugins/multimedia/windows/qwindowsmediadevices.cpp
+++ b/src/plugins/multimedia/windows/qwindowsmediadevices.cpp
@@ -233,8 +233,8 @@ HWND createMessageOnlyWindow()
     return hwnd;
 }
 
-QWindowsMediaDevices::QWindowsMediaDevices()
-    : QPlatformMediaDevices(),
+QWindowsMediaDevices::QWindowsMediaDevices(QPlatformMediaIntegration *integration)
+    : QPlatformMediaDevices(integration),
       m_videoDeviceMsgWindow(nullptr),
       m_videoDeviceNotification(nullptr)
 
diff --git a/src/plugins/multimedia/windows/qwindowsmediadevices_p.h b/src/plugins/multimedia/windows/qwindowsmediadevices_p.h
index 5547bd073..427a28073 100644
--- a/src/plugins/multimedia/windows/qwindowsmediadevices_p.h
+++ b/src/plugins/multimedia/windows/qwindowsmediadevices_p.h
@@ -70,7 +70,7 @@ LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM);
 class QWindowsMediaDevices : public QPlatformMediaDevices
 {
 public:
-    QWindowsMediaDevices();
+    QWindowsMediaDevices(QPlatformMediaIntegration *integration);
     virtual ~QWindowsMediaDevices();
 
     QList<QAudioDevice> audioInputs() const override;