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>

4 files changed, 14 insertions, 14 deletions

diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp
index 0e965d4a9..286151194 100644
--- a/src/multimedia/recording/qaudiorecorder.cpp
+++ b/src/multimedia/recording/qaudiorecorder.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qaudiorecorder.h"
-#include "qaudioendpointselector.h"
+#include "qaudioendpointselectorcontrol.h"
 #include "qmediaobject_p.h"
 #include "qmediarecorder_p.h"
 #include <qmediaservice.h>
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
     The \l {audiorecorder}{Audio Recorder} example shows how to use this class
     in more detail.
 
-    \sa QMediaRecorder, QAudioEndpointSelector
+    \sa QMediaRecorder, QAudioEndpointSelectorControl
 */
 
 class QAudioRecorderObject : public QMediaObject
@@ -105,7 +105,7 @@ public:
         QMediaService *service = mediaObject ? mediaObject->service() : 0;
 
         if (service != 0)
-            audioEndpointSelector = qobject_cast<QAudioEndpointSelector*>(service->requestControl(QAudioEndpointSelector_iid));
+            audioEndpointSelector = qobject_cast<QAudioEndpointSelectorControl*>(service->requestControl(QAudioEndpointSelectorControl_iid));
 
         if (audioEndpointSelector) {
             q->connect(audioEndpointSelector, SIGNAL(activeEndpointChanged(QString)),
@@ -121,7 +121,7 @@ public:
         audioEndpointSelector(0) {}
 
     QMediaServiceProvider *provider;
-    QAudioEndpointSelector   *audioEndpointSelector;
+    QAudioEndpointSelectorControl   *audioEndpointSelector;
 };
 
 
diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp
index 5d06c3bbf..1c7cc35bb 100644
--- a/src/multimedia/recording/qmediaencodersettings.cpp
+++ b/src/multimedia/recording/qmediaencodersettings.cpp
@@ -113,7 +113,7 @@ private:
 
     \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio encoder settings
 
-    \sa QMediaRecorder, QAudioEncoderControl
+    \sa QMediaRecorder, QAudioEncoderSettingsControl
 */
 
 /*!
@@ -427,7 +427,7 @@ private:
 
     \snippet doc/src/snippets/multimedia-snippets/media.cpp Video encoder settings
 
-    \sa QMediaRecorder, QVideoEncoderControl
+    \sa QMediaRecorder, QVideoEncoderSettingsControl
 */
 
 /*!
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) {
diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h
index 03919ef19..56922c4b8 100644
--- a/src/multimedia/recording/qmediarecorder_p.h
+++ b/src/multimedia/recording/qmediarecorder_p.h
@@ -50,8 +50,8 @@ QT_BEGIN_NAMESPACE
 
 class QMediaRecorderControl;
 class QMediaContainerControl;
-class QAudioEncoderControl;
-class QVideoEncoderControl;
+class QAudioEncoderSettingsControl;
+class QVideoEncoderSettingsControl;
 class QMetaDataWriterControl;
 class QMediaAvailabilityControl;
 class QTimer;
@@ -71,8 +71,8 @@ public:
 
     QMediaRecorderControl *control;
     QMediaContainerControl *formatControl;
-    QAudioEncoderControl *audioControl;
-    QVideoEncoderControl *videoControl;
+    QAudioEncoderSettingsControl *audioControl;
+    QVideoEncoderSettingsControl *videoControl;
     QMetaDataWriterControl *metaDataControl;
     QMediaAvailabilityControl *availabilityControl;