diff --git a/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc index bdf1590fe0458c8e7d3b36eff646ec4142ad314d..3c6a4e4d63c3f140221321e4d62447ca3602fc7e 100644 --- a/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc +++ b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc @@ -29,12 +29,11 @@ \example audiodevices \title Audio Devices Example \ingroup multimedia_examples - \brief The Audio Devices example shows the application of the audio devices - APIs. + \brief Testing the available audio devices and their configuration. - This example shows how to create a simple application to list and test - the configuration for the various audio devices available on the device - or machine. This is done using the QtMobility Multimedia API. + \e{Audio Devices} demonstrates how to create a simple application to list + and test the configuration for the various audio devices available on the + target device or desktop PC. \image audiodevices.png diff --git a/examples/multimedia/audioengine/doc/src/audioengine.qdoc b/examples/multimedia/audioengine/doc/src/audioengine.qdoc index 52a377130f03ca37bbfc7e5675364889fa989c38..19e903b2b945b84ca33d5a1b21e4848b2a477e5f 100644 --- a/examples/multimedia/audioengine/doc/src/audioengine.qdoc +++ b/examples/multimedia/audioengine/doc/src/audioengine.qdoc @@ -29,10 +29,9 @@ \example audioengine \title AudioEngine Example \ingroup multimedia_examples - \brief The Audio Engine example demonstrates 3D sound control using - the Qt Audio Engine API. + \brief Enabling 3D sound control using the Qt Audio Engine API. - The Audio Engine example demonstrates 3D sound control using the + \e{Audio Engine} demonstrates 3D sound control using the \l{Qt Audio Engine QML Types}{Qt Audio Engine} API. \include examples-run.qdocinc diff --git a/examples/multimedia/audioinput/doc/src/audioinput.qdoc b/examples/multimedia/audioinput/doc/src/audioinput.qdoc index 11a513a99a449a80c1d4873572b53b05fa9bd848..fad40aa6ef3976ab2329530955f4a0b1297a596b 100644 --- a/examples/multimedia/audioinput/doc/src/audioinput.qdoc +++ b/examples/multimedia/audioinput/doc/src/audioinput.qdoc @@ -29,8 +29,9 @@ \example audioinput \title Audio Input Example \ingroup multimedia_examples - \brief The Audio Input Example shows the use of the QAudioInput class. - The example demonstrates the basic use cases of the QAudioInput class. + \brief Recording audio using the QAudioInput class + + \e{Audio Input} demonstrates the basic use cases of QAudioInput. \image audioinput-example.png diff --git a/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc index 60c9d00d4c53db717b88c83805eafca5cac80aad..c9c69ed99d21b5d7245c30d182915ebd3c96b1d1 100644 --- a/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc +++ b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc @@ -29,10 +29,9 @@ \example audiooutput \title Audio Output Example \ingroup multimedia_examples - \brief The Audio Output Example show the use of the QAudioOutput API. + \brief Enabling audio playback using the QAudioOutput class. - The example demonstrates the basic use cases of the QAudioOutput class from - \l{Qt Multimedia}. + \e{Audio Output} demonstrates the basic use cases of QAudioOutput. \image audiooutput-example.png diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc index 35f6c051126c8f6b1e637cc4abd1ddd139e78cd2..317bd58354820c747b7f811ccdf0e8ed25186bad 100644 --- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc +++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc @@ -29,10 +29,10 @@ \example audiorecorder \title Audio Recorder Example \ingroup multimedia_examples - \brief The Audio Recorder Example shows how to create a simple audio recorder. + \brief Discovering the available devices and supported codecs. - It demonstrates the discovery of the supported devices and codecs and the use - of recording functions in the QAudioRecorder class. + \e{Audio Recorder} demonstrates how to identify the available devices and + supported codecs, and the use of QAudioRecorder class. \image audiorecorder.png diff --git a/examples/multimedia/spectrum/doc/src/spectrum.qdoc b/examples/multimedia/spectrum/doc/src/spectrum.qdoc index 3c846afdc88a51692f2068de9cd15d14b9191a03..b0adfac6bf95df97d2e15ac5673467b3bbcfa4ce 100644 --- a/examples/multimedia/spectrum/doc/src/spectrum.qdoc +++ b/examples/multimedia/spectrum/doc/src/spectrum.qdoc @@ -29,10 +29,11 @@ \example spectrum \title Spectrum Example \ingroup multimedia_examples - \brief The Spectrum Example uses a combination multimedia APIs to process microphone input. + \brief Analyzing a raw audio stream using the FFTReal library. - The Spectrum Analyzer example shows how the \l{Qt Multimedia} module can be - used to record and then play back an audio stream. + \e Spectrum demonstrates how the \l{Qt Multimedia} module can be used to + analyze an audio stream while recording it, and also play the recorded + stream. \image spectrum-demo.png diff --git a/examples/multimedia/video/doc/src/qmlvideo.qdoc b/examples/multimedia/video/doc/src/qmlvideo.qdoc index 5ffb542fd1043389e114c62d1995c6b9f1a4a963..e50e5775a42c9a333dd1d4347094ff6071bcb484 100644 --- a/examples/multimedia/video/doc/src/qmlvideo.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideo.qdoc @@ -29,13 +29,11 @@ \example video/qmlvideo \title QML Video Example \ingroup multimedia_examples +\brief Transforming video and camera viewfinder content. -\brief The QML Video Example demonstrates the various manipulations (move; -resize; rotate; change aspect ratio) which can be applied to QML \l{VideoOutput} -items. - -This example demonstrates the various manipulations (move; resize; rotate; -change aspect ratio) which can be applied to QML \l{VideoOutput} items. +\e{QML Video} demonstrates the various transformations (move; resize; rotate; +change aspect ratio) that can be applied to QML \l VideoOutput and \l Camera +types. It also shows how native code can be combined with QML to implement more advanced functionality - in this case, C++ code is used to calculate the QML diff --git a/examples/multimedia/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc index b24114084bea1d7c095c2cb0a61cf5f2af8cabeb..52b5d78431e15dcdb7b8526f0c6174badaad0282 100644 --- a/examples/multimedia/video/doc/src/qmlvideofx.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideofx.qdoc @@ -30,23 +30,21 @@ \title QML Video Shader Effects Example \ingroup multimedia_examples -\brief The QML Video Shader Effects Example shows how \l {ShaderEffect} -can be used to apply postprocessing effects, expressed in \c GLSL, to video -and camera viewfinder content. +\brief Applying shader effects on video and camera viewfinder content. \include examples-run.qdocinc \section1 Overview -This example shows how a \l {ShaderEffect} can be used to apply -postprocessing effects, expressed in GLSL, to QML \l {VideoOutput} items. +\e{QML Video Shader Effects} demonstrates how a \l ShaderEffect can be used to +apply postprocessing effects, expressed in GLSL, to QML \l VideoOutput type. It also shows how native code can be combined with QML to implement more advanced functionality - in this case, C++ code is used to calculate the QML frame rate. This value is rendered in QML in a semi-transparent item overlaid on the video content. -The following screenshots show shader effects being applied. In each case, +The following screenshots show shader effects being applied. In each case, the effect is implemented using a fragment shader. Here we see an edge detection algorithm being applied to a video clip diff --git a/examples/multimediawidgets/player/doc/src/player.qdoc b/examples/multimediawidgets/player/doc/src/player.qdoc index 29121dce4c9f8a8a85fe32935889db222913fd32..ac5d700da3d87e3561f9137db38716dbc3d4331c 100644 --- a/examples/multimediawidgets/player/doc/src/player.qdoc +++ b/examples/multimediawidgets/player/doc/src/player.qdoc @@ -29,10 +29,10 @@ \example player \title Media Player Example \ingroup multimedia_examples - \brief Demonstrates the audio and video playback functionality + \brief Playing audio and video. - This example creates a simple multimedia player. We can play audio and - or video files using various codecs. + \e{Media Player} demonstrates a simple multimedia player that can play + audio and or video files using various codecs. \include examples-run.qdocinc @@ -40,10 +40,9 @@ control the video output. To give the application playlist capability we also use a QPlayList object. - To activate the various functions such as play and stop on the dialog - we connect clicked() signals to slots that emit the play() and stop() - signals and in turn which we connect to the play() and stop() slots in - QMediaPlayer. + To activate the various functions such as play and stop on the dialog, + the button clicked events emit the play() and stop() signals, which + are connected to the play() and stop() slots of QMediaPlayer. \code connect(controls, SIGNAL(play()), player, SLOT(play())); diff --git a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc index 1e392ce8c364a28fcd19dcb33011c83a91cbe930..7cc2cdc87519cb3b47aba24c6e5539bc8295d3e4 100644 --- a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc +++ b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc @@ -29,10 +29,10 @@ \example videographicsitem \title Video Graphics Item Example \ingroup multimedia_examples -\brief This example demonstrates how to stream video on a graphics scene. +\brief Streaming video on a graphics scene. - The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a - graphics scene using \l{Qt Multimedia}'s QAbstractVideoSurface. + \e{Video Graphics Item} demonstrates how to implement a QGraphicsItem that + displays video on a graphics scene using QAbstractVideoSurface. \image video-videographicsitem.png diff --git a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc index 6b93a3c1986d89291c68f59e7826f42db0114a5b..2a991d0fa089177fdda93478fbe05beeb853fd0f 100644 --- a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc +++ b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc @@ -29,10 +29,10 @@ \example videowidget \title Video Widget Example \ingroup multimedia_examples - \brief This example is a simple video player + \brief Implementing a video player widget. - The Video Widget example denonstrates how to implement a video widget using - \l{Qt Multimedia}'s QAbstractVideoSurface. + \e{Video Widget} demonstrates how to implement a video widget using + QAbstractVideoSurface. \image video-videowidget.png