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/gstreamer/mediacapture/qgstreamercaptureservice.cpp | |
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/gstreamer/mediacapture/qgstreamercaptureservice.cpp')
-rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp index 61c4e3d46..6e2d589ff 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -52,7 +52,7 @@ #include "qgstreamercapturemetadatacontrol.h" #include "qgstreamerimagecapturecontrol.h" -#include <private/qgstreameraudioinputendpointselector_p.h> +#include <private/qgstreameraudioinputselector_p.h> #include <private/qgstreamervideoinputdevicecontrol_p.h> #include <private/qgstreameraudioprobecontrol_p.h> @@ -75,7 +75,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje m_metaDataControl = 0; m_videoInput = 0; - m_audioInputEndpointSelector = 0; + m_audioInputSelector = 0; m_videoInputDevice = 0; m_videoOutput = 0; @@ -112,11 +112,11 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje m_imageCaptureControl = new QGstreamerImageCaptureControl(m_captureSession); } - m_audioInputEndpointSelector = new QGstreamerAudioInputEndpointSelector(this); - connect(m_audioInputEndpointSelector, SIGNAL(activeEndpointChanged(QString)), m_captureSession, SLOT(setCaptureDevice(QString))); + m_audioInputSelector = new QGstreamerAudioInputSelector(this); + connect(m_audioInputSelector, SIGNAL(activeInputChanged(QString)), m_captureSession, SLOT(setCaptureDevice(QString))); - if (m_captureSession && m_audioInputEndpointSelector->availableEndpoints().size() > 0) - m_captureSession->setCaptureDevice(m_audioInputEndpointSelector->defaultEndpoint()); + if (m_captureSession && m_audioInputSelector->availableInputs().size() > 0) + m_captureSession->setCaptureDevice(m_audioInputSelector->defaultInput()); m_metaDataControl = new QGstreamerCaptureMetaDataControl(this); connect(m_metaDataControl, SIGNAL(metaDataChanged(QMap<QByteArray,QVariant>)), @@ -132,8 +132,8 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name) if (!m_captureSession) return 0; - if (qstrcmp(name,QAudioEndpointSelectorControl_iid) == 0) - return m_audioInputEndpointSelector; + if (qstrcmp(name,QAudioInputSelectorControl_iid) == 0) + return m_audioInputSelector; if (qstrcmp(name,QVideoDeviceSelectorControl_iid) == 0) return m_videoInputDevice; |