slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced endpoint control with audio input and output controls

Browse Source 
Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-07-16 11:28:02 +10:00
committed by Qt by Nokia
parent 29a2d09a43
commit ae728a4b1e
34 changed files with 549 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
View File

@@ -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;

4
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
View File

@@ -48,7 +48,7 @@
#include <gst/gst.h>
QT_BEGIN_NAMESPACE
class QAudioEndpointSelectorControl;
class QAudioInputSelectorControl;
class QVideoDeviceSelectorControl;
class QGstreamerCaptureSession;
@@ -82,7 +82,7 @@ private:
QGstreamerV4L2Input *m_videoInput;
QGstreamerCaptureMetaDataControl *m_metaDataControl;
QAudioEndpointSelectorControl *m_audioInputEndpointSelector;
QAudioInputSelectorControl *m_audioInputSelector;
QVideoDeviceSelectorControl *m_videoInputDevice;
QMediaControl *m_videoOutput;