diff options
17 files changed, 48 insertions, 49 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 1b1d1f146..9a26ebb51 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -55,7 +55,7 @@ qt_add_module(Multimedia playback/qmediaplayer.cpp playback/qmediaplayer.h playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h - qmediabindableinterface.cpp qmediabindableinterface.h + qmediasink.cpp qmediasink.h qmediaenumdebug.h qmediametadata.cpp qmediametadata.h qmediaobject.cpp qmediaobject.h qmediaobject_p.h diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index 62996e370..2915553f4 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -42,7 +42,7 @@ #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaencodersettings.h> -#include <QtMultimedia/qmediabindableinterface.h> +#include <QtMultimedia/qmediasink.h> #include <QtMultimedia/qvideoframe.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 56f0b7658..5d68d353c 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -24,7 +24,7 @@ PRIVATE_HEADERS += \ PUBLIC_HEADERS += \ qtmultimediaglobal.h \ - qmediabindableinterface.h \ + qmediasink.h \ qmediaenumdebug.h \ qmediametadata.h \ qmediaobject.h \ @@ -34,7 +34,7 @@ PUBLIC_HEADERS += \ qmultimedia.h SOURCES += \ - qmediabindableinterface.cpp \ + qmediasink.cpp \ qmediametadata.cpp \ qmediaobject.cpp \ qmediapluginloader.cpp \ diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index a902af10e..cd39fd821 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -44,7 +44,7 @@ #include <QtMultimedia/qmediacontent.h> #include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediabindableinterface.h> +#include <QtMultimedia/qmediasink.h> #include <QtMultimedia/qmediaenumdebug.h> diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index a9a7d7cb6..825c64622 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -44,7 +44,7 @@ #include <qmediaservice.h> #include <qmetadatareadercontrol.h> -#include <qmediabindableinterface.h> +#include <qmediasink.h> QT_BEGIN_NAMESPACE @@ -164,13 +164,13 @@ void QMediaObject::setNotifyInterval(int milliSeconds) that wrap this functionality, so this function rarely needs to be called directly. - The object passed must implement the QMediaBindableInterface interface. + The object passed must implement the QMediaSink interface. - \sa QMediaBindableInterface + \sa QMediaSink */ bool QMediaObject::bind(QObject *object) { - QMediaBindableInterface *helper = qobject_cast<QMediaBindableInterface*>(object); + QMediaSink *helper = qobject_cast<QMediaSink*>(object); if (!helper) return false; @@ -192,11 +192,11 @@ bool QMediaObject::bind(QObject *object) will be generated if the object was not previously bound to this object. - \sa QMediaBindableInterface + \sa QMediaSink */ void QMediaObject::unbind(QObject *object) { - QMediaBindableInterface *helper = qobject_cast<QMediaBindableInterface*>(object); + QMediaSink *helper = qobject_cast<QMediaSink*>(object); if (helper && helper->mediaObject() == this) helper->setMediaObject(nullptr); diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index 949077689..790353caf 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QMediaService; -class QMediaBindableInterface; +class QMediaSink; class QMediaObjectPrivate; class Q_MULTIMEDIA_EXPORT QMediaObject : public QObject diff --git a/src/multimedia/qmediabindableinterface.cpp b/src/multimedia/qmediasink.cpp index 8a6b9fadd..0ce2a8ace 100644 --- a/src/multimedia/qmediabindableinterface.cpp +++ b/src/multimedia/qmediasink.cpp @@ -37,19 +37,19 @@ ** ****************************************************************************/ -#include <qmediabindableinterface.h> +#include <qmediasink.h> QT_BEGIN_NAMESPACE /*! - \class QMediaBindableInterface + \class QMediaSink \inmodule QtMultimedia \ingroup multimedia \ingroup multimedia_core - \brief The QMediaBindableInterface class is the base class for objects extending media objects functionality. + \brief The QMediaSink class is the base class for objects extending media objects functionality. \sa */ @@ -58,19 +58,19 @@ QT_BEGIN_NAMESPACE Destroys a media helper object. */ -QMediaBindableInterface::~QMediaBindableInterface() +QMediaSink::~QMediaSink() { } /*! - \fn QMediaBindableInterface::mediaObject() const; + \fn QMediaSink::mediaObject() const; Return the currently attached media object. */ /*! - \fn QMediaBindableInterface::setMediaObject(QMediaObject *object); + \fn QMediaSink::setMediaObject(QMediaObject *object); Attaches to the media \a object. Returns true if attached successfully, otherwise returns false. diff --git a/src/multimedia/qmediabindableinterface.h b/src/multimedia/qmediasink.h index ce0d0822e..e32f56380 100644 --- a/src/multimedia/qmediabindableinterface.h +++ b/src/multimedia/qmediasink.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMEDIABINDABLEINTERFACE_H -#define QMEDIABINDABLEINTERFACE_H +#ifndef QMEDIASINK_H +#define QMEDIASINK_H #include <QtMultimedia/qmediaobject.h> @@ -47,10 +47,10 @@ QT_BEGIN_NAMESPACE class QMediaObject; -class Q_MULTIMEDIA_EXPORT QMediaBindableInterface +class Q_MULTIMEDIA_EXPORT QMediaSink { public: - virtual ~QMediaBindableInterface(); + virtual ~QMediaSink(); virtual QMediaObject *mediaObject() const = 0; @@ -59,11 +59,10 @@ protected: virtual bool setMediaObject(QMediaObject *object) = 0; }; -#define QMediaBindableInterface_iid \ - "org.qt-project.qt.mediabindable/5.0" -Q_DECLARE_INTERFACE(QMediaBindableInterface, QMediaBindableInterface_iid) +#define QMediaSink_iid "org.qt-project.qt.mediasink/5.0" +Q_DECLARE_INTERFACE(QMediaSink, QMediaSink_iid) QT_END_NAMESPACE -#endif // QMEDIABINDABLEINTERFACE_H +#endif // QMEDIASINK_H diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index ef959860b..26be71e13 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -43,7 +43,7 @@ #include <QtMultimedia/qmultimedia.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaencodersettings.h> -#include <QtMultimedia/qmediabindableinterface.h> +#include <QtMultimedia/qmediasink.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtCore/qpair.h> @@ -62,10 +62,10 @@ class QAudioEncoderSettings; class QVideoEncoderSettings; class QMediaRecorderPrivate; -class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QObject, public QMediaBindableInterface +class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QObject, public QMediaSink { Q_OBJECT - Q_INTERFACES(QMediaBindableInterface) + Q_INTERFACES(QMediaSink) Q_ENUMS(State) Q_ENUMS(Status) Q_ENUMS(Error) diff --git a/src/multimedia/video/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h index 5d050bcb0..9cec4cd60 100644 --- a/src/multimedia/video/qvideosurfaceoutput_p.h +++ b/src/multimedia/video/qvideosurfaceoutput_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <qmediabindableinterface.h> +#include <qmediasink.h> #include <QtCore/qsharedpointer.h> #include <QtCore/qpointer.h> @@ -62,10 +62,10 @@ QT_BEGIN_NAMESPACE class QAbstractVideoSurface; class QVideoRendererControl; -class QVideoSurfaceOutput : public QObject, public QMediaBindableInterface +class QVideoSurfaceOutput : public QObject, public QMediaSink { Q_OBJECT - Q_INTERFACES(QMediaBindableInterface) + Q_INTERFACES(QMediaSink) public: QVideoSurfaceOutput(QObject *parent = nullptr); ~QVideoSurfaceOutput(); diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 621a9852f..244c60729 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -43,7 +43,7 @@ #include <QtWidgets/qgraphicsitem.h> #include <QtMultimediaWidgets/qvideowidget.h> -#include <QtMultimedia/qmediabindableinterface.h> +#include <QtMultimedia/qmediasink.h> #if QT_CONFIG(graphicsview) @@ -51,10 +51,10 @@ QT_BEGIN_NAMESPACE class QVideoSurfaceFormat; class QGraphicsVideoItemPrivate; -class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaBindableInterface +class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaSink { Q_OBJECT - Q_INTERFACES(QMediaBindableInterface) + Q_INTERFACES(QMediaSink) Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject) Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode) Q_PROPERTY(QPointF offset READ offset WRITE setOffset) diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index cabe5e840..81cee1771 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -43,7 +43,7 @@ #include <QtWidgets/qwidget.h> #include <QtMultimediaWidgets/qtmultimediawidgetdefs.h> -#include <QtMultimedia/qmediabindableinterface.h> +#include <QtMultimedia/qmediasink.h> QT_BEGIN_NAMESPACE @@ -52,10 +52,10 @@ class QMediaObject; class QVideoWidgetPrivate; class QAbstractVideoSurface; -class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBindableInterface +class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaSink { Q_OBJECT - Q_INTERFACES(QMediaBindableInterface) + Q_INTERFACES(QMediaSink) Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObject) Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged) Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode) diff --git a/tests/auto/unit/CMakeLists.txt b/tests/auto/unit/CMakeLists.txt index d15bc3fcf..e4e201356 100644 --- a/tests/auto/unit/CMakeLists.txt +++ b/tests/auto/unit/CMakeLists.txt @@ -9,7 +9,7 @@ add_subdirectory(qaudionamespace) add_subdirectory(qcamera) add_subdirectory(qcamerainfo) add_subdirectory(qcameraimagecapture) -add_subdirectory(qmediabindableinterface) +add_subdirectory(qmediasink) add_subdirectory(qmediacontainercontrol) add_subdirectory(qmediacontent) add_subdirectory(qmediaobject) diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro index f9cd0ac29..48575c37c 100644 --- a/tests/auto/unit/multimedia.pro +++ b/tests/auto/unit/multimedia.pro @@ -9,7 +9,7 @@ SUBDIRS += \ qcamera \ qcamerainfo \ qcameraimagecapture \ - qmediabindableinterface \ + qmediasink \ qmediacontainercontrol \ qmediacontent \ qmediaobject \ diff --git a/tests/auto/unit/qmediabindableinterface/CMakeLists.txt b/tests/auto/unit/qmediasink/CMakeLists.txt index dcbb2fda8..08e917a9c 100644 --- a/tests/auto/unit/qmediabindableinterface/CMakeLists.txt +++ b/tests/auto/unit/qmediasink/CMakeLists.txt @@ -1,10 +1,10 @@ -# Generated from qmediabindableinterface.pro. +# Generated from qmediasink.pro. ##################################################################### -## tst_qmediabindableinterface Test: +## tst_qmediasink Test: ##################################################################### -qt_add_test(tst_qmediabindableinterface +qt_add_test(tst_qmediasink SOURCES ../qmultimedia_common/mockaudioencodercontrol.h ../qmultimedia_common/mockaudioinputselector.h @@ -18,7 +18,7 @@ qt_add_test(tst_qmediabindableinterface ../qmultimedia_common/mockmetadatareadercontrol.h ../qmultimedia_common/mockmetadatawritercontrol.h ../qmultimedia_common/mockvideoencodercontrol.h - tst_qmediabindableinterface.cpp + tst_qmediasink.cpp INCLUDE_DIRECTORIES ../../../../src/multimedia ../../../src/multimedia diff --git a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/unit/qmediasink/qmediasink.pro index 98dd0eca7..0a34e0f0a 100644 --- a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro +++ b/tests/auto/unit/qmediasink/qmediasink.pro @@ -1,10 +1,10 @@ CONFIG += testcase -TARGET = tst_qmediabindableinterface +TARGET = tst_qmediasink QT += multimedia-private testlib SOURCES += \ - tst_qmediabindableinterface.cpp + tst_qmediasink.cpp include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mockrecorder.pri) diff --git a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp b/tests/auto/unit/qmediasink/tst_qmediasink.cpp index 7482a206d..035af42e6 100644 --- a/tests/auto/unit/qmediabindableinterface/tst_qmediabindableinterface.cpp +++ b/tests/auto/unit/qmediasink/tst_qmediasink.cpp @@ -81,7 +81,7 @@ public: bool hasControls; }; -class tst_QMediaBindableInterface:public QObject +class tst_QMediaSink:public QObject { Q_OBJECT private slots: @@ -120,5 +120,5 @@ private slots: } }; -QTEST_MAIN(tst_QMediaBindableInterface) -#include "tst_qmediabindableinterface.moc" +QTEST_MAIN(tst_QMediaSink) +#include "tst_qmediasink.moc" |