summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-06-11 11:04:09 +0200
committerLars Knoll <lars.knoll@qt.io>2021-06-16 08:56:43 +0200
commit52c8d7efdd4f783097dcec6e66f3e076cdbc88ca (patch)
treee0575987b814769a4c33bae4fd2133b907db1657 /examples/multimediawidgets/camera
parentd58d93b8e45b2bf62221b104914df771849c007c (diff)
Kill the current QMediaRecorder class
The class provides only minimal convenience over using QMediaCaptureSession directly. Change-Id: I706bb6821fbf8a7cc79a86819001ee1fd669733e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera')
-rw-r--r--examples/multimediawidgets/camera/doc/src/camera.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index 68e19aac3..8792674b8 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -49,7 +49,7 @@ settings.
The Camera class contains an instance of \l {QCamera}, the API class interface to
the hardware. It also has an instance of \l {QCameraImageCapture} to take still images
-and an instance of \l {QMediaRecorder} to record video. It also contains the user
+and an instance of \l {QMediaEncoder} to record video. It also contains the user
interface object.
The Camera constructor does some basic initialization. The camera object is
@@ -59,7 +59,7 @@ the \e{setCamera()} function is called, passing in a \l {QByteArray}.
\e{setCamera()} sets up various connections between the user interface and the functionality
of the Camera class using signals and slots. It also instantiates and initializes the \l {QCamera},
-\l {QCameraImageCapture} and \l {QMediaRecorder} objects mentioned above. The still
+\l {QCameraImageCapture} and \l {QMediaEncoder} objects mentioned above. The still
and video recording visual tabs are enabled and finally the
\l {QCamera::start()}{start()} function of the \l{QCamera} object is called.
@@ -72,7 +72,7 @@ is QCamera::CaptureStillImage, or if the capture mode is for video then one
of two actions will occur. If the recording state shows that we are currently
recording then the \e{stop()} function is called resulting in a call to
\l {QCamera::stop()}, whereas if we are not recording then a video recording
-is started with a call to \l {QMediaRecorder::record()}.
+is started with a call to \l {QMediaEncoder::record()}.
\image camera-example.png