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>

src/plugins/gstreamer/camerabin/camerabinaudioencoder.cpp

@@ -46,7 +46,7 @@
 #include <QtCore/qdebug.h>
 
 CameraBinAudioEncoder::CameraBinAudioEncoder(QObject *parent)
-    :QAudioEncoderControl(parent),
+    :QAudioEncoderSettingsControl(parent),
      m_codecs(QGstCodecsInfo::AudioEncoder)
 {
 }

src/plugins/gstreamer/camerabin/camerabinaudioencoder.h

@@ -42,7 +42,7 @@
 #ifndef CAMERABINAUDIOENCODE_H
 #define CAMERABINAUDIOENCODE_H
 
-#include <qaudioencodercontrol.h>
+#include <qaudioencodersettingscontrol.h>
 class CameraBinSession;
 
 #include <QtCore/qstringlist.h>
@@ -58,7 +58,7 @@ class CameraBinSession;
 
 QT_USE_NAMESPACE
 
-class CameraBinAudioEncoder : public QAudioEncoderControl
+class CameraBinAudioEncoder : public QAudioEncoderSettingsControl
 {
     Q_OBJECT
 public:

src/plugins/gstreamer/camerabin/camerabinservice.cpp

@@ -177,19 +177,19 @@ QMediaControl *CameraBinService::requestControl(const char *name)
         }
     }
 
-    if (qstrcmp(name,QAudioEndpointSelector_iid) == 0)
+    if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0)
         return m_audioInputEndpointSelector;
 
-    if (qstrcmp(name,QVideoDeviceControl_iid) == 0)
+    if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0)
         return m_videoInputDevice;
 
     if (qstrcmp(name,QMediaRecorderControl_iid) == 0)
         return m_captureSession->recorderControl();
 
-    if (qstrcmp(name,QAudioEncoderControl_iid) == 0)
+    if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0)
         return m_captureSession->audioEncodeControl();
 
-    if (qstrcmp(name,QVideoEncoderControl_iid) == 0)
+    if (qstrcmp(name,QVideoEncoderSettingsControl_iid) == 0)
         return m_captureSession->videoEncodeControl();
 
     if (qstrcmp(name,QImageEncoderControl_iid) == 0)

src/plugins/gstreamer/camerabin/camerabinservice.h

@@ -46,8 +46,8 @@
 
 #include <gst/gst.h>
 QT_BEGIN_NAMESPACE
-class QAudioEndpointSelector;
-class QVideoDeviceControl;
+class QAudioEndpointSelectorControl;
+class QVideoDeviceSelectorControl;
 QT_END_NAMESPACE
 
 class CameraBinSession;
@@ -82,8 +82,8 @@ private:
     CameraBinControl *m_cameraControl;
     CameraBinMetaData *m_metaDataControl;
 
-    QAudioEndpointSelector *m_audioInputEndpointSelector;
-    QVideoDeviceControl *m_videoInputDevice;
+    QAudioEndpointSelectorControl *m_audioInputEndpointSelector;
+    QVideoDeviceSelectorControl *m_videoInputDevice;
 
     QMediaControl *m_videoOutput;
 

src/plugins/gstreamer/camerabin/camerabinvideoencoder.cpp

@@ -46,7 +46,7 @@
 #include <QtCore/qdebug.h>
 
 CameraBinVideoEncoder::CameraBinVideoEncoder(CameraBinSession *session)
-    :QVideoEncoderControl(session),
+    :QVideoEncoderSettingsControl(session),
      m_session(session),
      m_codecs(QGstCodecsInfo::VideoEncoder)
 {

src/plugins/gstreamer/camerabin/camerabinvideoencoder.h

@@ -42,7 +42,7 @@
 #ifndef CAMERABINVIDEOENCODE_H
 #define CAMERABINVIDEOENCODE_H
 
-#include <qvideoencodercontrol.h>
+#include <qvideoencodersettingscontrol.h>
 class CameraBinSession;
 
 #include <QtCore/qstringlist.h>
@@ -56,7 +56,7 @@ class CameraBinSession;
 
 QT_USE_NAMESPACE
 
-class CameraBinVideoEncoder : public QVideoEncoderControl
+class CameraBinVideoEncoder : public QVideoEncoderSettingsControl
 {
     Q_OBJECT
 public: