From 3bf7a86c07df424df87fa12e224a96cb85596a28 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 14 Dec 2012 13:39:53 +0100 Subject: [PATCH] Doc: Fixed broken links to the Multimedia examples - Updated the example links to reflect the new directory structure for the multimedia examples. - Removed a broken link to audiodecoder example as it doesn't have a qdoc page yet. Change-Id: Ia1169eeb80b4e6b6f92cd070aecbe72ce696bb6a Reviewed-by: Martin Smith Reviewed-by: Jerome Pasion --- src/multimedia/doc/src/multimedia.qdoc | 27 ++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index b5d967f6..5afa9f6a 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -81,51 +81,54 @@ For some quick recipes for specific tasks, look at the overviews above and consu \row \li Playing a sound effect \li - \li \l SoundEffect + \li \li QSoundEffect \row \li Playing low latency audio - \li \l{audiooutput}, \l{spectrum} + \li \l{multimedia/audiooutput}{audioinput}, \l{multimedia/spectrum}{spectrum} \li \li QAudioOutput \row \li Playing encoded audio (MP3, AAC etc) - \li \l{player} + \li \l{multimediawidgets/player}{player} \li \l Audio, \l {MediaPlayer} \li QMediaPlayer \row \li Accessing raw audio input data - \li \l{spectrum}, \l audioinput + \li \l{multimedia/spectrum}{spectrum}, \l {multimedia/audioinput}{audioinput} \li \li QAudioInput \row \li Recording encoded audio data - \li \l audiorecorder + \li \l {multimedia/audiorecorder}{audiorecorder} \li \li QAudioRecorder \row \li Discovering raw audio devices - \li \l audiodevices + \li \l {multimedia/audiodevices}{audiodevices} \li \li QAudioDeviceInfo \row \li Video Playback - \li \l {player}, \l {video/qmlvideo}{qmlvideo}, \l{video/qmlvideofx}{qmlvideofx} + \li \l {multimediawidgets/player}{player}, + \l {multimedia/video/qmlvideo}{qmlvideo}, + \l{multimedia/video/qmlvideofx}{qmlvideofx} \li \l MediaPlayer, \l VideoOutput, \l Video \li QMediaPlayer, QVideoWidget, QGraphicsVideoItem \row \li Video Processing - \li \l {video/qmlvideofx}{qmlvideofx} + \li \l {multimedia/video/qmlvideofx}{qmlvideofx} \li \l {MediaPlayer}, \l VideoOutput \li QMediaPlayer, QAbstractVideoSurface, QVideoFrame \row \li Listening to the radio - \li \l declarative-radio + \li \l {multimedia/declarative-radio}{declarative-radio} \li \l Radio, \l RadioData \li QRadioTuner, QRadioData \row \li Accessing camera viewfinder - \li \l {Camera Example}{camera}, \l declarative-camera + \li \l {Camera Example}{camera}, + \l {multimediawidgets/declarative-camera}{declarative-camera} \li \l Camera, \l VideoOutput \li QCamera, QVideoWidget, QGraphicsVideoItem \row @@ -135,12 +138,12 @@ For some quick recipes for specific tasks, look at the overviews above and consu \li QCamera, QAbstractVideoSurface, QVideoFrame \row \li Capturing photos - \li \l {Camera Example}{camera}, \l declarative-camera + \li \l {Camera Example}{camera}, \l {multimediawidgets/declarative-camera}{declarative-camera} \li \l Camera \li QCamera, QCameraImageCapture \row \li Capturing movies - \li \l {Camera Example}{camera}, \l declarative-camera + \li \l {Camera Example}{camera}, \l {multimediawidgets/declarative-camera}{declarative-camera} \li \l Camera \li QCamera, QMediaRecorder \row