diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-20 16:04:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:29 +0200 |
| commit | bba28afe559837321a2083b3ce046ab774a7ef6b (patch) | |
| tree | 8908febff01fa8cfbe889dcde87e425b00fbf0d8 /src/multimedia/qmediaserviceproviderplugin.h | |
| parent | b834fe032f6504ec07f80332d1e22de0b4fc64e0 (diff) | |
Rename a few controls.
The encoder controls could be confused with actual encoding, so make
clear they are just settings. Also, the end point selector controls
were not named very well.
Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/multimedia/qmediaserviceproviderplugin.h')
| -rw-r--r-- | src/multimedia/qmediaserviceproviderplugin.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index ea8003754..cc22ac515 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -190,7 +190,7 @@ public: Required Controls: QAudioDeviceControl Recording Controls (QMediaRecorder): Required: QMediaRecorderControl - Recommended: QAudioEncoderControl + Recommended: QAudioEncoderSettingsControl Optional: QMediaContainerControl */ #define Q_MEDIASERVICE_AUDIOSOURCE "org.qt-project.qt.audiosource" @@ -202,7 +202,7 @@ public: Still Capture Controls: QCameraImageCaptureControl Video Capture Controls (QMediaRecorder): Required: QMediaRecorderControl - Recommended: QAudioEncoderControl, QVideoEncoderControl, QMediaContainerControl + Recommended: QAudioEncoderSettingsControl, QVideoEncoderSettingsControl, QMediaContainerControl Viewfinder Video Output Controls (used by QCameraViewfinder and QGraphicsVideoItem): Required: QVideoOutputControl Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl @@ -214,7 +214,7 @@ public: Required Controls: QRadioTunerControl Recording Controls (Optional, used by QMediaRecorder): Required: QMediaRecorderControl - Recommended: QAudioEncoderControl + Recommended: QAudioEncoderSettingsControl Optional: QMediaContainerControl */ #define Q_MEDIASERVICE_RADIO "org.qt-project.qt.radio" |