diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-14 15:03:30 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-15 08:49:26 +0200 |
commit | e975897ad7ebbad12f023e83eae8c4b7840ad6ed (patch) | |
tree | 94f3d7b9207d497c5efb189470e9012db2829302 | |
parent | c88abd01775ea26f9552b89694ffb95b770af407 (diff) | |
download | qtmultimedia-e975897ad7ebbad12f023e83eae8c4b7840ad6ed.tar.gz |
Tweak the controls documentation.
Also move the qaudioendpointselector control into controls.
Change-Id: Ia21f98a683eb38a9c11c42f6e7901d7d841aae90
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
38 files changed, 37 insertions, 37 deletions
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri index de61115d3..dec892a84 100644 --- a/src/multimedia/controls/controls.pri +++ b/src/multimedia/controls/controls.pri @@ -4,6 +4,7 @@ INCLUDEPATH += controls PUBLIC_HEADERS += \ controls/qaudiodecodercontrol.h \ controls/qaudioencodercontrol.h \ + controls/qaudioendpointselector.h \ controls/qcameracapturebufferformatcontrol.h \ controls/qcameracapturedestinationcontrol.h \ controls/qcameracontrol.h \ @@ -41,6 +42,7 @@ PRIVATE_HEADERS += \ SOURCES += \ controls/qaudioencodercontrol.cpp \ + controls/qaudioendpointselector.cpp \ controls/qcameracapturebufferformatcontrol.cpp \ controls/qcameracapturedestinationcontrol.cpp \ controls/qcameracontrol.cpp \ diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp index a44824883..4e8ce7f2b 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.cpp +++ b/src/multimedia/controls/qaudiodecodercontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \class QAudioDecoderControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QAudioDecoderControl class provides access to the audio decoding diff --git a/src/multimedia/controls/qaudioencodercontrol.cpp b/src/multimedia/controls/qaudioencodercontrol.cpp index 4224ff7bf..92f9e350d 100644 --- a/src/multimedia/controls/qaudioencodercontrol.cpp +++ b/src/multimedia/controls/qaudioencodercontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \class QAudioEncoderControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QAudioEncoderControl class provides access to the settings of a diff --git a/src/multimedia/playback/qaudioendpointselector.cpp b/src/multimedia/controls/qaudioendpointselector.cpp index 21104ec6c..ff5c6e8a9 100644 --- a/src/multimedia/playback/qaudioendpointselector.cpp +++ b/src/multimedia/controls/qaudioendpointselector.cpp @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE \brief The QAudioEndpointSelector class provides an audio endpoint selector media control. \inmodule QtMultimedia - \ingroup multimedia \ingroup multimedia_control The QAudioEndpointSelector class provides descriptions of the audio diff --git a/src/multimedia/playback/qaudioendpointselector.h b/src/multimedia/controls/qaudioendpointselector.h index 97c9f00a6..97c9f00a6 100644 --- a/src/multimedia/playback/qaudioendpointselector.h +++ b/src/multimedia/controls/qaudioendpointselector.h diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp index 108a2f9af..0a387aaf6 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE The format is of type QVideoFrame::PixelFormat. \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The interface name of QCameraCaptureBufferFormatControl is \c org.qt-project.qt.cameracapturebufferformatcontrol/5.0 as diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp index 1740120b9..8035651c9 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE Depending on backend capabilities capture to file, buffer or both can be supported. \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The interface name of QCameraCaptureDestinationControl is \c org.qt-project.qt.cameracapturedestinationcontrol/5.0 as diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp index a8d8ccdf7..a44854d74 100644 --- a/src/multimedia/controls/qcameracontrol.cpp +++ b/src/multimedia/controls/qcameracontrol.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE classes that control still cameras or video cameras. \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control This service is provided by a QMediaService object via diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp index b36c9f474..dcb90fc5c 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ b/src/multimedia/controls/qcameraexposurecontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \brief The QCameraExposureControl class allows controlling camera exposure parameters. \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The QCameraExposure class is the usual method of adjusting exposure related parameters diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.cpp b/src/multimedia/controls/qcamerafeedbackcontrol.cpp index 0fc390fdb..6967a7ee5 100644 --- a/src/multimedia/controls/qcamerafeedbackcontrol.cpp +++ b/src/multimedia/controls/qcamerafeedbackcontrol.cpp @@ -50,7 +50,7 @@ \brief The QCameraFeedbackControl class allows controlling feedback (sounds etc) during camera operation \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \since 5.0 diff --git a/src/multimedia/controls/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp index b98a9fa39..5bce37da4 100644 --- a/src/multimedia/controls/qcameraflashcontrol.cpp +++ b/src/multimedia/controls/qcameraflashcontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control You can set the type of flash effect used when an image is captured, and test to see diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp index 38276daf8..e2aef5180 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ b/src/multimedia/controls/qcamerafocuscontrol.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The interface name of QCameraFocusControl is \c org.qt-project.qt.camerafocuscontrol/5.0 as diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index da28fdcac..edc09ca0b 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The interface name of QCameraImageCaptureControl is \c org.qt-project.qt.cameraimagecapturecontrol/5.0 as diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp index e6a1b5ac7..337e071d0 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp @@ -60,7 +60,7 @@ namespace \class QCameraImageProcessingControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp index cefb8ceaf..b3ad99197 100644 --- a/src/multimedia/controls/qcameralockscontrol.cpp +++ b/src/multimedia/controls/qcameralockscontrol.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control This service is provided by a QMediaService object via diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp index 430bc938c..14557b54d 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QCameraViewfinderSettingsControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qcamerazoomcontrol.cpp b/src/multimedia/controls/qcamerazoomcontrol.cpp index d1a078607..a314ca56b 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.cpp +++ b/src/multimedia/controls/qcamerazoomcontrol.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The interface name of QCameraZoomControl is \c org.qt-project.qt.camerazoomcontrol/5.0 as diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp index e1ac8a919..430d2c14d 100644 --- a/src/multimedia/controls/qimageencodercontrol.cpp +++ b/src/multimedia/controls/qimageencodercontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QImageEncoderControl class provides access to the settings of a media service that diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp index 834f6de62..ce1f60ed6 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp +++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QMediaAudioProbeControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QMediaAudioProbeControl class allows control over probing audio data in media objects. diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp index 9a0c1ca05..1610b0872 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp +++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control An instance of QMediaObject (or its derived classes) can report any changes diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index 0f41daaf6..73dacae7d 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control If a QMediaService supports writing encoded data it will implement diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp index 0230e0a7c..129043495 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp @@ -46,7 +46,7 @@ \class QMediaGaplessPlaybackControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QMediaGaplessPlaybackControl class provides access to the gapless playback diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp index 4554072e9..af03d5b3b 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities. \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The functionality provided by this control allows the diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index f8d172a43..867e8355b 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \class QMediaPlayerControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp index 9b0e06206..25767f31b 100644 --- a/src/multimedia/controls/qmediaplaylistcontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp index a5016df9c..78aa7461b 100644 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index 60414db60..aa12bfc8d 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QMediaRecorderControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QMediaRecorderControl class provides access to the recording diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index ba06b011d..5d62935d2 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -60,7 +60,7 @@ namespace \class QMediaStreamsControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QMediaStreamsControl class provides a media stream selection control. diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp index 67d6bf523..6e43f162f 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.cpp +++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QMediaVideoProbeControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QMediaVideoProbeControl class allows control over probing video frames in media objects. diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 01ba89ec6..edb155a4d 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \class QMetaDataReaderControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 1fa13f743..7b6fb0085 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \class QMetaDataWriterControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp index 8f56b161d..76ff855f4 100644 --- a/src/multimedia/controls/qradiodatacontrol.cpp +++ b/src/multimedia/controls/qradiodatacontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \class QRadioDataControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp index 573812c31..3e2a02a85 100644 --- a/src/multimedia/controls/qradiotunercontrol.cpp +++ b/src/multimedia/controls/qradiotunercontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \class QRadioTunerControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control diff --git a/src/multimedia/controls/qvideodevicecontrol.cpp b/src/multimedia/controls/qvideodevicecontrol.cpp index f9fa0e9ec..d7941e5f7 100644 --- a/src/multimedia/controls/qvideodevicecontrol.cpp +++ b/src/multimedia/controls/qvideodevicecontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \brief The QVideoDeviceControl class provides an video device selector media control. \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control The QVideoDeviceControl class provides descriptions of the video devices diff --git a/src/multimedia/controls/qvideoencodercontrol.cpp b/src/multimedia/controls/qvideoencodercontrol.cpp index b69909043..29f87e8ec 100644 --- a/src/multimedia/controls/qvideoencodercontrol.cpp +++ b/src/multimedia/controls/qvideoencodercontrol.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QVideoEncoderControl class provides access to the settings diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp index 4ee4a51fd..2e62ef6d1 100644 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ b/src/multimedia/controls/qvideorenderercontrol.cpp @@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE \class QVideoRendererControl \inmodule QtMultimedia + \brief The QVideoRendererControl class provides a media control for rendering video to a QAbstractVideoSurface. + - \ingroup multimedia \ingroup multimedia_control Using the surface() property of QVideoRendererControl a diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp index 445bcddce..2d4450c4e 100644 --- a/src/multimedia/controls/qvideowindowcontrol.cpp +++ b/src/multimedia/controls/qvideowindowcontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \class QVideoWindowControl \inmodule QtMultimedia - \ingroup multimedia + \ingroup multimedia_control \brief The QVideoWindowControl class provides a media control for rendering video to a window. diff --git a/src/multimedia/playback/playback.pri b/src/multimedia/playback/playback.pri index 327b63b32..3bbb8ce15 100644 --- a/src/multimedia/playback/playback.pri +++ b/src/multimedia/playback/playback.pri @@ -1,7 +1,6 @@ INCLUDEPATH += playback PUBLIC_HEADERS += \ - playback/qaudioendpointselector.h \ playback/qmediacontent.h \ playback/qmediaplayer.h \ playback/qmediaplaylist.h \ @@ -16,7 +15,6 @@ PRIVATE_HEADERS += \ playback/playlistfileparser_p.h SOURCES += \ - playback/qaudioendpointselector.cpp \ playback/qmedianetworkplaylistprovider.cpp \ playback/qmediacontent.cpp \ playback/qmediaplayer.cpp \ |