diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-07-16 10:55:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 07:18:12 +0200 |
| commit | b6a8c713bcc0b0cc032fdbf909143f3ba8ca15a6 (patch) | |
| tree | 8538a615fa11b5119199fdd77e31296fcf466b25 /src/plugins/gstreamer/camerabin/camerabinfocus.cpp | |
| parent | fdc197d61402837b23ce5c1cfe3a56cf0fa9aafe (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/camerabinfocus.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinfocus.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp index 7a3f6f50b..402c88f89 100644 --- a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp @@ -51,6 +51,8 @@ #define ZOOM_PROPERTY "zoom" #define MAX_ZOOM_PROPERTY "max-zoom" +QT_BEGIN_NAMESPACE + CameraBinFocus::CameraBinFocus(CameraBinSession *session) :QCameraFocusControl(session), m_session(session), @@ -223,3 +225,5 @@ void CameraBinFocus::_q_stopFocusing() gst_photography_set_autofocus(m_session->photography(), FALSE); _q_setFocusStatus(QCamera::Unlocked, QCamera::UserRequest); } + +QT_END_NAMESPACE |