summaryrefslogtreecommitdiffstats
path: root/src/multimedia/recording/qmediarecorder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/recording/qmediarecorder.cpp')
-rw-r--r--src/multimedia/recording/qmediarecorder.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 3a2fe5315..72e9b199b 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -460,12 +460,7 @@ QMediaCaptureSession *QMediaRecorder::captureSession() const
return d->captureSession;
}
-void QMediaRecorder::setVideoOutput(const QVariant &output)
-{
- d_ptr->captureSession->setVideoOutput(output);
-}
-
-QVariant QMediaRecorder::videoOutput() const
+QObject *QMediaRecorder::videoOutput() const
{
return d_ptr->captureSession->videoOutput();
}
@@ -475,11 +470,17 @@ void QMediaRecorder::setVideoOutput(QObject *output)
d_ptr->captureSession->setVideoOutput(output);
}
-void QMediaRecorder::setVideoOutput(QVideoSink *output)
+void QMediaRecorder::setVideoSink(QVideoSink *output)
{
- d_ptr->captureSession->setVideoOutput(output);
+ d_ptr->captureSession->setVideoSink(output);
}
+QVideoSink *QMediaRecorder::videoSink() const
+{
+ return d_ptr->captureSession->videoSink();
+}
+
+
/*!
\fn QMediaRecorder::videoOutputChanged()