summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/multimedia/platform/qplatformmediaintegration.cpp2
-rw-r--r--src/multimedia/platform/windows/qwindowsintegration.cpp22
-rw-r--r--src/multimedia/platform/windows/qwindowsintegration_p.h6
3 files changed, 15 insertions, 15 deletions
diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp
index 1ee62bafb..c3b4f1444 100644
--- a/src/multimedia/platform/qplatformmediaintegration.cpp
+++ b/src/multimedia/platform/qplatformmediaintegration.cpp
@@ -58,7 +58,7 @@ using PlatformIntegration = QAlsaIntegration;
using PlatformIntegration = QDarwinIntegration;
#elif QT_CONFIG(wmf)
#include <private/qwindowsintegration_p.h>
-using PlatformIntegration = QWindowsIntegration;
+using PlatformIntegration = QWindowsMediaIntegration;
#elif defined(Q_OS_ANDROID)
#include <private/qandroidintegration_p.h>
using PlatformIntegration = QAndroidIntegration;
diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp
index 8f259beb7..b224a8937 100644
--- a/src/multimedia/platform/windows/qwindowsintegration.cpp
+++ b/src/multimedia/platform/windows/qwindowsintegration.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
static int g_refCount = 0;
-QWindowsIntegration::QWindowsIntegration()
+QWindowsMediaIntegration::QWindowsMediaIntegration()
{
g_refCount++;
if (g_refCount == 1) {
@@ -61,7 +61,7 @@ QWindowsIntegration::QWindowsIntegration()
}
}
-QWindowsIntegration::~QWindowsIntegration()
+QWindowsMediaIntegration::~QWindowsMediaIntegration()
{
delete m_devices;
delete m_formatInfo;
@@ -74,51 +74,51 @@ QWindowsIntegration::~QWindowsIntegration()
}
}
-QPlatformMediaDevices *QWindowsIntegration::devices()
+QPlatformMediaDevices *QWindowsMediaIntegration::devices()
{
if (!m_devices)
m_devices = new QWindowsMediaDevices();
return m_devices;
}
-QPlatformMediaFormatInfo *QWindowsIntegration::formatInfo()
+QPlatformMediaFormatInfo *QWindowsMediaIntegration::formatInfo()
{
if (!m_formatInfo)
m_formatInfo = new QWindowsFormatInfo();
return m_formatInfo;
}
-QPlatformMediaCaptureSession *QWindowsIntegration::createCaptureSession()
+QPlatformMediaCaptureSession *QWindowsMediaIntegration::createCaptureSession()
{
return new QWindowsMediaCaptureService();
}
-QPlatformAudioDecoder *QWindowsIntegration::createAudioDecoder(QAudioDecoder *decoder)
+QPlatformAudioDecoder *QWindowsMediaIntegration::createAudioDecoder(QAudioDecoder *decoder)
{
return new MFAudioDecoderControl(decoder);
}
-QPlatformMediaPlayer *QWindowsIntegration::createPlayer(QMediaPlayer *parent)
+QPlatformMediaPlayer *QWindowsMediaIntegration::createPlayer(QMediaPlayer *parent)
{
return new MFPlayerControl(parent);
}
-QPlatformCamera *QWindowsIntegration::createCamera(QCamera *camera)
+QPlatformCamera *QWindowsMediaIntegration::createCamera(QCamera *camera)
{
return new QWindowsCamera(camera);
}
-QPlatformMediaEncoder *QWindowsIntegration::createEncoder(QMediaRecorder *encoder)
+QPlatformMediaEncoder *QWindowsMediaIntegration::createEncoder(QMediaRecorder *encoder)
{
return new QWindowsMediaEncoder(encoder);
}
-QPlatformImageCapture *QWindowsIntegration::createImageCapture(QImageCapture *imageCapture)
+QPlatformImageCapture *QWindowsMediaIntegration::createImageCapture(QImageCapture *imageCapture)
{
return new QWindowsImageCapture(imageCapture);
}
-QPlatformVideoSink *QWindowsIntegration::createVideoSink(QVideoSink *sink)
+QPlatformVideoSink *QWindowsMediaIntegration::createVideoSink(QVideoSink *sink)
{
return new MFEvrVideoWindowControl(sink);
}
diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h
index 44edf8900..835d502c1 100644
--- a/src/multimedia/platform/windows/qwindowsintegration_p.h
+++ b/src/multimedia/platform/windows/qwindowsintegration_p.h
@@ -58,11 +58,11 @@ QT_BEGIN_NAMESPACE
class QWindowsMediaDevices;
class QWindowsFormatInfo;
-class QWindowsIntegration : public QPlatformMediaIntegration
+class QWindowsMediaIntegration : public QPlatformMediaIntegration
{
public:
- QWindowsIntegration();
- ~QWindowsIntegration();
+ QWindowsMediaIntegration();
+ ~QWindowsMediaIntegration();
void addRefCount();
void releaseRefCount();