diff options
| author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2013-12-10 13:11:07 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 06:05:05 +0100 |
| commit | 4d3f740795ece7fb46760d384f21913e02b296d7 (patch) | |
| tree | 5369e849eb3b79ca004424c17a87e398fc2df5a8 /src/multimedia/gsttools_headers | |
| parent | 817c548df4b3693495323b163c584945077bbdaa (diff) | |
Allow the camerabin source selection to be overridden.
Prefer the default camera-source element if there is one or an element
identified by an environment variable to a static list of possible
elements which may not be appropriate for the target environment.
Change-Id: I53816c949307953780f9046eb11e09effe059be0
Reviewed-by: John Brooks <john.brooks@dereferenced.net>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/multimedia/gsttools_headers')
| -rw-r--r-- | src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h index 401f50245..eeb576ef5 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h @@ -45,6 +45,8 @@ #include <qvideodeviceselectorcontrol.h> #include <QtCore/qstringlist.h> +#include <gst/gst.h> + QT_BEGIN_NAMESPACE class QGstreamerVideoInputDeviceControl : public QVideoDeviceSelectorControl @@ -52,6 +54,7 @@ class QGstreamerVideoInputDeviceControl : public QVideoDeviceSelectorControl Q_OBJECT public: QGstreamerVideoInputDeviceControl(QObject *parent); + QGstreamerVideoInputDeviceControl(GstElement *source, QObject *parent); ~QGstreamerVideoInputDeviceControl(); int deviceCount() const; @@ -68,6 +71,8 @@ public Q_SLOTS: private: void update(); + GstElement *m_source; + int m_selectedDevice; QStringList m_names; QStringList m_descriptions; |