Clean up the videoOutput() API

The current API was rather messy, with multiple overloads.
Change this and make the videoOutput a QObject * based property.
To account for QVideoSink, add a videoSink()/setVideoSink()
overload.

This also helps identifying the correct sink in all cases.

Add some code to protect against deletion of the videoOutput
or videoSink from somewhere else.

Adjust autotests and fix the qquickvideooutput autotests.

With this change we are now passing all existing autotests
again on Linux/gstreamer.

Change-Id: I77b9863e88a7863abf27ab465fadd9c24f486502
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index b6ea41c36..e887f58c5 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -58,7 +58,7 @@ class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QMediaEncoderBase
     Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
     Q_PROPERTY(QMediaMetaData metaData READ metaData WRITE setMetaData NOTIFY metaDataChanged)
     Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged)
-    Q_PROPERTY(QVariant videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged)
+    Q_PROPERTY(QObject *videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged)
     Q_PROPERTY(QCamera camera READ camera)
 public:
 
@@ -101,11 +101,11 @@ public:
 
     QMediaCaptureSession *captureSession() const;
 
-    void setVideoOutput(const QVariant &output);
-    QVariant videoOutput() const;
-
     void setVideoOutput(QObject *output);
-    void setVideoOutput(QVideoSink *output);
+    QObject *videoOutput() const;
+
+    void setVideoSink(QVideoSink *output);
+    QVideoSink *videoSink() const;
 
 public Q_SLOTS:
     void record();