diff options
67 files changed, 211 insertions, 211 deletions
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp index 21c594e72..efd213e20 100644 --- a/src/imports/multimedia/qdeclarativetorch.cpp +++ b/src/imports/multimedia/qdeclarativetorch.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include <QDebug> -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediacapture_p.h> #include <qcameracontrol.h> #include "qdeclarativetorch_p.h" diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 25cde55ab..1aa8e5fae 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -40,10 +40,10 @@ qt_internal_add_module(Multimedia controls/qmediastreamscontrol.cpp controls/qmediastreamscontrol.h controls/qvideorenderercontrol.cpp controls/qvideorenderercontrol.h controls/qvideowindowcontrol.cpp controls/qvideowindowcontrol.h - platform/qmediaplatformcaptureinterface.cpp platform/qmediaplatformcaptureinterface_p.h - platform/qmediaplatformdevicemanager.cpp platform/qmediaplatformdevicemanager_p.h - platform/qmediaplatformintegration.cpp platform/qmediaplatformintegration_p.h - platform/qmediaplatformformatinfo.cpp platform/qmediaplatformformatinfo_p.h + platform/qplatformmediacapture.cpp platform/qplatformmediacapture_p.h + platform/qplatformmediadevicemanager.cpp platform/qplatformmediadevicemanager_p.h + platform/qplatformmediaformatinfo.cpp platform/qplatformmediaformatinfo_p.h + platform/qplatformmediaintegration.cpp platform/qplatformmediaintegration_p.h platform/qplatformmediaplayer.cpp platform/qplatformmediaplayer_p.h playback/qmediaplayer.cpp playback/qmediaplayer.h playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp index 33419b85b..7f228bada 100644 --- a/src/multimedia/audio/qaudiodecoder.cpp +++ b/src/multimedia/audio/qaudiodecoder.cpp @@ -42,7 +42,7 @@ #include "qaudiodecodercontrol.h" -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> #include <private/qobject_p.h> #include <QtCore/qcoreevent.h> @@ -121,7 +121,7 @@ QAudioDecoder::QAudioDecoder(QObject *parent) { Q_D(QAudioDecoder); - d->control = QMediaPlatformIntegration::instance()->createAudioDecoder(); + d->control = QPlatformMediaIntegration::instance()->createAudioDecoder(); if (d->control != nullptr) { connect(d->control, SIGNAL(stateChanged(QAudioDecoder::State)), SLOT(_q_stateChanged(QAudioDecoder::State))); connect(d->control, SIGNAL(error(int,QString)), SLOT(_q_error(int,QString))); diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index f034d732e..e64d27efc 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -39,8 +39,8 @@ #include "qaudiosystem_p.h" #include "qaudiodeviceinfo_p.h" -#include <private/qmediaplatformdevicemanager_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediaintegration_p.h> #include <QtCore/qmap.h> diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index 5ffdf1073..c36092495 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -43,8 +43,8 @@ #include "qaudiosystem_p.h" #include "qaudioinput.h" -#include <private/qmediaplatformdevicemanager_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -132,7 +132,7 @@ QAudioInput::QAudioInput(const QAudioFormat &format, QObject *parent) QAudioInput::QAudioInput(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent): QObject(parent) { - d = QMediaPlatformIntegration::instance()->deviceManager()->audioInputDevice(format, audioDevice); + d = QPlatformMediaIntegration::instance()->deviceManager()->audioInputDevice(format, audioDevice); if (d) { connect(d, SIGNAL(notify()), SIGNAL(notify())); connect(d, SIGNAL(stateChanged(QAudio::State)), SIGNAL(stateChanged(QAudio::State))); diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp index 0042921cb..bf6d5e0e0 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.cpp @@ -43,8 +43,8 @@ #include "qaudiosystem_p.h" #include "qaudiooutput.h" -#include <private/qmediaplatformdevicemanager_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -131,7 +131,7 @@ QAudioOutput::QAudioOutput(const QAudioFormat &format, QObject *parent) QAudioOutput::QAudioOutput(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent): QObject(parent) { - d = QMediaPlatformIntegration::instance()->deviceManager()->audioOutputDevice(format, audioDevice); + d = QPlatformMediaIntegration::instance()->deviceManager()->audioOutputDevice(format, audioDevice); if (d) { connect(d, SIGNAL(notify()), SIGNAL(notify())); connect(d, SIGNAL(stateChanged(QAudio::State)), SIGNAL(stateChanged(QAudio::State))); diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 665668474..ee4686f28 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -47,8 +47,8 @@ #include <qcameraimageprocessingcontrol.h> #include <qcameraimagecapturecontrol.h> #include <qvideorenderercontrol.h> -#include <private/qmediaplatformintegration_p.h> -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediaintegration_p.h> +#include <private/qplatformmediacapture_p.h> #include <qmediadevicemanager.h> #include <QDebug> @@ -153,7 +153,7 @@ void QCameraPrivate::initControls() { Q_Q(QCamera); - captureInterface = QMediaPlatformIntegration::instance()->createCaptureInterface(QMediaRecorder::AudioAndVideo); + captureInterface = QPlatformMediaIntegration::instance()->createCaptureInterface(QMediaRecorder::AudioAndVideo); if (captureInterface) { control = captureInterface->cameraControl(); @@ -336,7 +336,7 @@ QString QCamera::errorString() const /*! \internal */ -QMediaPlatformCaptureInterface *QCamera::captureInterface() const +QPlatformMediaCapture *QCamera::captureInterface() const { return d_func()->captureInterface; } diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 44afdbd03..bf37db9be 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE class QAbstractVideoSurface; class QCameraInfo; -class QMediaPlatformCaptureInterface; +class QPlatformMediaCapture; class QCameraPrivate; class Q_MULTIMEDIA_EXPORT QCamera : public QObject @@ -121,7 +121,7 @@ public: Error error() const; QString errorString() const; - QMediaPlatformCaptureInterface *captureInterface() const; + QPlatformMediaCapture *captureInterface() const; public Q_SLOTS: void load(); void unload(); diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h index ec61a002b..272f39cd2 100644 --- a/src/multimedia/camera/qcamera_p.h +++ b/src/multimedia/camera/qcamera_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QCameraControl; -class QMediaPlatformCaptureInterface; +class QPlatformMediaCapture; class QCameraPrivate : public QObjectPrivate { @@ -78,7 +78,7 @@ public: void clear(); - QMediaPlatformCaptureInterface *captureInterface = nullptr; + QPlatformMediaCapture *captureInterface = nullptr; QCameraControl *control = nullptr; QCameraExposure *cameraExposure = nullptr; diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index af670ae0b..369f207f0 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -40,7 +40,7 @@ #include <qcameraimagecapturecontrol.h> #include <qmediaencodersettings.h> #include <qmediametadata.h> -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediacapture_p.h> #include "private/qobject_p.h" #include <qcamera.h> @@ -137,7 +137,7 @@ QCameraImageCapture::QCameraImageCapture(QCamera *camera) d->q_ptr = this; d->camera = camera; - QMediaPlatformCaptureInterface *service = camera->captureInterface(); + QPlatformMediaCapture *service = camera->captureInterface(); if (service) { d->control = service->imageCaptureControl(); diff --git a/src/multimedia/platform/alsa/qalsadevicemanager.cpp b/src/multimedia/platform/alsa/qalsadevicemanager.cpp index 24662980f..cf18bf0c4 100644 --- a/src/multimedia/platform/alsa/qalsadevicemanager.cpp +++ b/src/multimedia/platform/alsa/qalsadevicemanager.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QAlsaDeviceManager::QAlsaDeviceManager() - : QMediaPlatformDeviceManager() + : QPlatformMediaDeviceManager() { } diff --git a/src/multimedia/platform/alsa/qalsadevicemanager_p.h b/src/multimedia/platform/alsa/qalsadevicemanager_p.h index 26cd1192c..aedb186bf 100644 --- a/src/multimedia/platform/alsa/qalsadevicemanager_p.h +++ b/src/multimedia/platform/alsa/qalsadevicemanager_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qset.h> #include <qaudio.h> @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QAlsaEngine; -class QAlsaDeviceManager : public QMediaPlatformDeviceManager +class QAlsaDeviceManager : public QPlatformMediaDeviceManager { public: QAlsaDeviceManager(); diff --git a/src/multimedia/platform/alsa/qalsaintegration.cpp b/src/multimedia/platform/alsa/qalsaintegration.cpp index d7c7a9fc6..5c5cb598b 100644 --- a/src/multimedia/platform/alsa/qalsaintegration.cpp +++ b/src/multimedia/platform/alsa/qalsaintegration.cpp @@ -51,7 +51,7 @@ QAlsaIntegration::~QAlsaIntegration() delete m_manager; } -QMediaPlatformDeviceManager *QAlsaIntegration::deviceManager() +QPlatformMediaDeviceManager *QAlsaIntegration::deviceManager() { if (!m_manager) m_manager = new QAlsaDeviceManager(); diff --git a/src/multimedia/platform/alsa/qalsaintegration_p.h b/src/multimedia/platform/alsa/qalsaintegration_p.h index c50676cfb..31789e852 100644 --- a/src/multimedia/platform/alsa/qalsaintegration_p.h +++ b/src/multimedia/platform/alsa/qalsaintegration_p.h @@ -51,19 +51,19 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE class QAlsaDeviceManager; -class QAlsaIntegration : public QMediaPlatformIntegration +class QAlsaIntegration : public QPlatformMediaIntegration { public: QAlsaIntegration(); ~QAlsaIntegration(); - QMediaPlatformDeviceManager *deviceManager() override; + QPlatformMediaDeviceManager *deviceManager() override; QAlsaDeviceManager *m_manager = nullptr; }; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h index 998015d35..709018a08 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h @@ -52,8 +52,8 @@ // We mean it. // -#include <private/qmediaplatformcaptureinterface_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediacapture_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -63,7 +63,7 @@ class QAndroidCameraControl; class QAndroidCameraSession; class QAndroidCameraImageCaptureControl; -class QAndroidCaptureService : public QMediaPlatformCaptureInterface +class QAndroidCaptureService : public QPlatformMediaCapture { Q_OBJECT diff --git a/src/multimedia/platform/android/qandroiddevicemanager.cpp b/src/multimedia/platform/android/qandroiddevicemanager.cpp index 7e313c152..9c40be93f 100644 --- a/src/multimedia/platform/android/qandroiddevicemanager.cpp +++ b/src/multimedia/platform/android/qandroiddevicemanager.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QAndroidDeviceManager::QAndroidDeviceManager() - : QMediaPlatformDeviceManager() + : QPlatformMediaDeviceManager() { } diff --git a/src/multimedia/platform/android/qandroiddevicemanager_p.h b/src/multimedia/platform/android/qandroiddevicemanager_p.h index 3c82286da..76499994e 100644 --- a/src/multimedia/platform/android/qandroiddevicemanager_p.h +++ b/src/multimedia/platform/android/qandroiddevicemanager_p.h @@ -51,12 +51,12 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qaudio.h> QT_BEGIN_NAMESPACE -class QAndroidDeviceManager : public QMediaPlatformDeviceManager +class QAndroidDeviceManager : public QPlatformMediaDeviceManager { public: QAndroidDeviceManager(); diff --git a/src/multimedia/platform/android/qandroidformatsinfo_p.h b/src/multimedia/platform/android/qandroidformatsinfo_p.h index 461400ed2..8810bb863 100644 --- a/src/multimedia/platform/android/qandroidformatsinfo_p.h +++ b/src/multimedia/platform/android/qandroidformatsinfo_p.h @@ -51,11 +51,11 @@ // We mean it. // -#include <private/qmediaplatformformatinfo_p.h> +#include <private/qplatformmediaformatinfo_p.h> QT_BEGIN_NAMESPACE -class QAndroidFormatInfo : public QMediaPlatformFormatInfo +class QAndroidFormatInfo : public QPlatformMediaFormatInfo { public: QAndroidFormatInfo(); diff --git a/src/multimedia/platform/android/qandroidintegration.cpp b/src/multimedia/platform/android/qandroidintegration.cpp index c173bf94e..d744ff952 100644 --- a/src/multimedia/platform/android/qandroidintegration.cpp +++ b/src/multimedia/platform/android/qandroidintegration.cpp @@ -65,14 +65,14 @@ QAndroidIntegration::~QAndroidIntegration() delete m_formatInfo; } -QMediaPlatformDeviceManager *QAndroidIntegration::deviceManager() +QPlatformMediaDeviceManager *QAndroidIntegration::deviceManager() { if (!m_manager) m_manager = new QAndroidDeviceManager(); return m_manager; } -QMediaPlatformFormatInfo *QAndroidIntegration::formatInfo() +QPlatformMediaFormatInfo *QAndroidIntegration::formatInfo() { if (!m_formatInfo) m_formatInfo = new QAndroidFormatInfo(); @@ -80,7 +80,7 @@ QMediaPlatformFormatInfo *QAndroidIntegration::formatInfo() } -QMediaPlatformCaptureInterface *QAndroidIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) +QPlatformMediaCaptureInterface *QAndroidIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) { return new QAndroidCaptureService(mode); } diff --git a/src/multimedia/platform/android/qandroidintegration_p.h b/src/multimedia/platform/android/qandroidintegration_p.h index f123992b4..b9407f962 100644 --- a/src/multimedia/platform/android/qandroidintegration_p.h +++ b/src/multimedia/platform/android/qandroidintegration_p.h @@ -51,26 +51,26 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE class QAndroidDeviceManager; -class QAndroidIntegration : public QMediaPlatformIntegration +class QAndroidIntegration : public QPlatformMediaIntegration { public: QAndroidIntegration(); ~QAndroidIntegration(); - QMediaPlatformDeviceManager *deviceManager() override; - QMediaPlatformFormatInfo *formatInfo() override; + QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaFormatInfo *formatInfo() override; - QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; + QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; QPlatformMediaPlayer *createPlayer() override; QAndroidDeviceManager *m_manager = nullptr; - QMediaPlatformFormatInfo *m_formatInfo = nullptr; + QPlatformMediaFormatInfo *m_formatInfo = nullptr; }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h index 0cc31bc88..106319207 100644 --- a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h +++ b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h @@ -53,7 +53,7 @@ #include <QtCore/qobject.h> #include <QtCore/qset.h> -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediacapture_p.h> QT_BEGIN_NAMESPACE @@ -67,7 +67,7 @@ class AVFCameraExposureControl; class AVFMediaRecorderControl; class AVFMediaRecorderControlIOS; -class AVFCameraService : public QMediaPlatformCaptureInterface +class AVFCameraService : public QPlatformMediaCapture { Q_OBJECT public: diff --git a/src/multimedia/platform/darwin/qdarwindevicemanager.mm b/src/multimedia/platform/darwin/qdarwindevicemanager.mm index 04802cb99..8aea9d360 100644 --- a/src/multimedia/platform/darwin/qdarwindevicemanager.mm +++ b/src/multimedia/platform/darwin/qdarwindevicemanager.mm @@ -153,7 +153,7 @@ audioDeviceChangeListener(AudioObjectID, UInt32, const AudioObjectPropertyAddres QDarwinDeviceManager::QDarwinDeviceManager() - : QMediaPlatformDeviceManager() + : QPlatformMediaDeviceManager() { NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter]; m_deviceConnectedObserver = [notificationCenter addObserverForName:AVCaptureDeviceWasConnectedNotification diff --git a/src/multimedia/platform/darwin/qdarwindevicemanager_p.h b/src/multimedia/platform/darwin/qdarwindevicemanager_p.h index d52b2e0c5..cbace9330 100644 --- a/src/multimedia/platform/darwin/qdarwindevicemanager_p.h +++ b/src/multimedia/platform/darwin/qdarwindevicemanager_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qelapsedtimer.h> #include <qcamerainfo.h> @@ -63,7 +63,7 @@ Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession); class QCameraInfo; -class QDarwinDeviceManager : public QMediaPlatformDeviceManager +class QDarwinDeviceManager : public QPlatformMediaDeviceManager { public: QDarwinDeviceManager(); diff --git a/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h b/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h index 44e03c5b2..ad8a706bd 100644 --- a/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h +++ b/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h @@ -51,14 +51,14 @@ // We mean it. // -#include <private/qmediaplatformformatinfo_p.h> +#include <private/qplatformmediaformatinfo_p.h> #include <qlist.h> QT_BEGIN_NAMESPACE class QDarwinDeviceManager; -class QDarwinFormatInfo : public QMediaPlatformFormatInfo +class QDarwinFormatInfo : public QPlatformMediaFormatInfo { public: QDarwinFormatInfo(); diff --git a/src/multimedia/platform/darwin/qdarwinintegration.cpp b/src/multimedia/platform/darwin/qdarwinintegration.cpp index 7a93880ed..1d55fad1b 100644 --- a/src/multimedia/platform/darwin/qdarwinintegration.cpp +++ b/src/multimedia/platform/darwin/qdarwinintegration.cpp @@ -56,21 +56,21 @@ QDarwinIntegration::~QDarwinIntegration() delete m_formatInfo; } -QMediaPlatformDeviceManager *QDarwinIntegration::deviceManager() +QPlatformMediaDeviceManager *QDarwinIntegration::deviceManager() { if (!m_manager) m_manager = new QDarwinDeviceManager(); return m_manager; } -QMediaPlatformFormatInfo *QDarwinIntegration::formatInfo() +QPlatformMediaFormatInfo *QDarwinIntegration::formatInfo() { if (!m_formatInfo) m_formatInfo = new QDarwinFormatInfo(); return m_formatInfo; } -QMediaPlatformCaptureInterface *QDarwinIntegration::createCaptureInterface(QMediaRecorder::CaptureMode) +QPlatformMediaCaptureInterface *QDarwinIntegration::createCaptureInterface(QMediaRecorder::CaptureMode) { return new AVFCameraService; } diff --git a/src/multimedia/platform/darwin/qdarwinintegration_p.h b/src/multimedia/platform/darwin/qdarwinintegration_p.h index 8e0dbc7bd..d0dee6474 100644 --- a/src/multimedia/platform/darwin/qdarwinintegration_p.h +++ b/src/multimedia/platform/darwin/qdarwinintegration_p.h @@ -51,26 +51,26 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE class QDarwinDeviceManager; -class QDarwinIntegration : public QMediaPlatformIntegration +class QDarwinIntegration : public QPlatformMediaIntegration { public: QDarwinIntegration(); ~QDarwinIntegration(); - QMediaPlatformDeviceManager *deviceManager() override; - QMediaPlatformFormatInfo *formatInfo() override; + QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaFormatInfo *formatInfo() override; - QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode /*mode*/) override; + QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode /*mode*/) override; QPlatformMediaPlayer *createPlayer() override; QDarwinDeviceManager *m_manager = nullptr; - QMediaPlatformFormatInfo *m_formatInfo = nullptr; + QPlatformMediaFormatInfo *m_formatInfo = nullptr; }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp index 68279a25a..e090e3b03 100644 --- a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp +++ b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp @@ -41,7 +41,7 @@ #include "qaudioengine_gstreamer_p.h" #include <private/qgstutils_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> #include <private/qgstreamerdevicemanager_p.h> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE QGStreamerAudioDeviceInfo::QGStreamerAudioDeviceInfo(const QByteArray &device, QAudio::Mode mode) : QAudioDeviceInfoPrivate(device, mode) { - auto *deviceManager = static_cast<QGstreamerDeviceManager *>(QMediaPlatformIntegration::instance()->deviceManager()); + auto *deviceManager = static_cast<QGstreamerDeviceManager *>(QPlatformMediaIntegration::instance()->deviceManager()); gstDevice = deviceManager->audioDevice(device, mode); if (gstDevice) { gst_object_ref(gstDevice); diff --git a/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer.cpp index 42bb49ba6..c7ccaeac1 100644 --- a/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer.cpp +++ b/src/multimedia/platform/gstreamer/audio/qaudioengine_gstreamer.cpp @@ -46,8 +46,8 @@ #include <sys/types.h> #include <unistd.h> -#include <private/qmediaplatformdevicemanager_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediaintegration_p.h> #include <private/qgstutils_p.h> @@ -67,7 +67,7 @@ QGStreamerAudioEngine *QGStreamerAudioEngine::instance() QList<QByteArray> QGStreamerAudioEngine::availableDevices(QAudio::Mode mode) const { - auto *m = QMediaPlatformIntegration::instance()->deviceManager(); + auto *m = QPlatformMediaIntegration::instance()->deviceManager(); const auto devices = (mode == QAudio::AudioOutput) ? m->audioOutputs() : m->audioInputs(); QList<QByteArray> list; for (auto d : devices) @@ -77,7 +77,7 @@ QList<QByteArray> QGStreamerAudioEngine::availableDevices(QAudio::Mode mode) con QByteArray QGStreamerAudioEngine::defaultDevice(QAudio::Mode mode) const { - auto *m = QMediaPlatformIntegration::instance()->deviceManager(); + auto *m = QPlatformMediaIntegration::instance()->deviceManager(); const auto devices = (mode == QAudio::AudioOutput) ? m->audioOutputs() : m->audioInputs(); return devices.value(0).id(); } diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp index 1f1e85f70..d826fc101 100644 --- a/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp +++ b/src/multimedia/platform/gstreamer/camerabin/camerabinsession.cpp @@ -55,7 +55,7 @@ #include <private/qgstutils_p.h> #include <qmediarecorder.h> #include <qvideosurfaceformat.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qPlatformMediaintegration_p.h> #include <private/qgstreamerplatformdevicemanager_p.h> #if QT_CONFIG(gstreamer_photography) @@ -480,7 +480,7 @@ GstElement *CameraBinSession::buildCameraSource() for (const QByteArray &source : sources) { QList<QByteArray> keyValue = source.split('='); QByteArray name = keyValue.at(0); - auto deviceManager = static_cast<QGstreamerPlatformDeviceManager *>(QMediaPlatformIntegration::instance()->deviceManager()); + auto deviceManager = static_cast<QGstreamerPlatformDeviceManager *>(QPlatformMediaIntegration::instance()->deviceManager()); if (keyValue.count() > 1 && keyValue.at(0) == deviceManager->cameraDriver(m_inputDevice)) name = keyValue.at(1); diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h index 955fab52c..6f1cdff6b 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h @@ -51,8 +51,8 @@ // We mean it. // -#include <private/qmediaplatformcaptureinterface_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediacapture_p.h> +#include <private/qplatformmediaintegration_p.h> #include <gst/gst.h> @@ -66,7 +66,7 @@ class QGstreamerVideoRenderer; class QGstreamerVideoWindow; class QGstreamerVideoInput; -class QGstreamerCaptureService : public QMediaPlatformCaptureInterface +class QGstreamerCaptureService : public QPlatformMediaCapture { Q_OBJECT diff --git a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp index 3706ed278..f424a9842 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp +++ b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp @@ -72,7 +72,7 @@ static gboolean deviceMonitor(GstBus *, GstMessage *message, gpointer m) } QGstreamerDeviceManager::QGstreamerDeviceManager() - : QMediaPlatformDeviceManager() + : QPlatformMediaDeviceManager() { QGstUtils::initializeGst(); diff --git a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h index ab639c586..102d2cc8e 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h +++ b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h @@ -51,14 +51,14 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <gst/gst.h> #include <qset.h> #include <qaudio.h> QT_BEGIN_NAMESPACE -class QGstreamerDeviceManager : public QMediaPlatformDeviceManager +class QGstreamerDeviceManager : public QPlatformMediaDeviceManager { public: QGstreamerDeviceManager(); diff --git a/src/multimedia/platform/gstreamer/qgstreamerformatsinfo_p.h b/src/multimedia/platform/gstreamer/qgstreamerformatsinfo_p.h index cb9d4d880..881a4e86e 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerformatsinfo_p.h +++ b/src/multimedia/platform/gstreamer/qgstreamerformatsinfo_p.h @@ -51,14 +51,14 @@ // We mean it. // -#include <private/qmediaplatformformatinfo_p.h> +#include <private/qplatformmediaformatinfo_p.h> #include <qhash.h> #include <qlist.h> #include <private/qgstutils_p.h> QT_BEGIN_NAMESPACE -class QGstreamerFormatsInfo : public QMediaPlatformFormatInfo +class QGstreamerFormatsInfo : public QPlatformMediaFormatInfo { public: QGstreamerFormatsInfo(); diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp index bd42d362d..69f77cef2 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp +++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp @@ -58,14 +58,14 @@ QGstreamerIntegration::~QGstreamerIntegration() delete m_formatsInfo; } -QMediaPlatformDeviceManager *QGstreamerIntegration::deviceManager() +QPlatformMediaDeviceManager *QGstreamerIntegration::deviceManager() { if (!m_manager) m_manager = new QGstreamerDeviceManager(); return m_manager; } -QMediaPlatformFormatInfo *QGstreamerIntegration::formatInfo() +QPlatformMediaFormatInfo *QGstreamerIntegration::formatInfo() { if (!m_formatsInfo) m_formatsInfo = new QGstreamerFormatsInfo(); @@ -77,7 +77,7 @@ QAudioDecoderControl *QGstreamerIntegration::createAudioDecoder() return new QGstreamerAudioDecoderControl(nullptr); } -QMediaPlatformCaptureInterface *QGstreamerIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) +QPlatformMediaCapture *QGstreamerIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) { return new QGstreamerCaptureService(mode); } diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h index 6eca24ebf..dd0401957 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h +++ b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -59,18 +59,18 @@ class QGstreamerDeviceManager; class QGstreamerPlayerInterface; class QGstreamerFormatsInfo; -class QGstreamerIntegration : public QMediaPlatformIntegration +class QGstreamerIntegration : public QPlatformMediaIntegration { public: QGstreamerIntegration(); ~QGstreamerIntegration(); - static QGstreamerIntegration *instance() { return static_cast<QGstreamerIntegration *>(QMediaPlatformIntegration::instance()); } - QMediaPlatformDeviceManager *deviceManager() override; - QMediaPlatformFormatInfo *formatInfo() override; + static QGstreamerIntegration *instance() { return static_cast<QGstreamerIntegration *>(QPlatformMediaIntegration::instance()); } + QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaFormatInfo *formatInfo() override; QAudioDecoderControl *createAudioDecoder() override; - QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; + QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; QPlatformMediaPlayer *createPlayer() override; QGstreamerDeviceManager *m_manager = nullptr; diff --git a/src/multimedia/platform/platform.pri b/src/multimedia/platform/platform.pri index 6ac9c6a7f..afce76b54 100644 --- a/src/multimedia/platform/platform.pri +++ b/src/multimedia/platform/platform.pri @@ -1,14 +1,14 @@ HEADERS += \ - $$PWD/qmediaplatformcaptureinterface_p.h \ - $$PWD/qmediaplatformintegration_p.h \ - $$PWD/qmediaplatformdevicemanager_p.h \ - $$PWD/qmediaplatformformatinfo_p.h + $$PWD/qplatformmediacaptureinterface_p.h \ + $$PWD/qplatformmediaintegration_p.h \ + $$PWD/qplatformmediadevicemanager_p.h \ + $$PWD/qplatformmediaformatinfo_p.h SOURCES += \ - $$PWD/qmediaplatformcaptureinterface.cpp \ - $$PWD/qmediaplatformintegration.cpp \ - $$PWD/qmediaplatformdevicemanager.cpp \ - $$PWD/qmediaplatformformatinfo.cpp + $$PWD/qplatformmediacaptureinterface.cpp \ + $$PWD/qplatformmediaintegration.cpp \ + $$PWD/qplatformmediadevicemanager.cpp \ + $$PWD/qplatformmediaformatinfo.cpp qtConfig(gstreamer):include(gstreamer/gstreamer.pri) qtConfig(pulseaudio): include(pulseaudio/pulseaudio.pri) diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager.cpp index 051b39adf..2562b2a53 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager.cpp +++ b/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE QPulseAudioDeviceManager::QPulseAudioDeviceManager(QPulseAudioEngine *engine) - : QMediaPlatformDeviceManager(), + : QPlatformMediaDeviceManager(), pulseEngine(engine) { } diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager_p.h index cb0d20032..8f5054bc7 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager_p.h +++ b/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qset.h> #include <qaudio.h> @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QPulseAudioEngine; -class QPulseAudioDeviceManager : public QMediaPlatformDeviceManager +class QPulseAudioDeviceManager : public QPlatformMediaDeviceManager { public: QPulseAudioDeviceManager(QPulseAudioEngine *engine); diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp index 6465ce446..59a1f991a 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp +++ b/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp @@ -52,7 +52,7 @@ QPulseAudioIntegration::~QPulseAudioIntegration() delete m_manager; } -QMediaPlatformDeviceManager *QPulseAudioIntegration::deviceManager() +QPlatformMediaDeviceManager *QPulseAudioIntegration::deviceManager() { if (!m_manager) m_manager = new QPulseAudioDeviceManager(pulseEngine); diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h index 688434ebf..9f7f8d50d 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h +++ b/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h @@ -51,20 +51,20 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> #include <private/qaudioengine_pulse_p.h> QT_BEGIN_NAMESPACE class QPulseAudioDeviceManager; -class QPulseAudioIntegration : public QMediaPlatformIntegration +class QPulseAudioIntegration : public QPlatformMediaIntegration { public: QPulseAudioIntegration(); ~QPulseAudioIntegration(); - QMediaPlatformDeviceManager *deviceManager() override; + QPlatformMediaDeviceManager *deviceManager() override; QPulseAudioDeviceManager *m_manager = nullptr; QPulseAudioEngine *pulseEngine = nullptr; diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h index 5bfc92b6d..786f3d8f7 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h @@ -52,7 +52,7 @@ #include <QObject> -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediacapture_p.h> QT_BEGIN_NAMESPACE @@ -67,7 +67,7 @@ class BbCameraSession; class BbCameraVideoEncoderSettingsControl; class BbVideoRendererControl; -class BbCameraService : public QMediaPlatformCaptureInterface +class BbCameraService : public QPlatformMediaCapture { Q_OBJECT diff --git a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h index b028fa465..c53a2f4b7 100644 --- a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h +++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h @@ -50,7 +50,7 @@ // We mean it. // -#include <private/qmediaplatformplayerinterface_p.h> +#include <private/qplatformmediaplayerinterface_p.h> #include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE @@ -59,14 +59,14 @@ class MmRendererMediaPlayerControl; class MmRendererPlayerVideoRendererControl; class MmRendererVideoWindowControl; -class MmRendererMediaPlayerService : public QMediaPlatformPlayerInterface +class MmRendererMediaPlayerService : public QPlatformMediaPlayerInterface { Q_OBJECT public: explicit MmRendererMediaPlayerService(QObject *parent = 0); ~MmRendererMediaPlayerService(); - // QMediaPlatformPlayerInterface + // QPlatformMediaPlayerInterface QPlatformMediaPlayer *player() override; // QMediaStreamsControl *streams() override; diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h index 3ef61c78a..803660384 100644 --- a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h +++ b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h @@ -51,12 +51,12 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qaudio.h> QT_BEGIN_NAMESPACE -class QQnxDeviceManager : public QMediaPlatformDeviceManager +class QQnxDeviceManager : public QPlatformMediaDeviceManager { public: QQnxDeviceManager(); diff --git a/src/multimedia/platform/qnx/qqnxintegration_p.h b/src/multimedia/platform/qnx/qqnxintegration_p.h index 67ffb2f9c..3770f5d03 100644 --- a/src/multimedia/platform/qnx/qqnxintegration_p.h +++ b/src/multimedia/platform/qnx/qqnxintegration_p.h @@ -51,22 +51,22 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE class QQnxDeviceManager; class QQnxPlayerInterface; -class QQnxIntegration : public QMediaPlatformIntegration +class QQnxIntegration : public QPlatformMediaIntegration { public: QQnxIntegration(); ~QQnxIntegration(); - QMediaPlatformDeviceManager *deviceManager() override; + QPlatformMediaDeviceManager *deviceManager() override; - QMediaPlatformPlayerInterface *createPlayerInterface() override; + QPlatformMediaPlayerInterface *createPlayerInterface() override; QQnxDeviceManager *m_manager = nullptr; }; diff --git a/src/multimedia/platform/qmediaplatformcaptureinterface.cpp b/src/multimedia/platform/qplatformmediacapture.cpp index 3feb8482e..5f84cbdaa 100644 --- a/src/multimedia/platform/qmediaplatformcaptureinterface.cpp +++ b/src/multimedia/platform/qplatformmediacapture.cpp @@ -38,11 +38,11 @@ ****************************************************************************/ #include <qtmultimediaglobal_p.h> -#include "qmediaplatformcaptureinterface_p.h" +#include "qplatformmediacapture_p.h" QT_BEGIN_NAMESPACE -QMediaPlatformCaptureInterface::~QMediaPlatformCaptureInterface() +QPlatformMediaCapture::~QPlatformMediaCapture() { } diff --git a/src/multimedia/platform/qmediaplatformcaptureinterface_p.h b/src/multimedia/platform/qplatformmediacapture_p.h index a18619574..ed8ad999f 100644 --- a/src/multimedia/platform/qmediaplatformcaptureinterface_p.h +++ b/src/multimedia/platform/qplatformmediacapture_p.h @@ -36,8 +36,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef QMEDIAPLATFORMCAPTUREINTERFACE_H -#define QMEDIAPLATFORMCAPTUREINTERFACE_H +#ifndef QPLATFORMMEDIACAPTURE_H +#define QPLATFORMMEDIACAPTURE_H // // W A R N I N G @@ -58,11 +58,11 @@ class QCameraControl; class QCameraImageCaptureControl; class QMediaRecorderControl; -class Q_MULTIMEDIA_EXPORT QMediaPlatformCaptureInterface : public QObject +class Q_MULTIMEDIA_EXPORT QPlatformMediaCapture : public QObject { public: - QMediaPlatformCaptureInterface() = default; - virtual ~QMediaPlatformCaptureInterface(); + QPlatformMediaCapture() = default; + virtual ~QPlatformMediaCapture(); virtual QCameraControl *cameraControl() = 0; virtual QCameraImageCaptureControl *imageCaptureControl() = 0; @@ -72,4 +72,4 @@ public: QT_END_NAMESPACE -#endif // QMEDIAPLATFORMINTERFACE_H +#endif // QPLATFORMMEDIAINTERFACE_H diff --git a/src/multimedia/platform/qmediaplatformdevicemanager.cpp b/src/multimedia/platform/qplatformmediadevicemanager.cpp index 868e9c569..e5a61a7b8 100644 --- a/src/multimedia/platform/qmediaplatformdevicemanager.cpp +++ b/src/multimedia/platform/qplatformmediadevicemanager.cpp @@ -37,22 +37,22 @@ ** ****************************************************************************/ -#include "qmediaplatformdevicemanager_p.h" +#include "qplatformmediadevicemanager_p.h" #include "qaudiodeviceinfo.h" #include "qcamerainfo.h" #include "qaudiosystem_p.h" QT_BEGIN_NAMESPACE -QMediaPlatformDeviceManager::QMediaPlatformDeviceManager() +QPlatformMediaDeviceManager::QPlatformMediaDeviceManager() { } -QMediaPlatformDeviceManager::~QMediaPlatformDeviceManager() +QPlatformMediaDeviceManager::~QPlatformMediaDeviceManager() { } -QAudioDeviceInfo QMediaPlatformDeviceManager::audioInput(const QByteArray &id) const +QAudioDeviceInfo QPlatformMediaDeviceManager::audioInput(const QByteArray &id) const { const auto inputs = audioInputs(); for (auto i : inputs) { @@ -62,7 +62,7 @@ QAudioDeviceInfo QMediaPlatformDeviceManager::audioInput(const QByteArray &id) c return {}; } -QAudioDeviceInfo QMediaPlatformDeviceManager::audioOutput(const QByteArray &id) const +QAudioDeviceInfo QPlatformMediaDeviceManager::audioOutput(const QByteArray &id) const { const auto outputs = audioOutputs(); for (auto o : outputs) { @@ -72,7 +72,7 @@ QAudioDeviceInfo QMediaPlatformDeviceManager::audioOutput(const QByteArray &id) return {}; } -QCameraInfo QMediaPlatformDeviceManager::videoInput(const QByteArray &id) const +QCameraInfo QPlatformMediaDeviceManager::videoInput(const QByteArray &id) const { const auto inputs = videoInputs(); for (auto i : inputs) { @@ -82,7 +82,7 @@ QCameraInfo QMediaPlatformDeviceManager::videoInput(const QByteArray &id) const return QCameraInfo(); } -QAbstractAudioInput* QMediaPlatformDeviceManager::audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput* QPlatformMediaDeviceManager::audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) { QAudioDeviceInfo info = deviceInfo; if (info.isNull()) @@ -94,7 +94,7 @@ QAbstractAudioInput* QMediaPlatformDeviceManager::audioInputDevice(const QAudioF return p; } -QAbstractAudioOutput* QMediaPlatformDeviceManager::audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput* QPlatformMediaDeviceManager::audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) { QAudioDeviceInfo info = deviceInfo; if (info.isNull()) diff --git a/src/multimedia/platform/qmediaplatformdevicemanager_p.h b/src/multimedia/platform/qplatformmediadevicemanager_p.h index f6d1dc9ed..9a8af446c 100644 --- a/src/multimedia/platform/qmediaplatformdevicemanager_p.h +++ b/src/multimedia/platform/qplatformmediadevicemanager_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMEDIAPLATFORMDEVICEMANAGER_H -#define QMEDIAPLATFORMDEVICEMANAGER_H +#ifndef QPLATFORMMEDIADEVICEMANAGER_H +#define QPLATFORMMEDIADEVICEMANAGER_H // // W A R N I N G @@ -62,11 +62,11 @@ class QAbstractAudioInput; class QAbstractAudioOutput; class QAudioFormat; -class Q_AUTOTEST_EXPORT QMediaPlatformDeviceManager +class Q_AUTOTEST_EXPORT QPlatformMediaDeviceManager { public: - QMediaPlatformDeviceManager(); - virtual ~QMediaPlatformDeviceManager(); + QPlatformMediaDeviceManager(); + virtual ~QPlatformMediaDeviceManager(); virtual QList<QAudioDeviceInfo> audioInputs() const = 0; virtual QList<QAudioDeviceInfo> audioOutputs() const = 0; @@ -95,4 +95,4 @@ private: QT_END_NAMESPACE -#endif // QMEDIAPLATFORMDEVICEMANAGER_H +#endif // QPLATFORMMEDIADEVICEMANAGER_H diff --git a/src/multimedia/platform/qmediaplatformformatinfo.cpp b/src/multimedia/platform/qplatformmediaformatinfo.cpp index 20a5d580c..2012cd8e4 100644 --- a/src/multimedia/platform/qmediaplatformformatinfo.cpp +++ b/src/multimedia/platform/qplatformmediaformatinfo.cpp @@ -37,16 +37,16 @@ ** ****************************************************************************/ -#include "qmediaplatformformatinfo_p.h" +#include "qplatformmediaformatinfo_p.h" #include <qset.h> QT_BEGIN_NAMESPACE -QMediaPlatformFormatInfo::QMediaPlatformFormatInfo() = default; +QPlatformMediaFormatInfo::QPlatformMediaFormatInfo() = default; -QMediaPlatformFormatInfo::~QMediaPlatformFormatInfo() = default; +QPlatformMediaFormatInfo::~QPlatformMediaFormatInfo() = default; -QList<QMediaFormat::FileFormat> QMediaPlatformFormatInfo::supportedFileFormats(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const +QList<QMediaFormat::FileFormat> QPlatformMediaFormatInfo::supportedFileFormats(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const { QSet<QMediaFormat::FileFormat> formats; @@ -63,7 +63,7 @@ QList<QMediaFormat::FileFormat> QMediaPlatformFormatInfo::supportedFileFormats(c return formats.values(); } -QList<QMediaFormat::AudioCodec> QMediaPlatformFormatInfo::supportedAudioCodecs(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const +QList<QMediaFormat::AudioCodec> QPlatformMediaFormatInfo::supportedAudioCodecs(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const { QSet<QMediaFormat::AudioCodec> codecs; @@ -79,7 +79,7 @@ QList<QMediaFormat::AudioCodec> QMediaPlatformFormatInfo::supportedAudioCodecs(c return codecs.values(); } -QList<QMediaFormat::VideoCodec> QMediaPlatformFormatInfo::supportedVideoCodecs(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const +QList<QMediaFormat::VideoCodec> QPlatformMediaFormatInfo::supportedVideoCodecs(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const { if (constraints.mode() == QMediaFormat::AudioOnly) return {}; @@ -98,7 +98,7 @@ QList<QMediaFormat::VideoCodec> QMediaPlatformFormatInfo::supportedVideoCodecs(c return codecs.values(); } -bool QMediaPlatformFormatInfo::isSupported(const QMediaFormat &format, QMediaFormat::ConversionMode m) const +bool QPlatformMediaFormatInfo::isSupported(const QMediaFormat &format, QMediaFormat::ConversionMode m) const { const auto &codecMap = (m == QMediaFormat::Encode) ? encoders : decoders; diff --git a/src/multimedia/platform/qmediaplatformformatinfo_p.h b/src/multimedia/platform/qplatformmediaformatinfo_p.h index 05ea7b495..af04e4492 100644 --- a/src/multimedia/platform/qmediaplatformformatinfo_p.h +++ b/src/multimedia/platform/qplatformmediaformatinfo_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMEDIAPLATFORMFORMATINFO_H -#define QMEDIAPLATFORMFORMATINFO_H +#ifndef QPLATFORMMEDIAFORMATINFO_H +#define QPLATFORMMEDIAFORMATINFO_H // // W A R N I N G @@ -56,11 +56,11 @@ QT_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT QMediaPlatformFormatInfo +class Q_AUTOTEST_EXPORT QPlatformMediaFormatInfo { public: - QMediaPlatformFormatInfo(); - virtual ~QMediaPlatformFormatInfo(); + QPlatformMediaFormatInfo(); + virtual ~QPlatformMediaFormatInfo(); QList<QMediaFormat::FileFormat> supportedFileFormats(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const; QList<QMediaFormat::AudioCodec> supportedAudioCodecs(const QMediaFormat &constraints, QMediaFormat::ConversionMode m) const; @@ -82,4 +82,4 @@ public: QT_END_NAMESPACE -#endif // QMEDIAPLATFORMDEVICEMANAGER_H +#endif // QPLATFORMMEDIADEVICEMANAGER_H diff --git a/src/multimedia/platform/qmediaplatformintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp index 50b12de3d..06a07ebba 100644 --- a/src/multimedia/platform/qmediaplatformintegration.cpp +++ b/src/multimedia/platform/qplatformmediaintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include <qtmultimediaglobal_p.h> -#include "qmediaplatformintegration_p.h" +#include "qplatformmediaintegration_p.h" #if QT_CONFIG(gstreamer) #include <private/qgstreamerintegration_p.h> @@ -69,12 +69,12 @@ struct Holder { delete instance; instance = nullptr; } - QMediaPlatformIntegration *instance = nullptr; + QPlatformMediaIntegration *instance = nullptr; } holder; } -QMediaPlatformIntegration *QMediaPlatformIntegration::instance() +QPlatformMediaIntegration *QPlatformMediaIntegration::instance() { if (!holder.instance) { holder.instance = new PlatformIntegration; @@ -85,12 +85,12 @@ QMediaPlatformIntegration *QMediaPlatformIntegration::instance() /* This API is there to be able to test with a mock backend. */ -void QMediaPlatformIntegration::setIntegration(QMediaPlatformIntegration *integration) +void QPlatformMediaIntegration::setIntegration(QPlatformMediaIntegration *integration) { holder.instance = integration; } -QMediaPlatformIntegration::~QMediaPlatformIntegration() +QPlatformMediaIntegration::~QPlatformMediaIntegration() { } diff --git a/src/multimedia/platform/qmediaplatformintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h index 5accc0423..cf21da5ae 100644 --- a/src/multimedia/platform/qmediaplatformintegration_p.h +++ b/src/multimedia/platform/qplatformmediaintegration_p.h @@ -36,8 +36,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef QMEDIAPLATFORMINTEGRATION_H -#define QMEDIAPLATFORMINTEGRATION_H +#ifndef QPLATFORMMEDIAINTEGRATION_H +#define QPLATFORMMEDIAINTEGRATION_H // // W A R N I N G @@ -56,31 +56,31 @@ QT_BEGIN_NAMESPACE class QMediaDeviceManager; -class QMediaPlatformDeviceManager; -class QMediaPlatformCaptureInterface; +class QPlatformMediaDeviceManager; +class QPlatformMediaCapture; class QPlatformMediaPlayer; class QAudioDecoderControl; -class QMediaPlatformFormatInfo; +class QPlatformMediaFormatInfo; class QVideoRendererControl; -class Q_MULTIMEDIA_EXPORT QMediaPlatformIntegration +class Q_MULTIMEDIA_EXPORT QPlatformMediaIntegration { public: - static QMediaPlatformIntegration *instance(); + static QPlatformMediaIntegration *instance(); // API to be able to test with a mock backend - static void setIntegration(QMediaPlatformIntegration *); + static void setIntegration(QPlatformMediaIntegration *); - virtual ~QMediaPlatformIntegration(); - virtual QMediaPlatformDeviceManager *deviceManager() = 0; - virtual QMediaPlatformFormatInfo *formatInfo() = 0; + virtual ~QPlatformMediaIntegration(); + virtual QPlatformMediaDeviceManager *deviceManager() = 0; + virtual QPlatformMediaFormatInfo *formatInfo() = 0; virtual QAudioDecoderControl *createAudioDecoder() { return nullptr; } - virtual QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode /*mode*/) { return nullptr; } + virtual QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode /*mode*/) { return nullptr; } virtual QPlatformMediaPlayer *createPlayer() { return nullptr; } }; QT_END_NAMESPACE -#endif // QMEDIAPLATFORMINTERFACE_H +#endif // QPLATFORMMEDIAINTERFACE_H diff --git a/src/multimedia/platform/windows/qwindowsdevicemanager.cpp b/src/multimedia/platform/windows/qwindowsdevicemanager.cpp index b93484a59..04b3bb430 100644 --- a/src/multimedia/platform/windows/qwindowsdevicemanager.cpp +++ b/src/multimedia/platform/windows/qwindowsdevicemanager.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QWindowsDeviceManager::QWindowsDeviceManager() - : QMediaPlatformDeviceManager() + : QPlatformMediaDeviceManager() { } diff --git a/src/multimedia/platform/windows/qwindowsdevicemanager_p.h b/src/multimedia/platform/windows/qwindowsdevicemanager_p.h index a3cfb2666..b55ee6b6d 100644 --- a/src/multimedia/platform/windows/qwindowsdevicemanager_p.h +++ b/src/multimedia/platform/windows/qwindowsdevicemanager_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qset.h> #include <qaudio.h> @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QWindowsEngine; -class QWindowsDeviceManager : public QMediaPlatformDeviceManager +class QWindowsDeviceManager : public QPlatformMediaDeviceManager { public: QWindowsDeviceManager(); diff --git a/src/multimedia/platform/windows/qwindowsformatinfo_p.h b/src/multimedia/platform/windows/qwindowsformatinfo_p.h index 5463136b1..355aea7d7 100644 --- a/src/multimedia/platform/windows/qwindowsformatinfo_p.h +++ b/src/multimedia/platform/windows/qwindowsformatinfo_p.h @@ -51,13 +51,13 @@ // We mean it. // -#include <private/qmediaplatformformatinfo_p.h> +#include <private/qplatformmediaformatinfo_p.h> #include <qhash.h> #include <qlist.h> QT_BEGIN_NAMESPACE -class QWindowsFormatInfo : public QMediaPlatformFormatInfo +class QWindowsFormatInfo : public QPlatformMediaFormatInfo { public: QWindowsFormatInfo(); diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp index ff6f65644..4153c7fb5 100644 --- a/src/multimedia/platform/windows/qwindowsintegration.cpp +++ b/src/multimedia/platform/windows/qwindowsintegration.cpp @@ -69,14 +69,14 @@ QWindowsIntegration::~QWindowsIntegration() } } -QMediaPlatformDeviceManager *QWindowsIntegration::deviceManager() +QPlatformMediaDeviceManager *QWindowsIntegration::deviceManager() { if (!m_manager) m_manager = new QWindowsDeviceManager(); return m_manager; } -QMediaPlatformFormatInfo *QWindowsIntegration::formatInfo() +QPlatformMediaFormatInfo *QWindowsIntegration::formatInfo() { if (!m_formatInfo) m_formatInfo = new QWindowsFormatInfo(); diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h index 23e7a941b..23dd00b80 100644 --- a/src/multimedia/platform/windows/qwindowsintegration_p.h +++ b/src/multimedia/platform/windows/qwindowsintegration_p.h @@ -51,14 +51,14 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE class QWindowsDeviceManager; class QWindowsFormatInfo; -class QWindowsIntegration : public QMediaPlatformIntegration +class QWindowsIntegration : public QPlatformMediaIntegration { public: QWindowsIntegration(); @@ -67,8 +67,8 @@ public: void addRefCount(); void releaseRefCount(); - QMediaPlatformDeviceManager *deviceManager() override; - QMediaPlatformFormatInfo *formatInfo() override; + QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaFormatInfo *formatInfo() override; QAudioDecoderControl *createAudioDecoder() override; QPlatformMediaPlayer *createPlayer() override; diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index c31139f6b..1c32b3414 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -42,7 +42,7 @@ #include "private/qobject_p.h" #include <qplatformmediaplayer_p.h> -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> #include <QtCore/qcoreevent.h> #include <QtCore/qmetaobject.h> @@ -276,7 +276,7 @@ QMediaPlayer::QMediaPlayer(QObject *parent): d->notifyTimer->setInterval(1000); connect(d->notifyTimer, SIGNAL(timeout()), SLOT(_q_notify())); - d->control = QMediaPlatformIntegration::instance()->createPlayer(); + d->control = QPlatformMediaIntegration::instance()->createPlayer(); Q_ASSERT(d->control); connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State))); diff --git a/src/multimedia/qmediadevicemanager.cpp b/src/multimedia/qmediadevicemanager.cpp index 4873d1cd7..840860e5b 100644 --- a/src/multimedia/qmediadevicemanager.cpp +++ b/src/multimedia/qmediadevicemanager.cpp @@ -38,8 +38,8 @@ ****************************************************************************/ #include "qmediadevicemanager.h" -#include "private/qmediaplatformintegration_p.h" -#include "private/qmediaplatformdevicemanager_p.h" +#include "private/qplatformmediaintegration_p.h" +#include "private/qplatformmediadevicemanager_p.h" #include <qaudiodeviceinfo.h> #include <qcamerainfo.h> @@ -52,7 +52,7 @@ public: QMediaDeviceManagerPrivate() : manager(new QMediaDeviceManager) { - pmanager = QMediaPlatformIntegration::instance()->deviceManager(); + pmanager = QPlatformMediaIntegration::instance()->deviceManager(); pmanager->setDeviceManager(manager); } ~QMediaDeviceManagerPrivate() @@ -62,7 +62,7 @@ public: } QMediaDeviceManager *manager = nullptr; - QMediaPlatformDeviceManager *pmanager = nullptr; + QPlatformMediaDeviceManager *pmanager = nullptr; } priv; diff --git a/src/multimedia/qmediaformat.cpp b/src/multimedia/qmediaformat.cpp index 6ae2314be..3c2841bfa 100644 --- a/src/multimedia/qmediaformat.cpp +++ b/src/multimedia/qmediaformat.cpp @@ -38,8 +38,8 @@ ****************************************************************************/ #include "qmediaformat.h" -#include "private/qmediaplatformintegration_p.h" -#include "private/qmediaplatformformatinfo_p.h" +#include "private/qplatformmediaintegration_p.h" +#include "private/qplatformmediaformatinfo_p.h" #include <QtCore/qmimedatabase.h> QT_BEGIN_NAMESPACE @@ -157,7 +157,7 @@ QMediaFormat &QMediaFormat::operator=(const QMediaFormat &other) = default; */ bool QMediaFormat::canDecode() const { - return QMediaPlatformIntegration::instance()->formatInfo()->isSupported(*this, Decode); + return QPlatformMediaIntegration::instance()->formatInfo()->isSupported(*this, Decode); } /*! @@ -167,7 +167,7 @@ bool QMediaFormat::canDecode() const */ bool QMediaFormat::canEncode() const { - return QMediaPlatformIntegration::instance()->formatInfo()->isSupported(*this, Encode); + return QPlatformMediaIntegration::instance()->formatInfo()->isSupported(*this, Encode); } /*! @@ -190,7 +190,7 @@ QMimeType QMediaFormat::mimeType() const */ QList<QMediaFormat::FileFormat> QMediaFormat::supportedFileFormats(QMediaFormat::ConversionMode m) { - return QMediaPlatformIntegration::instance()->formatInfo()->supportedFileFormats(*this, m); + return QPlatformMediaIntegration::instance()->formatInfo()->supportedFileFormats(*this, m); } /*! @@ -203,7 +203,7 @@ QList<QMediaFormat::FileFormat> QMediaFormat::supportedFileFormats(QMediaFormat: */ QList<QMediaFormat::VideoCodec> QMediaFormat::supportedVideoCodecs(QMediaFormat::ConversionMode m) { - return QMediaPlatformIntegration::instance()->formatInfo()->supportedVideoCodecs(*this, m); + return QPlatformMediaIntegration::instance()->formatInfo()->supportedVideoCodecs(*this, m); } /*! @@ -216,7 +216,7 @@ QList<QMediaFormat::VideoCodec> QMediaFormat::supportedVideoCodecs(QMediaFormat: */ QList<QMediaFormat::AudioCodec> QMediaFormat::supportedAudioCodecs(QMediaFormat::ConversionMode m) { - return QMediaPlatformIntegration::instance()->formatInfo()->supportedAudioCodecs(*this, m); + return QPlatformMediaIntegration::instance()->formatInfo()->supportedAudioCodecs(*this, m); } QString QMediaFormat::fileFormatName(QMediaFormat::FileFormat c) diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp index a1e3b1653..37d73d6a3 100644 --- a/src/multimedia/recording/qmediaencodersettings.cpp +++ b/src/multimedia/recording/qmediaencodersettings.cpp @@ -39,8 +39,8 @@ #include "qmediaencodersettings.h" #include "qmediaformat.h" -#include <private/qmediaplatformintegration_p.h> -#include <private/qmediaplatformformatinfo_p.h> +#include <private/qplatformmediaintegration_p.h> +#include <private/qplatformmediaformatinfo_p.h> QT_BEGIN_NAMESPACE @@ -563,7 +563,7 @@ void QImageEncoderSettings::setFormat(QImageEncoderSettings::FileFormat format) QList<QImageEncoderSettings::FileFormat> QImageEncoderSettings::supportedFormats() { - return QMediaPlatformIntegration::instance()->formatInfo()->imageFormats; + return QPlatformMediaIntegration::instance()->formatInfo()->imageFormats; } QString QImageEncoderSettings::fileFormatName(QImageEncoderSettings::FileFormat f) diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 4f4cf8051..eca237744 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -44,8 +44,8 @@ #include <qaudiodeviceinfo.h> #include <qcamera.h> #include <qcameracontrol.h> -#include <private/qmediaplatformintegration_p.h> -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediaintegration_p.h> +#include <private/qplatformmediacapture_p.h> #include <QtCore/qdebug.h> #include <QtCore/qurl.h> @@ -165,7 +165,7 @@ QMediaRecorder::QMediaRecorder(QMediaRecorder::CaptureMode mode, QObject *parent if (mode != AudioOnly) { setCamera(new QCamera(this)); } else { - auto *captureIface = QMediaPlatformIntegration::instance()->createCaptureInterface(mode); + auto *captureIface = QPlatformMediaIntegration::instance()->createCaptureInterface(mode); d->control = captureIface->mediaRecorderControl(); } } diff --git a/tests/auto/unit/mockbackend/mockmediarecorderservice.h b/tests/auto/unit/mockbackend/mockmediarecorderservice.h index 8ef815a09..87f9a7eff 100644 --- a/tests/auto/unit/mockbackend/mockmediarecorderservice.h +++ b/tests/auto/unit/mockbackend/mockmediarecorderservice.h @@ -35,9 +35,9 @@ #include "mockcameraimagecapturecontrol.h" #include "mockcameraexposurecontrol.h" #include "mockcameracontrol.h" -#include <private/qmediaplatformcaptureinterface_p.h> +#include <private/qplatformmediacapture_p.h> -class MockMediaRecorderService : public QMediaPlatformCaptureInterface +class MockMediaRecorderService : public QPlatformMediaCapture { Q_OBJECT public: diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp b/tests/auto/unit/mockbackend/qmockdevicemanager.cpp index f8b7c5c90..d41987a34 100644 --- a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp +++ b/tests/auto/unit/mockbackend/qmockdevicemanager.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE QMockDeviceManager::QMockDeviceManager() - : QMediaPlatformDeviceManager() + : QPlatformMediaDeviceManager() { } diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h b/tests/auto/unit/mockbackend/qmockdevicemanager_p.h index 1eb6018fb..100fe610f 100644 --- a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h +++ b/tests/auto/unit/mockbackend/qmockdevicemanager_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformdevicemanager_p.h> +#include <private/qplatformmediadevicemanager_p.h> #include <qelapsedtimer.h> #include <qaudiodeviceinfo.h> #include <qcamerainfo.h> @@ -62,7 +62,7 @@ Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession); class QCameraInfo; -class QMockDeviceManager : public QMediaPlatformDeviceManager +class QMockDeviceManager : public QPlatformMediaDeviceManager { public: QMockDeviceManager(); diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp index f76ab52c2..565d313ae 100644 --- a/tests/auto/unit/mockbackend/qmockintegration.cpp +++ b/tests/auto/unit/mockbackend/qmockintegration.cpp @@ -56,7 +56,7 @@ QMockIntegration::~QMockIntegration() delete m_manager; } -QMediaPlatformDeviceManager *QMockIntegration::deviceManager() +QPlatformMediaDeviceManager *QMockIntegration::deviceManager() { if (!m_manager) m_manager = new QMockDeviceManager(); @@ -81,7 +81,7 @@ QPlatformMediaPlayer *QMockIntegration::createPlayer() return m_lastPlayer; } -QMediaPlatformCaptureInterface *QMockIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) +QPlatformMediaCapture *QMockIntegration::createCaptureInterface(QMediaRecorder::CaptureMode mode) { Q_UNUSED(mode); if (m_flags & NoCaptureInterface) diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h index e70380404..1c622bbf5 100644 --- a/tests/auto/unit/mockbackend/qmockintegration_p.h +++ b/tests/auto/unit/mockbackend/qmockintegration_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qmediaplatformintegration_p.h> +#include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -60,18 +60,18 @@ class MockMediaPlayer; class MockAudioDecoderControl; class MockMediaRecorderService; -class QMockIntegration : public QMediaPlatformIntegration +class QMockIntegration : public QPlatformMediaIntegration { public: QMockIntegration(); ~QMockIntegration(); - QMediaPlatformDeviceManager *deviceManager() override; - QMediaPlatformFormatInfo *formatInfo() override { return nullptr; } + QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaFormatInfo *formatInfo() override { return nullptr; } QAudioDecoderControl *createAudioDecoder() override; QPlatformMediaPlayer *createPlayer() override; - QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; + QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode mode) override; enum Flag { NoPlayerInterface = 0x1, |