diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc | 8 | ||||
-rw-r--r-- | examples/multimediawidgets/camera/doc/src/camera.qdoc | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc index 89dc717e6..c96066687 100644 --- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc +++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc @@ -76,11 +76,9 @@ will have the text "Resume". Pressing the buttons will also result in a toggle based on the state. If - recording is stopped, then pressing the record button will setup the - \l{QAudioEncoderSettings} based on the values of the selection lists, - will set the encoding settings and container on the \c audioRecorder - object, and start recording using the - \l{QMediaRecorder::record()}{record()} method. + recording is stopped, then pressing the record button will set the encoding + settings and container on the \c audioRecorder object, and start recording + using the \l{QMediaRecorder::record()}{record()} method. \code QMediaFormat format; diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc index 99d626ee6..4db430fc3 100644 --- a/examples/multimediawidgets/camera/doc/src/camera.qdoc +++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc @@ -72,13 +72,10 @@ object is called. Now that the camera is ready for user commands it waits for a suitable event. Such an event can be a key press of either the \l {Qt::Key_CameraFocus} or \l {Qt::Key_Camera} buttons on the application window. Camera focus will -simply display the preview and lock the camera settings. Key_Camera will -either call \e{takeImage()} if capturing still images, 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()}. +simply display the preview and lock the camera settings. \c Key_Camera will +either call \e{takeImage()} if doing an image capture, or call +\c record() or \c stop() (if already recording) on the QMediaRecorder instance +when recording video. \image camera-example.png |