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/recording/qmediarecorder.cpp | |
| 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/recording/qmediarecorder.cpp')
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index a212abdc1..08df4f968 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -47,8 +47,8 @@ #include <qmediaservice.h> #include <qmediaserviceprovider_p.h> #include <qmetadatawritercontrol.h> -#include <qaudioencodercontrol.h> -#include <qvideoencodercontrol.h> +#include <qaudioencodersettingscontrol.h> +#include <qvideoencodersettingscontrol.h> #include <qmediacontainercontrol.h> #include <qmediaavailabilitycontrol.h> #include <qcamera.h> @@ -350,8 +350,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) if (d->control) { d->formatControl = qobject_cast<QMediaContainerControl *>(service->requestControl(QMediaContainerControl_iid)); - d->audioControl = qobject_cast<QAudioEncoderControl *>(service->requestControl(QAudioEncoderControl_iid)); - d->videoControl = qobject_cast<QVideoEncoderControl *>(service->requestControl(QVideoEncoderControl_iid)); + d->audioControl = qobject_cast<QAudioEncoderSettingsControl *>(service->requestControl(QAudioEncoderSettingsControl_iid)); + d->videoControl = qobject_cast<QVideoEncoderSettingsControl *>(service->requestControl(QVideoEncoderSettingsControl_iid)); QMediaControl *control = service->requestControl(QMetaDataWriterControl_iid); if (control) { |