Replaced endpoint control with audio input and output controls

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

3 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
index ce4019c96..cf0fca4bb 100644
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
+++ b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
@@ -43,11 +43,11 @@
 #include "mfaudioendpointcontrol.h"
 
 MFAudioEndpointControl::MFAudioEndpointControl(QObject *parent)
-    : QAudioEndpointSelectorControl(parent)
+    : QAudioOutputSelectorControl(parent)
     , m_currentActivate(0)
 {
     updateEndpoints();
-    setActiveEndpoint(m_defaultEndpoint);
+    setActiveOutput(m_defaultEndpoint);
 }
 
 MFAudioEndpointControl::~MFAudioEndpointControl()
@@ -59,27 +59,27 @@ MFAudioEndpointControl::~MFAudioEndpointControl()
         m_currentActivate->Release();
 }
 
-QList<QString> MFAudioEndpointControl::availableEndpoints() const
+QList<QString> MFAudioEndpointControl::availableOutputs() const
 {
     return m_devices.keys();
 }
 
-QString MFAudioEndpointControl::endpointDescription(const QString &name) const
+QString MFAudioEndpointControl::outputDescription(const QString &name) const
 {
     return name.section(QLatin1Char('\\'), -1);
 }
 
-QString MFAudioEndpointControl::defaultEndpoint() const
+QString MFAudioEndpointControl::defaultOutput() const
 {
     return m_defaultEndpoint;
 }
 
-QString MFAudioEndpointControl::activeEndpoint() const
+QString MFAudioEndpointControl::activeOutput() const
 {
     return m_activeEndpoint;
 }
 
-void MFAudioEndpointControl::setActiveEndpoint(const QString &name)
+void MFAudioEndpointControl::setActiveOutput(const QString &name)
 {
     if (m_activeEndpoint == name)
         return;
diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.h b/src/plugins/wmf/player/mfaudioendpointcontrol.h
index 36d91f665..42f05576d 100644
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.h
+++ b/src/plugins/wmf/player/mfaudioendpointcontrol.h
@@ -46,27 +46,27 @@
 #include <mfidl.h>
 #include <mmdeviceapi.h>
 
-#include "qaudioendpointselectorcontrol.h"
+#include "qaudiooutputselectorcontrol.h"
 
 class MFPlayerService;
 
 QT_USE_NAMESPACE
 
-class MFAudioEndpointControl : public QAudioEndpointSelectorControl
+class MFAudioEndpointControl : public QAudioOutputSelectorControl
 {
     Q_OBJECT
 public:
     MFAudioEndpointControl(QObject *parent = 0);
     ~MFAudioEndpointControl();
 
-    QList<QString> availableEndpoints() const;
+    QList<QString> availableOutputs() const;
 
-    QString endpointDescription(const QString &name) const;
+    QString outputDescription(const QString &name) const;
 
-    QString defaultEndpoint() const;
-    QString activeEndpoint() const;
+    QString defaultOutput() const;
+    QString activeOutput() const;
 
-    void setActiveEndpoint(const QString& name);
+    void setActiveOutput(const QString& name);
 
     IMFActivate* currentActivate() const;
 
diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/plugins/wmf/player/mfplayerservice.cpp
index 6ab9a997b..7e458123d 100644
--- a/src/plugins/wmf/player/mfplayerservice.cpp
+++ b/src/plugins/wmf/player/mfplayerservice.cpp
@@ -87,7 +87,7 @@ QMediaControl* MFPlayerService::requestControl(const char *name)
 {
     if (qstrcmp(name, QMediaPlayerControl_iid) == 0) {
         return m_player;
-    } else if (qstrcmp(name, QAudioEndpointSelectorControl_iid) == 0) {
+    } else if (qstrcmp(name, QAudioOutputSelectorControl_iid) == 0) {
         return m_audioEndpointControl;
     } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) {
         return m_metaDataControl;