diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-11 17:10:20 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-17 08:26:52 +0000 |
| commit | 8eebc33834f0dabb66d30259e7fa7eaa74f25a9c (patch) | |
| tree | 2ae3b45491f5e01acc81ab32d640110e27aaaa06 /src/multimediawidgets/qvideowidget.h | |
| parent | 3441709ae88b8f373cb834bfceffa4545a50fbad (diff) | |
Remove QMediaSink inheritance from QVideoWidget
And remove some now unused code. We've lost the ability
to render to native window handles directly, but that should
be handled through QAbstractVideoSurface API additions.
Change-Id: I644a38ea045219e715dd77346bd4d94529df9b07
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimediawidgets/qvideowidget.h')
| -rw-r--r-- | src/multimediawidgets/qvideowidget.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 3a858077c..44f265b7b 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -52,11 +52,9 @@ class QMediaSource; class QVideoWidgetPrivate; class QAbstractVideoSurface; -class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaSink +class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget { Q_OBJECT - Q_INTERFACES(QMediaSink) - Q_PROPERTY(QMediaSource* mediaSource READ mediaSource WRITE setMediaSource) Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged) Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode) Q_PROPERTY(int brightness READ brightness WRITE setBrightness NOTIFY brightnessChanged) @@ -69,8 +67,6 @@ public: explicit QVideoWidget(QWidget *parent = nullptr); ~QVideoWidget(); - QMediaSource *mediaSource() const override; - QObject *asObject() override { return this; } Q_INVOKABLE QAbstractVideoSurface *videoSurface() const; #ifdef Q_QDOC @@ -112,14 +108,11 @@ protected: void moveEvent(QMoveEvent *event) override; void paintEvent(QPaintEvent *event) override; - bool setMediaSource(QMediaSource *object) override; - QVideoWidget(QVideoWidgetPrivate &dd, QWidget *parent); QVideoWidgetPrivate *d_ptr; private: Q_DECLARE_PRIVATE(QVideoWidget) - Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed()) Q_PRIVATE_SLOT(d_func(), void _q_brightnessChanged(int)) Q_PRIVATE_SLOT(d_func(), void _q_contrastChanged(int)) Q_PRIVATE_SLOT(d_func(), void _q_hueChanged(int)) |