From bba28afe559837321a2083b3ce046ab774a7ef6b Mon Sep 17 00:00:00 2001
From: Michael Goddard <michael.goddard@nokia.com>
Date: Wed, 20 Jun 2012 16:04:57 +1000
Subject: 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/audiocapture/audiocaptureservice.cpp   | 4 ++--
 src/plugins/audiocapture/audioencodercontrol.cpp   | 2 +-
 src/plugins/audiocapture/audioencodercontrol.h     | 4 ++--
 src/plugins/audiocapture/audioendpointselector.cpp | 2 +-
 src/plugins/audiocapture/audioendpointselector.h   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/plugins/audiocapture')

diff --git a/src/plugins/audiocapture/audiocaptureservice.cpp b/src/plugins/audiocapture/audiocaptureservice.cpp
index d1d8b8290..ed5908803 100644
--- a/src/plugins/audiocapture/audiocaptureservice.cpp
+++ b/src/plugins/audiocapture/audiocaptureservice.cpp
@@ -70,10 +70,10 @@ QMediaControl *AudioCaptureService::requestControl(const char *name)
     if (qstrcmp(name,QMediaRecorderControl_iid) == 0)
         return m_mediaControl;
 
-    if (qstrcmp(name,QAudioEncoderControl_iid) == 0)
+    if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0)
         return m_encoderControl;
 
-    if (qstrcmp(name,QAudioEndpointSelector_iid) == 0)
+    if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0)
         return m_endpointSelector;
 
     if (qstrcmp(name,QMediaContainerControl_iid) == 0)
diff --git a/src/plugins/audiocapture/audioencodercontrol.cpp b/src/plugins/audiocapture/audioencodercontrol.cpp
index 67d685a9b..b6dc98bec 100644
--- a/src/plugins/audiocapture/audioencodercontrol.cpp
+++ b/src/plugins/audiocapture/audioencodercontrol.cpp
@@ -47,7 +47,7 @@
 #include <QtCore/qdebug.h>
 
 AudioEncoderControl::AudioEncoderControl(QObject *parent)
-    :QAudioEncoderControl(parent)
+    :QAudioEncoderSettingsControl(parent)
 {
     m_session = qobject_cast<AudioCaptureSession*>(parent);
 
diff --git a/src/plugins/audiocapture/audioencodercontrol.h b/src/plugins/audiocapture/audioencodercontrol.h
index bf7e7b327..e516be6a3 100644
--- a/src/plugins/audiocapture/audioencodercontrol.h
+++ b/src/plugins/audiocapture/audioencodercontrol.h
@@ -42,7 +42,7 @@
 #ifndef AUDIOENCODERCONTROL_H
 #define AUDIOENCODERCONTROL_H
 
-#include "qaudioencodercontrol.h"
+#include "qaudioencodersettingscontrol.h"
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmap.h>
@@ -53,7 +53,7 @@ class AudioCaptureSession;
 
 QT_USE_NAMESPACE
 
-class AudioEncoderControl : public QAudioEncoderControl
+class AudioEncoderControl : public QAudioEncoderSettingsControl
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/audiocapture/audioendpointselector.cpp b/src/plugins/audiocapture/audioendpointselector.cpp
index f9eb8fa4f..757d779bd 100644
--- a/src/plugins/audiocapture/audioendpointselector.cpp
+++ b/src/plugins/audiocapture/audioendpointselector.cpp
@@ -46,7 +46,7 @@
 
 
 AudioEndpointSelector::AudioEndpointSelector(QObject *parent)
-    :QAudioEndpointSelector(parent)
+    :QAudioEndpointSelectorControl(parent)
 {
     m_session = qobject_cast<AudioCaptureSession*>(parent);
 
diff --git a/src/plugins/audiocapture/audioendpointselector.h b/src/plugins/audiocapture/audioendpointselector.h
index e4d1a0940..9eb34eda4 100644
--- a/src/plugins/audiocapture/audioendpointselector.h
+++ b/src/plugins/audiocapture/audioendpointselector.h
@@ -44,13 +44,13 @@
 
 #include <QStringList>
 
-#include "qaudioendpointselector.h"
+#include "qaudioendpointselectorcontrol.h"
 
 class AudioCaptureSession;
 
 QT_USE_NAMESPACE
 
-class AudioEndpointSelector : public QAudioEndpointSelector
+class AudioEndpointSelector : public QAudioEndpointSelectorControl
 {
 Q_OBJECT
 public:
-- 
cgit v1.2.1