diff options
author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-01-13 17:32:27 +0100 |
---|---|---|
committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-02-05 17:24:59 +0000 |
commit | 60541844c10f86288a847728b71b211f5fa958b4 (patch) | |
tree | 0ff241521edaf886786f0cf06df6f5c28c8a953a /src/plugins/avfoundation/camera/avfcameraservice.mm | |
parent | bc2c42d6c6a927688a17ca5060c25a4e5c709734 (diff) |
AVFCameraFocusControl - focus control for iOS / OS X
Camera focus control for AVFoundation plugin (iOS/OS X).
Change-Id: I0a79e7057ecbb66413debb8eac0f48ff679fc7ba
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraservice.mm')
-rw-r--r-- | src/plugins/avfoundation/camera/avfcameraservice.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraservice.mm b/src/plugins/avfoundation/camera/avfcameraservice.mm index cdd983a22..d617dc954 100644 --- a/src/plugins/avfoundation/camera/avfcameraservice.mm +++ b/src/plugins/avfoundation/camera/avfcameraservice.mm @@ -55,6 +55,7 @@ #include "avfmediarecordercontrol.h" #include "avfimagecapturecontrol.h" #include "avfmediavideoprobecontrol.h" +#include "avfcamerafocuscontrol.h" #include <private/qmediaplaylistnavigator_p.h> #include <qmediaplaylist.h> @@ -74,6 +75,8 @@ AVFCameraService::AVFCameraService(QObject *parent): m_metaDataControl = new AVFCameraMetaDataControl(this); m_recorderControl = new AVFMediaRecorderControl(this); m_imageCaptureControl = new AVFImageCaptureControl(this); + + m_cameraFocusControl = new AVFCameraFocusControl(this); } AVFCameraService::~AVFCameraService() @@ -92,6 +95,7 @@ AVFCameraService::~AVFCameraService() //delete m_recorderControl; delete m_metaDataControl; delete m_cameraControl; + delete m_cameraFocusControl; delete m_session; } @@ -120,6 +124,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name) if (qstrcmp(name, QCameraImageCaptureControl_iid) == 0) return m_imageCaptureControl; + if (qstrcmp(name, QCameraFocusControl_iid) == 0) + return m_cameraFocusControl; + if (qstrcmp(name,QMediaVideoProbeControl_iid) == 0) { AVFMediaVideoProbeControl *videoProbe = 0; videoProbe = new AVFMediaVideoProbeControl(this); |