Replaced endpoint control with audio input and output controls

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

2 files changed, 16 insertions, 16 deletions

diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index 50e546584..d267518d8 100644
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
@@ -42,7 +42,7 @@ PRIVATE_HEADERS += \
     qgstvideobuffer_p.h \
     qvideosurfacegstsink_p.h \
     qgstreamervideorendererinterface_p.h \
-    qgstreameraudioinputendpointselector_p.h \
+    qgstreameraudioinputselector_p.h \
     qgstreamervideorenderer_p.h \
     qgstreamervideoinputdevicecontrol_p.h \
     gstvideoconnector_p.h \
@@ -58,7 +58,7 @@ SOURCES += \
     qgstvideobuffer.cpp \
     qvideosurfacegstsink.cpp \
     qgstreamervideorendererinterface.cpp \
-    qgstreameraudioinputendpointselector.cpp \
+    qgstreameraudioinputselector.cpp \
     qgstreamervideorenderer.cpp \
     qgstreamervideoinputdevicecontrol.cpp \
     qgstcodecsinfo.cpp \
diff --git a/src/gsttools/qgstreameraudioinputendpointselector.cpp b/src/gsttools/qgstreameraudioinputselector.cpp
index 8ee6c3e9f..95d6dde7c 100644
--- a/src/gsttools/qgstreameraudioinputendpointselector.cpp
+++ b/src/gsttools/qgstreameraudioinputselector.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreameraudioinputendpointselector_p.h"
+#include "qgstreameraudioinputselector_p.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
@@ -50,22 +50,22 @@
 #include <alsa/asoundlib.h>
 #endif
 
-QGstreamerAudioInputEndpointSelector::QGstreamerAudioInputEndpointSelector(QObject *parent)
-    :QAudioEndpointSelectorControl(parent)
+QGstreamerAudioInputSelector::QGstreamerAudioInputSelector(QObject *parent)
+    :QAudioInputSelectorControl(parent)
 {
     update();
 }
 
-QGstreamerAudioInputEndpointSelector::~QGstreamerAudioInputEndpointSelector()
+QGstreamerAudioInputSelector::~QGstreamerAudioInputSelector()
 {
 }
 
-QList<QString> QGstreamerAudioInputEndpointSelector::availableEndpoints() const
+QList<QString> QGstreamerAudioInputSelector::availableInputs() const
 {
     return m_names;
 }
 
-QString QGstreamerAudioInputEndpointSelector::endpointDescription(const QString& name) const
+QString QGstreamerAudioInputSelector::inputDescription(const QString& name) const
 {
     QString desc;
 
@@ -78,7 +78,7 @@ QString QGstreamerAudioInputEndpointSelector::endpointDescription(const QString&
     return desc;
 }
 
-QString QGstreamerAudioInputEndpointSelector::defaultEndpoint() const
+QString QGstreamerAudioInputSelector::defaultInput() const
 {
     if (m_names.size() > 0)
         return m_names.at(0);
@@ -86,20 +86,20 @@ QString QGstreamerAudioInputEndpointSelector::defaultEndpoint() const
     return QString();
 }
 
-QString QGstreamerAudioInputEndpointSelector::activeEndpoint() const
+QString QGstreamerAudioInputSelector::activeInput() const
 {
     return m_audioInput;
 }
 
-void QGstreamerAudioInputEndpointSelector::setActiveEndpoint(const QString& name)
+void QGstreamerAudioInputSelector::setActiveInput(const QString& name)
 {
     if (m_audioInput.compare(name) != 0) {
         m_audioInput = name;
-        emit activeEndpointChanged(name);
+        emit activeInputChanged(name);
     }
 }
 
-void QGstreamerAudioInputEndpointSelector::update()
+void QGstreamerAudioInputSelector::update()
 {
     m_names.clear();
     m_descriptions.clear();
@@ -115,7 +115,7 @@ void QGstreamerAudioInputEndpointSelector::update()
         m_audioInput = m_names.at(0);
 }
 
-void QGstreamerAudioInputEndpointSelector::updateAlsaDevices()
+void QGstreamerAudioInputSelector::updateAlsaDevices()
 {
 #ifdef HAVE_ALSA
     void **hints, **n;
@@ -149,7 +149,7 @@ void QGstreamerAudioInputEndpointSelector::updateAlsaDevices()
 #endif
 }
 
-void QGstreamerAudioInputEndpointSelector::updateOssDevices()
+void QGstreamerAudioInputSelector::updateOssDevices()
 {
     QDir devDir("/dev");
     devDir.setFilter(QDir::System);
@@ -160,7 +160,7 @@ void QGstreamerAudioInputEndpointSelector::updateOssDevices()
     }
 }
 
-void QGstreamerAudioInputEndpointSelector::updatePulseDevices()
+void QGstreamerAudioInputSelector::updatePulseDevices()
 {
     GstElementFactory *factory = gst_element_factory_find("pulsesrc");
     if (factory) {