Replaced endpoint control with audio input and output controls

Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

tests/auto/unit/qmultimedia_common/mockaudioinputselector.h

@@ -39,31 +39,31 @@
 **
 ****************************************************************************/
 
-#ifndef MOCKAUDIOENDPOINTSELECTOR_H
-#define MOCKAUDIOENDPOINTSELECTOR_H
+#ifndef MOCKAUDIOINPUTSELECTOR_H
+#define MOCKAUDIOINPUTSELECTOR_H
 
-#include "qaudioendpointselectorcontrol.h"
+#include "qaudioinputselectorcontrol.h"
 
-class MockAudioEndpointSelector : public QAudioEndpointSelectorControl
+class MockAudioInputSelector : public QAudioInputSelectorControl
 {
     Q_OBJECT
 public:
-    MockAudioEndpointSelector(QObject *parent):
-        QAudioEndpointSelectorControl(parent)
+    MockAudioInputSelector(QObject *parent):
+        QAudioInputSelectorControl(parent)
     {
         m_names << "device1" << "device2" << "device3";
         m_descriptions << "dev1 comment" << "dev2 comment" << "dev3 comment";
         m_audioInput = "device1";
-        emit availableEndpointsChanged();
+        emit availableInputsChanged();
     }
-    ~MockAudioEndpointSelector() {}
+    ~MockAudioInputSelector() {}
 
-    QList<QString> availableEndpoints() const
+    QList<QString> availableInputs() const
     {
         return m_names;
     }
 
-    QString endpointDescription(const QString& name) const
+    QString inputDescription(const QString& name) const
     {
         QString desc;
 
@@ -76,34 +76,34 @@ public:
         return desc;
     }
 
-    QString defaultEndpoint() const
+    QString defaultInput() const
     {
         return m_names.at(0);
     }
 
-    QString activeEndpoint() const
+    QString activeInput() const
     {
         return m_audioInput;
     }
 
 public Q_SLOTS:
 
-    void setActiveEndpoint(const QString& name)
+    void setActiveInput(const QString& name)
     {
         m_audioInput = name;
-        emit activeEndpointChanged(name);
+        emit activeInputChanged(name);
     }
 
-    void addEndpoints()
+    void addInputs()
     {
         m_names << "device4";
-        emit availableEndpointsChanged();
+        emit availableInputsChanged();
     }
 
-    void removeEndpoints()
+    void removeInputs()
     {
         m_names.clear();
-        emit availableEndpointsChanged();
+        emit availableInputsChanged();
     }
 
 private:
@@ -114,4 +114,4 @@ private:
 
 
 
-#endif // MOCKAUDIOENDPOINTSELECTOR_H
+#endif // MOCKAUDIOINPUTSELECTOR_H

tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h

@@ -47,7 +47,7 @@
 #include "mockaudioencodercontrol.h"
 #include "mockmediarecordercontrol.h"
 #include "mockvideoencodercontrol.h"
-#include "mockaudioendpointselector.h"
+#include "mockaudioinputselector.h"
 #include "mockmediacontainercontrol.h"
 #include "mockmetadatawritercontrol.h"
 #include "mockavailabilitycontrol.h"
@@ -63,7 +63,7 @@ public:
         mockAvailabilityControl(availability),
         hasControls(true)
     {
-        mockAudioEndpointSelector = new MockAudioEndpointSelector(this);
+        mockAudioInputSelector = new MockAudioInputSelector(this);
         mockAudioEncoderControl = new MockAudioEncoderControl(this);
         mockFormatControl = new MockMediaContainerControl(this);
         mockVideoEncoderControl = new MockVideoEncoderControl(this);
@@ -75,8 +75,8 @@ public:
     {
         if (hasControls && qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0)
             return mockAudioEncoderControl;
-        if (hasControls && qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0)
-            return mockAudioEndpointSelector;
+        if (hasControls && qstrcmp(name,QAudioInputSelectorControl_iid) == 0)
+            return mockAudioInputSelector;
         if (hasControls && qstrcmp(name,QMediaRecorderControl_iid) == 0)
             return mockControl;
         if (hasControls && qstrcmp(name,QMediaContainerControl_iid) == 0)
@@ -98,7 +98,7 @@ public:
     }
 
     QMediaControl   *mockControl;
-    QAudioEndpointSelectorControl  *mockAudioEndpointSelector;
+    QAudioInputSelectorControl  *mockAudioInputSelector;
     QAudioEncoderSettingsControl    *mockAudioEncoderControl;
     QMediaContainerControl     *mockFormatControl;
     QVideoEncoderSettingsControl    *mockVideoEncoderControl;

tests/auto/unit/qmultimedia_common/mockrecorder.pri

@@ -8,7 +8,7 @@ HEADERS *= \
     ../qmultimedia_common/mockmediarecordercontrol.h \
     ../qmultimedia_common/mockvideoencodercontrol.h \
     ../qmultimedia_common/mockaudioencodercontrol.h \
-    ../qmultimedia_common/mockaudioendpointselector.h \
+    ../qmultimedia_common/mockaudioinputselector.h \
     ../qmultimedia_common/mockaudioprobecontrol.h \
 
 # We also need all the container/metadata bits