summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2012-07-16 10:55:20 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-16 07:18:12 +0200
commitb6a8c713bcc0b0cc032fdbf909143f3ba8ca15a6 (patch)
tree8538a615fa11b5119199fdd77e31296fcf466b25 /src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
parentfdc197d61402837b23ce5c1cfe3a56cf0fa9aafe (diff)
Updated the camerabin2 based camera with QtMultimedia changes
Moved it to the separate plugin as the rest of gstreamer based services; Updated with libqgsttools_p changes; Implemented QMediaRecorder::status property; Made gst_photography dependency optional, it's not always available on desktop; Added video recording case to auto integration test; Moved backend implementation into qt namespace Task-number: QTBUG-26046 Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinmetadata.cpp')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinmetadata.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
index a98623092..4e355c0d6 100644
--- a/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.cpp
@@ -44,6 +44,8 @@
#include <gst/gst.h>
#include <gst/gstversion.h>
+QT_BEGIN_NAMESPACE
+
struct QGstreamerMetaDataKeyLookup
{
QString key;
@@ -175,3 +177,5 @@ QStringList CameraBinMetaData::availableMetaData() const
return res;
}
+
+QT_END_NAMESPACE