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/audiocapture | |
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/audiocapture')
-rw-r--r-- | src/plugins/audiocapture/audiocapture.pro | 4 | ||||
-rw-r--r-- | src/plugins/audiocapture/audiocaptureservice.cpp | 10 | ||||
-rw-r--r-- | src/plugins/audiocapture/audiocaptureservice.h | 4 | ||||
-rw-r--r-- | src/plugins/audiocapture/audiocapturesession.h | 2 | ||||
-rw-r--r-- | src/plugins/audiocapture/audioinputselector.cpp (renamed from src/plugins/audiocapture/audioendpointselector.cpp) | 24 | ||||
-rw-r--r-- | src/plugins/audiocapture/audioinputselector.h (renamed from src/plugins/audiocapture/audioendpointselector.h) | 24 |
6 files changed, 34 insertions, 34 deletions
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index 6a4a5888a..9422682b8 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -10,7 +10,7 @@ DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} HEADERS += audioencodercontrol.h \ audiocontainercontrol.h \ audiomediarecordercontrol.h \ - audioendpointselector.h \ + audioinputselector.h \ audiocaptureservice.h \ audiocaptureserviceplugin.h \ audiocapturesession.h @@ -18,7 +18,7 @@ HEADERS += audioencodercontrol.h \ SOURCES += audioencodercontrol.cpp \ audiocontainercontrol.cpp \ audiomediarecordercontrol.cpp \ - audioendpointselector.cpp \ + audioinputselector.cpp \ audiocaptureservice.cpp \ audiocaptureserviceplugin.cpp \ audiocapturesession.cpp diff --git a/src/plugins/audiocapture/audiocaptureservice.cpp b/src/plugins/audiocapture/audiocaptureservice.cpp index ed5908803..e71b2e1c6 100644 --- a/src/plugins/audiocapture/audiocaptureservice.cpp +++ b/src/plugins/audiocapture/audiocaptureservice.cpp @@ -41,7 +41,7 @@ #include "audiocaptureservice.h" #include "audiocapturesession.h" -#include "audioendpointselector.h" +#include "audioinputselector.h" #include "audioencodercontrol.h" #include "audiocontainercontrol.h" #include "audiomediarecordercontrol.h" @@ -53,14 +53,14 @@ AudioCaptureService::AudioCaptureService(QObject *parent): m_encoderControl = new AudioEncoderControl(m_session); m_containerControl = new AudioContainerControl(m_session); m_mediaControl = new AudioMediaRecorderControl(m_session); - m_endpointSelector = new AudioEndpointSelector(m_session); + m_inputSelector = new AudioInputSelector(m_session); } AudioCaptureService::~AudioCaptureService() { delete m_encoderControl; delete m_containerControl; - delete m_endpointSelector; + delete m_inputSelector; delete m_mediaControl; delete m_session; } @@ -73,8 +73,8 @@ QMediaControl *AudioCaptureService::requestControl(const char *name) if (qstrcmp(name,QAudioEncoderSettingsControl_iid) == 0) return m_encoderControl; - if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0) - return m_endpointSelector; + if (qstrcmp(name,QAudioInputSelectorControl_iid) == 0) + return m_inputSelector; if (qstrcmp(name,QMediaContainerControl_iid) == 0) return m_containerControl; diff --git a/src/plugins/audiocapture/audiocaptureservice.h b/src/plugins/audiocapture/audiocaptureservice.h index eff1301ba..8bc314950 100644 --- a/src/plugins/audiocapture/audiocaptureservice.h +++ b/src/plugins/audiocapture/audiocaptureservice.h @@ -50,7 +50,7 @@ class AudioCaptureSession; class AudioEncoderControl; class AudioContainerControl; class AudioMediaRecorderControl; -class AudioEndpointSelector; +class AudioInputSelector; QT_USE_NAMESPACE @@ -67,7 +67,7 @@ private: AudioCaptureSession *m_session; AudioEncoderControl *m_encoderControl; AudioContainerControl *m_containerControl; - AudioEndpointSelector *m_endpointSelector; + AudioInputSelector *m_inputSelector; AudioMediaRecorderControl *m_mediaControl; }; diff --git a/src/plugins/audiocapture/audiocapturesession.h b/src/plugins/audiocapture/audiocapturesession.h index bf68f6eef..4d1374391 100644 --- a/src/plugins/audiocapture/audiocapturesession.h +++ b/src/plugins/audiocapture/audiocapturesession.h @@ -47,7 +47,7 @@ #include <QDir> #include "audioencodercontrol.h" -#include "audioendpointselector.h" +#include "audioinputselector.h" #include "audiomediarecordercontrol.h" #include <qaudioformat.h> diff --git a/src/plugins/audiocapture/audioendpointselector.cpp b/src/plugins/audiocapture/audioinputselector.cpp index 757d779bd..d692ccaf2 100644 --- a/src/plugins/audiocapture/audioendpointselector.cpp +++ b/src/plugins/audiocapture/audioinputselector.cpp @@ -40,31 +40,31 @@ ****************************************************************************/ #include "audiocapturesession.h" -#include "audioendpointselector.h" +#include "audioinputselector.h" #include <qaudiodeviceinfo.h> -AudioEndpointSelector::AudioEndpointSelector(QObject *parent) - :QAudioEndpointSelectorControl(parent) +AudioInputSelector::AudioInputSelector(QObject *parent) + :QAudioInputSelectorControl(parent) { m_session = qobject_cast<AudioCaptureSession*>(parent); update(); - m_audioInput = defaultEndpoint(); + m_audioInput = defaultInput(); } -AudioEndpointSelector::~AudioEndpointSelector() +AudioInputSelector::~AudioInputSelector() { } -QList<QString> AudioEndpointSelector::availableEndpoints() const +QList<QString> AudioInputSelector::availableInputs() const { return m_names; } -QString AudioEndpointSelector::endpointDescription(const QString& name) const +QString AudioInputSelector::inputDescription(const QString& name) const { QString desc; @@ -77,26 +77,26 @@ QString AudioEndpointSelector::endpointDescription(const QString& name) const return desc; } -QString AudioEndpointSelector::defaultEndpoint() const +QString AudioInputSelector::defaultInput() const { return QAudioDeviceInfo(QAudioDeviceInfo::defaultInputDevice()).deviceName(); } -QString AudioEndpointSelector::activeEndpoint() const +QString AudioInputSelector::activeInput() const { return m_audioInput; } -void AudioEndpointSelector::setActiveEndpoint(const QString& name) +void AudioInputSelector::setActiveInput(const QString& name) { if (m_audioInput.compare(name) != 0) { m_audioInput = name; m_session->setCaptureDevice(name); - emit activeEndpointChanged(name); + emit activeInputChanged(name); } } -void AudioEndpointSelector::update() +void AudioInputSelector::update() { m_names.clear(); m_descriptions.clear(); diff --git a/src/plugins/audiocapture/audioendpointselector.h b/src/plugins/audiocapture/audioinputselector.h index 9eb34eda4..1c22e60df 100644 --- a/src/plugins/audiocapture/audioendpointselector.h +++ b/src/plugins/audiocapture/audioinputselector.h @@ -39,31 +39,31 @@ ** ****************************************************************************/ -#ifndef AUDIOENDPOINTSELECTOR_H -#define AUDIOENDPOINTSELECTOR_H +#ifndef AUDIOINPUTSELECTOR_H +#define AUDIOINPUTSELECTOR_H #include <QStringList> -#include "qaudioendpointselectorcontrol.h" +#include "qaudioinputselectorcontrol.h" class AudioCaptureSession; QT_USE_NAMESPACE -class AudioEndpointSelector : public QAudioEndpointSelectorControl +class AudioInputSelector : public QAudioInputSelectorControl { Q_OBJECT public: - AudioEndpointSelector(QObject *parent); - virtual ~AudioEndpointSelector(); + AudioInputSelector(QObject *parent); + virtual ~AudioInputSelector(); - QList<QString> availableEndpoints() const; - QString endpointDescription(const QString& name) const; - QString defaultEndpoint() const; - QString activeEndpoint() const; + QList<QString> availableInputs() const; + QString inputDescription(const QString& name) const; + QString defaultInput() const; + QString activeInput() const; public Q_SLOTS: - void setActiveEndpoint(const QString& name); + void setActiveInput(const QString& name); private: void update(); @@ -74,4 +74,4 @@ private: AudioCaptureSession* m_session; }; -#endif // AUDIOENDPOINTSELECTOR_H +#endif // AUDIOINPUTSELECTOR_H |