diff options
author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-07-16 11:28:02 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 09:49:47 +0200 |
commit | ae728a4b1e2a0065bab67b5c3b114ef1c30b674a (patch) | |
tree | 36f5c3f60faca8d70dd94673dfa44570e6f367b4 /src/plugins/directshow/player | |
parent | 29a2d09a43b34c309b32d17a0a5ba2a4737342c5 (diff) |
Replaced endpoint control with audio input and output controls
Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/directshow/player')
3 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp index 31bc995a2..312cd4772 100644 --- a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp +++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp @@ -46,7 +46,7 @@ DirectShowAudioEndpointControl::DirectShowAudioEndpointControl( DirectShowPlayerService *service, QObject *parent) - : QAudioEndpointSelectorControl(parent) + : QAudioOutputSelectorControl(parent) , m_service(service) , m_bindContext(0) , m_deviceEnumerator(0) @@ -56,7 +56,7 @@ DirectShowAudioEndpointControl::DirectShowAudioEndpointControl( updateEndpoints(); - setActiveEndpoint(m_defaultEndpoint); + setActiveOutput(m_defaultEndpoint); } } @@ -72,12 +72,12 @@ DirectShowAudioEndpointControl::~DirectShowAudioEndpointControl() m_deviceEnumerator->Release(); } -QList<QString> DirectShowAudioEndpointControl::availableEndpoints() const +QList<QString> DirectShowAudioEndpointControl::availableOutputs() const { return m_devices.keys(); } -QString DirectShowAudioEndpointControl::endpointDescription(const QString &name) const +QString DirectShowAudioEndpointControl::outputDescription(const QString &name) const { #ifdef __IPropertyBag_INTERFACE_DEFINED__ QString description; @@ -101,17 +101,17 @@ QString DirectShowAudioEndpointControl::endpointDescription(const QString &name) #endif } -QString DirectShowAudioEndpointControl::defaultEndpoint() const +QString DirectShowAudioEndpointControl::defaultOutput() const { return m_defaultEndpoint; } -QString DirectShowAudioEndpointControl::activeEndpoint() const +QString DirectShowAudioEndpointControl::activeOutput() const { return m_activeEndpoint; } -void DirectShowAudioEndpointControl::setActiveEndpoint(const QString &name) +void DirectShowAudioEndpointControl::setActiveOutput(const QString &name) { if (m_activeEndpoint == name) return; diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.h b/src/plugins/directshow/player/directshowaudioendpointcontrol.h index 17863fd6b..bdfe0ad17 100644 --- a/src/plugins/directshow/player/directshowaudioendpointcontrol.h +++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.h @@ -42,7 +42,7 @@ #ifndef DIRECTSHOWAUDIOENDPOINTCONTROL_H #define DIRECTSHOWAUDIOENDPOINTCONTROL_H -#include "qaudioendpointselectorcontrol.h" +#include "qaudiooutputselectorcontrol.h" #include <dshow.h> @@ -50,21 +50,21 @@ class DirectShowPlayerService; QT_USE_NAMESPACE -class DirectShowAudioEndpointControl : public QAudioEndpointSelectorControl +class DirectShowAudioEndpointControl : public QAudioOutputSelectorControl { Q_OBJECT public: DirectShowAudioEndpointControl(DirectShowPlayerService *service, QObject *parent = 0); ~DirectShowAudioEndpointControl(); - 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); private: void updateEndpoints(); diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index ef6c66c3b..cee5603c4 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -156,7 +156,7 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name) { if (qstrcmp(name, QMediaPlayerControl_iid) == 0) { return m_playerControl; - } 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; |