diff options
Diffstat (limited to 'src/multimedia')
60 files changed, 95 insertions, 401 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 8f288b59c..dcb44d095 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -58,7 +58,6 @@ qt_add_module(Multimedia playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h qmediabindableinterface.cpp qmediabindableinterface.h - qmediacontrol.cpp qmediacontrol.h qmediacontrol_p.h qmediaenumdebug.h qmediametadata.cpp qmediametadata.h qmediaobject.cpp qmediaobject.h qmediaobject_p.h diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index d088e9beb..483842c7a 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -46,7 +46,7 @@ #include <QtCore/qpoint.h> #include <QtCore/qrect.h> -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaservice.h> diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h index ddb94f70a..e99853194 100644 --- a/src/multimedia/camera/qcameraimageprocessing.h +++ b/src/multimedia/camera/qcameraimageprocessing.h @@ -46,7 +46,7 @@ #include <QtCore/qpoint.h> #include <QtCore/qrect.h> -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/camera/qcameraviewfindersettings.cpp b/src/multimedia/camera/qcameraviewfindersettings.cpp index 4e2e41cd8..2d5eecbf5 100644 --- a/src/multimedia/camera/qcameraviewfindersettings.cpp +++ b/src/multimedia/camera/qcameraviewfindersettings.cpp @@ -58,9 +58,6 @@ public: qreal maximumFrameRate = 0.0; QVideoFrame::PixelFormat pixelFormat = QVideoFrame::Format_Invalid; QSize pixelAspectRatio; - -private: - QCameraViewfinderSettingsPrivate& operator=(const QCameraViewfinderSettingsPrivate &other); }; diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp index 711303174..90eec2b25 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.cpp +++ b/src/multimedia/controls/qaudiodecodercontrol.cpp @@ -37,7 +37,6 @@ ** ****************************************************************************/ -#include "qmediacontrol_p.h" #include "qaudiodecodercontrol.h" QT_BEGIN_NAMESPACE @@ -85,8 +84,8 @@ QAudioDecoderControl::~QAudioDecoderControl() /*! Constructs a new audio decoder control with the given \a parent. */ -QAudioDecoderControl::QAudioDecoderControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QAudioDecoderControl::QAudioDecoderControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h index 6ab27ba62..537285a16 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.h +++ b/src/multimedia/controls/qaudiodecodercontrol.h @@ -40,7 +40,7 @@ #ifndef QAUDIODECODERCONTROL_H #define QAUDIODECODERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qaudiodecoder.h> #include <QtCore/qpair.h> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QIODevice; -class Q_MULTIMEDIA_EXPORT QAudioDecoderControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QAudioDecoderControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp index 5ae473178..b9c234d8d 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.cpp +++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE Create a new audio encoder settings control object with the given \a parent. */ QAudioEncoderSettingsControl::QAudioEncoderSettingsControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h index b4c3abafd..cc9c09770 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.h +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -40,7 +40,7 @@ #ifndef QAUDIOENCODERSETTINGSCONTROL_H #define QAUDIOENCODERSETTINGSCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediarecorder.h> #include <QtCore/qlist.h> #include <QtCore/qpair.h> @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QAudioEncoderSettingsControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QAudioEncoderSettingsControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.cpp b/src/multimedia/controls/qaudioinputselectorcontrol.cpp index 649891225..19ef92474 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.cpp +++ b/src/multimedia/controls/qaudioinputselectorcontrol.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE Constructs a new audio input selector control with the given \a parent. */ QAudioInputSelectorControl::QAudioInputSelectorControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h index 9665b55de..e741a93db 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.h +++ b/src/multimedia/controls/qaudioinputselectorcontrol.h @@ -41,14 +41,14 @@ #define QAUDIOINPUTSELECTORCONTROL_H #include <QtMultimedia/qaudio.h> -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> QT_BEGIN_NAMESPACE // Class forward declaration required for QDoc bug class QString; -class Q_MULTIMEDIA_EXPORT QAudioInputSelectorControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QAudioInputSelectorControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp index 64886e4c9..72b3b5d14 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE Constructs a new audio output selector control with the given \a parent. */ QAudioOutputSelectorControl::QAudioOutputSelectorControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h index de44d0ebb..1b6d685f8 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.h +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h @@ -41,14 +41,14 @@ #define QAUDIOOUTPUTSELECTORCONTROL_H #include <QtMultimedia/qaudio.h> -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> QT_BEGIN_NAMESPACE // Class forward declaration required for QDoc bug class QString; -class Q_MULTIMEDIA_EXPORT QAudioOutputSelectorControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QAudioOutputSelectorControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp index 8f0c3e6e9..9ade67da1 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE Constructs a new image buffer capture format control object with the given \a parent */ QCameraCaptureBufferFormatControl::QCameraCaptureBufferFormatControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index 1c8f44243..b1a4561e8 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -40,7 +40,7 @@ #ifndef QCAMERACAPTUREBUFFERFORMATCONTROL_H #define QCAMERACAPTUREBUFFERFORMATCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qcameraimagecapture.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraCaptureBufferFormatControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraCaptureBufferFormatControl : public QObject { Q_OBJECT public: diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp index 736f59888..1c5161ac5 100644 --- a/src/multimedia/controls/qcameracontrol.cpp +++ b/src/multimedia/controls/qcameracontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <qcameracontrol.h> -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -80,8 +79,8 @@ QT_BEGIN_NAMESPACE Constructs a camera control object with \a parent. */ -QCameraControl::QCameraControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QCameraControl::QCameraControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index 75464fdaa..5da4aeac7 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -40,7 +40,7 @@ #ifndef QCAMERACONTROL_H #define QCAMERACONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qcamera.h> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp index 58501dc78..2ff220fac 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ b/src/multimedia/controls/qcameraexposurecontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <qcameraexposurecontrol.h> -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -79,8 +78,8 @@ QT_BEGIN_NAMESPACE /*! Constructs a camera exposure control object with \a parent. */ -QCameraExposureControl::QCameraExposureControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QCameraExposureControl::QCameraExposureControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 6a57e81b7..87274b407 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -40,7 +40,7 @@ #ifndef QCAMERAEXPOSURECONTROL_H #define QCAMERAEXPOSURECONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qcameraexposure.h> @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QObject { Q_OBJECT Q_ENUMS(ExposureParameter) diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp index 5e4e2debd..52f423721 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ b/src/multimedia/controls/qcamerafocuscontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <qcamerafocuscontrol.h> -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -76,8 +75,8 @@ QT_BEGIN_NAMESPACE Constructs a camera control object with \a parent. */ -QCameraFocusControl::QCameraFocusControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QCameraFocusControl::QCameraFocusControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 966157e96..7c46cdfad 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -40,7 +40,7 @@ #ifndef QCAMERAFOCUSCONTROL_H #define QCAMERAFOCUSCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qcamerafocus.h> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index 0e089d01b..88da5a90c 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE Constructs a new image capture control object with the given \a parent */ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index ab6b596a9..04a6b2f4f 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -40,7 +40,7 @@ #ifndef QCAMERAIMAGECAPTURECONTROL_H #define QCAMERAIMAGECAPTURECONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qcameraimagecapture.h> QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp index fba4bf400..a07260079 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <qcameraimageprocessingcontrol.h> -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -96,8 +95,8 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageProcessingControlMetaTypes) Constructs an image processing control object with \a parent. */ -QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 8be435f8f..69a266a9f 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -40,7 +40,7 @@ #ifndef QCAMERAIMAGEPROCESSINGCONTROL_H #define QCAMERAIMAGEPROCESSINGCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qcamera.h> @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QObject { Q_OBJECT Q_ENUMS(ProcessingParameter) diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp index bd5c7a73b..fe43a0ce6 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qcameraviewfindersettingscontrol.h" -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -78,7 +77,7 @@ QT_BEGIN_NAMESPACE Constructs a camera viewfinder control object with \a parent. */ QCameraViewfinderSettingsControl::QCameraViewfinderSettingsControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) + : QObject(parent) { } @@ -166,7 +165,7 @@ QCameraViewfinderSettingsControl::~QCameraViewfinderSettingsControl() Constructs a camera viewfinder settings control object with \a parent. */ QCameraViewfinderSettingsControl2::QCameraViewfinderSettingsControl2(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h index 7877bd1db..5edcbcd26 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h @@ -42,7 +42,7 @@ #ifndef QCAMERAVIEWFINDERSETTINGSCONTROL_H #define QCAMERAVIEWFINDERSETTINGSCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qcamera.h> QT_BEGIN_NAMESPACE @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl : public QObject { Q_OBJECT public: @@ -80,7 +80,7 @@ Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSetti // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl2 : public QMediaControl +class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl2 : public QObject { Q_OBJECT public: diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp index 6223c33c7..99dd4e949 100644 --- a/src/multimedia/controls/qimageencodercontrol.cpp +++ b/src/multimedia/controls/qimageencodercontrol.cpp @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE Constructs a new image encoder control object with the given \a parent */ QImageEncoderControl::QImageEncoderControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index c33266d9a..9e91d14c6 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -40,7 +40,7 @@ #ifndef QIMAGEENCODERCONTROL_H #define QIMAGEENCODERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediarecorder.h> #include <QtMultimedia/qmediaencodersettings.h> @@ -53,7 +53,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE -class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp index e22135903..cb315450c 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp +++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qmediaaudioprobecontrol.h" -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -75,7 +74,7 @@ QT_BEGIN_NAMESPACE Create a new media audio probe control object with the given \a parent. */ QMediaAudioProbeControl::QMediaAudioProbeControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h index 74cb1bc5a..06a882d80 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ b/src/multimedia/controls/qmediaaudioprobecontrol.h @@ -40,12 +40,12 @@ #ifndef QMEDIAAUDIOPROBECONTROL_H #define QMEDIAAUDIOPROBECONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> QT_BEGIN_NAMESPACE class QAudioBuffer; -class Q_MULTIMEDIA_EXPORT QMediaAudioProbeControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMediaAudioProbeControl : public QObject { Q_OBJECT public: diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index 2b2c8b78b..208e5bec5 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE Constructs a new media container control with the given \a parent. */ QMediaContainerControl::QMediaContainerControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h index 23c2918b9..114833e3a 100644 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ b/src/multimedia/controls/qmediacontainercontrol.h @@ -41,14 +41,14 @@ #ifndef QMEDIACONTAINERCONTROL_H #define QMEDIACONTAINERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QMediaContainerControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMediaContainerControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index 4987c6d2f..dae2bf10d 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qmediaplayercontrol.h" -#include "qmediacontrol_p.h" #include "qmediaplayer.h" QT_BEGIN_NAMESPACE @@ -93,8 +92,8 @@ QMediaPlayerControl::~QMediaPlayerControl() /*! Constructs a new media player control with the given \a parent. */ -QMediaPlayerControl::QMediaPlayerControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QMediaPlayerControl::QMediaPlayerControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h index 00704ab07..252c73d67 100644 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ b/src/multimedia/controls/qmediaplayercontrol.h @@ -40,7 +40,7 @@ #ifndef QMEDIAPLAYERCONTROL_H #define QMEDIAPLAYERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaplayer.h> #include <QtMultimedia/qmediatimerange.h> @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE class QMediaPlaylist; -class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index 87ace7017..8686d95a6 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE */ QMediaRecorderControl::QMediaRecorderControl(QObject* parent) - : QMediaControl(parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index a0529ce59..c8b283729 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -40,7 +40,7 @@ #ifndef QMEDIARECORDERCONTROL_H #define QMEDIARECORDERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediarecorder.h> QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index 2db9eb6fc..622c5e1cc 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qmediastreamscontrol.h" -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -84,7 +83,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaStreamControlMetaTypes) Constructs a new media streams control with the given \a parent. */ QMediaStreamsControl::QMediaStreamsControl(QObject *parent) - :QMediaControl(*new QMediaControlPrivate, parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index e2506882d..470783e03 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -41,7 +41,7 @@ #ifndef QMEDIASTREAMSCONTROL_H #define QMEDIASTREAMSCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmediaenumdebug.h> @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QObject { Q_OBJECT Q_ENUMS(SteamType) diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp index 4a85d56d0..7c8145ebe 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.cpp +++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qmediavideoprobecontrol.h" -#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE @@ -75,7 +74,7 @@ QT_BEGIN_NAMESPACE Create a new media video probe control object with the given \a parent. */ QMediaVideoProbeControl::QMediaVideoProbeControl(QObject *parent) - : QMediaControl(*new QMediaControlPrivate, parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h index 363975055..6d7bf2f2b 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ b/src/multimedia/controls/qmediavideoprobecontrol.h @@ -42,12 +42,12 @@ #ifndef QMEDIAVIDEOPROBECONTROL_H #define QMEDIAVIDEOPROBECONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> QT_BEGIN_NAMESPACE class QVideoFrame; -class Q_MULTIMEDIA_EXPORT QMediaVideoProbeControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMediaVideoProbeControl : public QObject { Q_OBJECT public: diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index f01ffec38..ff9e61f91 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -37,7 +37,6 @@ ** ****************************************************************************/ -#include "qmediacontrol_p.h" #include <qmetadatareadercontrol.h> QT_BEGIN_NAMESPACE @@ -88,8 +87,8 @@ QT_BEGIN_NAMESPACE for service specific meta data providers so this constructor is protected. */ -QMetaDataReaderControl::QMetaDataReaderControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QMetaDataReaderControl::QMetaDataReaderControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index b13c7ea00..f97af803e 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -40,7 +40,7 @@ #ifndef QMETADATAREADERCONTROL_H #define QMETADATAREADERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qtmultimediaglobal.h> @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QMetaDataReaderControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMetaDataReaderControl : public QObject { Q_OBJECT public: diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 6221edaa1..2c8b0d587 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -37,7 +37,6 @@ ** ****************************************************************************/ -#include "qmediacontrol_p.h" #include <qmetadatawritercontrol.h> QT_BEGIN_NAMESPACE @@ -87,8 +86,8 @@ QT_BEGIN_NAMESPACE for service specific meta data providers so this constructor is protected. */ -QMetaDataWriterControl::QMetaDataWriterControl(QObject *parent): - QMediaControl(*new QMediaControlPrivate, parent) +QMetaDataWriterControl::QMetaDataWriterControl(QObject *parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index a1d4449c3..b0e0b3624 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -40,7 +40,7 @@ #ifndef QMETADATAWRITERCONTROL_H #define QMETADATAWRITERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qtmultimediaglobal.h> @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QMetaDataWriterControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QMetaDataWriterControl : public QObject { Q_OBJECT public: diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp index 3472299ce..e3e14cd2d 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE Constructs a video device selector control with the given \a parent. */ QVideoDeviceSelectorControl::QVideoDeviceSelectorControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h index 2f9b91d44..34ac4c536 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.h +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -40,7 +40,7 @@ #ifndef QVIDEODEVICESELECTORCONTROL_H #define QVIDEODEVICESELECTORCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qcamera.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QVideoDeviceSelectorControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QVideoDeviceSelectorControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp index 64643f6db..af44da245 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.cpp +++ b/src/multimedia/controls/qvideoencodersettingscontrol.cpp @@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE Create a new video encoder settings control object with the given \a parent. */ QVideoEncoderSettingsControl::QVideoEncoderSettingsControl(QObject *parent) - :QMediaControl(parent) + :QObject(parent) { } diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index ac13833d1..53835f716 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -40,7 +40,7 @@ #ifndef QVIDEOENCODERSETTINGSCONTROL_H #define QVIDEOENCODERSETTINGSCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediarecorder.h> #include <QtCore/qpair.h> @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QVideoEncoderSettingsControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QVideoEncoderSettingsControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp index eee20d59e..585799ea3 100644 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ b/src/multimedia/controls/qvideorenderercontrol.cpp @@ -39,8 +39,6 @@ #include "qvideorenderercontrol.h" -#include "qmediacontrol_p.h" - QT_BEGIN_NAMESPACE /*! @@ -81,7 +79,7 @@ QT_BEGIN_NAMESPACE Constructs a new video renderer media end point with the given \a parent. */ QVideoRendererControl::QVideoRendererControl(QObject *parent) - : QMediaControl(parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h index 87552271a..caa5dd114 100644 --- a/src/multimedia/controls/qvideorenderercontrol.h +++ b/src/multimedia/controls/qvideorenderercontrol.h @@ -40,12 +40,12 @@ #ifndef QVIDEORENDERERCONTROL_H #define QVIDEORENDERERCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> QT_BEGIN_NAMESPACE class QAbstractVideoSurface; -class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QObject { Q_OBJECT diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp index a6b2bf407..6e73ddd97 100644 --- a/src/multimedia/controls/qvideowindowcontrol.cpp +++ b/src/multimedia/controls/qvideowindowcontrol.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE Constructs a new video window control with the given \a parent. */ QVideoWindowControl::QVideoWindowControl(QObject *parent) - : QMediaControl(parent) + : QObject(parent) { } diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h index 510a29989..3560cdfa8 100644 --- a/src/multimedia/controls/qvideowindowcontrol.h +++ b/src/multimedia/controls/qvideowindowcontrol.h @@ -40,7 +40,7 @@ #ifndef QVIDEOWINDOWCONTROL_H #define QVIDEOWINDOWCONTROL_H -#include <QtMultimedia/qmediacontrol.h> +#include <QtMultimedia/qmediaservice.h> #include <QtCore/qrect.h> #include <QtCore/qsize.h> #include <QtGui/qwindowdefs.h> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE // Required for QDoc workaround class QString; -class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl +class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QObject { Q_OBJECT diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 60e17b457..56f0b7658 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -15,7 +15,6 @@ INCLUDEPATH *= . PRIVATE_HEADERS += \ qtmultimediaglobal_p.h \ - qmediacontrol_p.h \ qmediaobject_p.h \ qmediapluginloader_p.h \ qmediaservice_p.h \ @@ -26,7 +25,6 @@ PRIVATE_HEADERS += \ PUBLIC_HEADERS += \ qtmultimediaglobal.h \ qmediabindableinterface.h \ - qmediacontrol.h \ qmediaenumdebug.h \ qmediametadata.h \ qmediaobject.h \ @@ -37,7 +35,6 @@ PUBLIC_HEADERS += \ SOURCES += \ qmediabindableinterface.cpp \ - qmediacontrol.cpp \ qmediametadata.cpp \ qmediaobject.cpp \ qmediapluginloader.cpp \ diff --git a/src/multimedia/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp deleted file mode 100644 index 6f0a980a2..000000000 --- a/src/multimedia/qmediacontrol.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtCore/qmetaobject.h> -#include <QtCore/qtimer.h> - -#include "qmediacontrol.h" -#include "qmediacontrol_p.h" - - - -QT_BEGIN_NAMESPACE - -/*! - \class QMediaControl - \obsolete - \inmodule QtMultimedia - - \ingroup multimedia - \ingroup multimedia_control - \ingroup multimedia_core - - \brief The QMediaControl class provides a base interface for media service controls. - - Media controls provide an interface to individual features provided by a - media service. Most services implement a principal control which exposes - the core functionality of the service and a number of optional controls which - expose any additional functionality. - - A pointer to a control implemented by a media service can be obtained using - the \l {QMediaService::requestControl()} member of QMediaService. If the - service doesn't implement a control it will instead return a null pointer. - - \snippet multimedia-snippets/media.cpp Request control - - Alternatively if the IId of the control has been declared using - Q_MEDIA_DECLARE_CONTROL the template version of - QMediaService::requestControl() can be used to request the service without - explicitly passing the IId or using qobject_cast(). - - \snippet multimedia-snippets/media.cpp Request control templated - - Most application code will not interface directly with a media service's - controls, instead the QMediaObject which owns the service acts as an - intermediary between one or more controls and the application. - - \sa QMediaService, QMediaObject -*/ - -/*! - \macro Q_MEDIA_DECLARE_CONTROL(Class, IId) - \relates QMediaControl - - The Q_MEDIA_DECLARE_CONTROL macro declares an \a IId for a \a Class that - inherits from QMediaControl. - - Declaring an IId for a QMediaControl allows an instance of that control to - be requested from QMediaService::requestControl() without explicitly - passing the IId. - - \snippet multimedia-snippets/media.cpp Request control templated - - \sa QMediaService::requestControl() -*/ - -/*! - Destroys a media control. -*/ - -QMediaControl::~QMediaControl() -{ - delete d_ptr; -} - -/*! - Constructs a media control with the given \a parent. -*/ - -QMediaControl::QMediaControl(QObject *parent) - : QObject(parent) - , d_ptr(new QMediaControlPrivate) -{ - d_ptr->q_ptr = this; -} - -/*! - \internal -*/ - -QMediaControl::QMediaControl(QMediaControlPrivate &dd, QObject *parent) - : QObject(parent) - , d_ptr(&dd) - -{ - d_ptr->q_ptr = this; -} - -QT_END_NAMESPACE - -#include "moc_qmediacontrol.cpp" diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h deleted file mode 100644 index 48ae44f8a..000000000 --- a/src/multimedia/qmediacontrol.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QABSTRACTMEDIACONTROL_H -#define QABSTRACTMEDIACONTROL_H - -#include <QtMultimedia/qtmultimediaglobal.h> - -#include <QtCore/qobject.h> -#include <QtCore/qstring.h> -#include <QtCore/qvariant.h> - - -QT_BEGIN_NAMESPACE - - -class QMediaControlPrivate; -class Q_MULTIMEDIA_EXPORT QMediaControl : public QObject -{ - Q_OBJECT - -public: - ~QMediaControl(); - -protected: - explicit QMediaControl(QObject *parent = nullptr); - explicit QMediaControl(QMediaControlPrivate &dd, QObject *parent = nullptr); - - QMediaControlPrivate *d_ptr; - -private: - Q_DECLARE_PRIVATE(QMediaControl) -}; - -template <typename T> const char *qmediacontrol_iid() { return nullptr; } - -#define Q_MEDIA_DECLARE_CONTROL(Class, IId) \ - template <> inline const char *qmediacontrol_iid<Class *>() { return IId; } - -QT_END_NAMESPACE - - -#endif // QABSTRACTMEDIACONTROL_H diff --git a/src/multimedia/qmediacontrol_p.h b/src/multimedia/qmediacontrol_p.h deleted file mode 100644 index e9827fd1e..000000000 --- a/src/multimedia/qmediacontrol_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QABSTRACTMEDIACONTROL_P_H -#define QABSTRACTMEDIACONTROL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <qtmultimediaglobal.h> - -QT_BEGIN_NAMESPACE - - -class QMediaControl; - -class QMediaControlPrivate -{ -public: - virtual ~QMediaControlPrivate() {} - - QMediaControl *q_ptr; -}; - -QT_END_NAMESPACE - - -#endif diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp index ad543acae..f40c4cea4 100644 --- a/src/multimedia/qmediaservice.cpp +++ b/src/multimedia/qmediaservice.cpp @@ -109,7 +109,7 @@ QMediaService::~QMediaService() } /*! - \fn QMediaControl* QMediaService::requestControl(const char *interface) + \fn QObject *QMediaService::requestControl(const char *interface) Returns a pointer to the media control implementing \a interface. @@ -133,7 +133,7 @@ QMediaService::~QMediaService() */ /*! - \fn void QMediaService::releaseControl(QMediaControl *control); + \fn void QMediaService::releaseControl(QObject *control); Releases a \a control back to the service. */ diff --git a/src/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h index f3e38630c..d28037baf 100644 --- a/src/multimedia/qmediaservice.h +++ b/src/multimedia/qmediaservice.h @@ -44,10 +44,12 @@ #include <QtCore/qobject.h> #include <QtCore/qstringlist.h> -#include <QtMultimedia/qmediacontrol.h> - QT_BEGIN_NAMESPACE +template <typename T> const char *qmediacontrol_iid() { return nullptr; } + +#define Q_MEDIA_DECLARE_CONTROL(Class, IId) \ + template <> inline const char *qmediacontrol_iid<Class *>() { return IId; } class QMediaServicePrivate; class Q_MULTIMEDIA_EXPORT QMediaService : public QObject @@ -57,10 +59,10 @@ class Q_MULTIMEDIA_EXPORT QMediaService : public QObject public: ~QMediaService(); - virtual QMediaControl* requestControl(const char *name) = 0; + virtual QObject* requestControl(const char *name) = 0; template <typename T> inline T requestControl() { - if (QMediaControl *control = requestControl(qmediacontrol_iid<T>())) { + if (QObject *control = requestControl(qmediacontrol_iid<T>())) { if (T typedControl = qobject_cast<T>(control)) return typedControl; releaseControl(control); @@ -68,7 +70,7 @@ public: return 0; } - virtual void releaseControl(QMediaControl *control) = 0; + virtual void releaseControl(QObject *control) = 0; protected: QMediaService(QObject* parent); diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 1cd6de7ef..8b9eb4836 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -328,7 +328,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) d->audioControl = qobject_cast<QAudioEncoderSettingsControl *>(service->requestControl(QAudioEncoderSettingsControl_iid)); d->videoControl = qobject_cast<QVideoEncoderSettingsControl *>(service->requestControl(QVideoEncoderSettingsControl_iid)); - QMediaControl *control = service->requestControl(QMetaDataWriterControl_iid); + QObject *control = service->requestControl(QMetaDataWriterControl_iid); if (control) { d->metaDataControl = qobject_cast<QMetaDataWriterControl *>(control); if (!d->metaDataControl) { diff --git a/src/multimedia/video/qvideosurfaceoutput.cpp b/src/multimedia/video/qvideosurfaceoutput.cpp index ebc9e1cb6..84b2743d3 100644 --- a/src/multimedia/video/qvideosurfaceoutput.cpp +++ b/src/multimedia/video/qvideosurfaceoutput.cpp @@ -85,7 +85,7 @@ bool QVideoSurfaceOutput::setMediaObject(QMediaObject *object) if (object) { if (QMediaService *service = object->service()) { - if (QMediaControl *control = service->requestControl(QVideoRendererControl_iid)) { + if (QObject *control = service->requestControl(QVideoRendererControl_iid)) { if ((m_control = qobject_cast<QVideoRendererControl *>(control))) { m_service = service; m_object = object; |