diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-02-07 14:20:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 17:53:18 +0100 |
commit | 9a55f5ce5746fa1df6daa62a7111cb2d5ff5138d (patch) | |
tree | beb13b03600a530a6820017dafa33cb0af364c6f /src/plugins/avfoundation/camera/avfcameraservice.mm | |
parent | 70415c3d9752e357e8d49633cdd8e82d3519e59b (diff) |
AVFoundation: implement QCameraInfoControl.
Change-Id: I05f3daa5c4acb90e046e26d6d577ae40dfed0e30
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraservice.mm')
-rw-r--r-- | src/plugins/avfoundation/camera/avfcameraservice.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraservice.mm b/src/plugins/avfoundation/camera/avfcameraservice.mm index 094f1b402..25111c5cc 100644 --- a/src/plugins/avfoundation/camera/avfcameraservice.mm +++ b/src/plugins/avfoundation/camera/avfcameraservice.mm @@ -44,6 +44,7 @@ #include "avfcameraservice.h" #include "avfcameracontrol.h" +#include "avfcamerainfocontrol.h" #include "avfcamerasession.h" #include "avfvideodevicecontrol.h" #include "avfaudioinputselectorcontrol.h" @@ -65,6 +66,7 @@ AVFCameraService::AVFCameraService(QObject *parent): { m_session = new AVFCameraSession(this); m_cameraControl = new AVFCameraControl(this); + m_cameraInfoControl = new AVFCameraInfoControl(this); m_videoDeviceControl = new AVFVideoDeviceControl(this); m_audioInputSelectorControl = new AVFAudioInputSelectorControl(this); @@ -98,6 +100,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name) if (qstrcmp(name, QCameraControl_iid) == 0) return m_cameraControl; + if (qstrcmp(name, QCameraInfoControl_iid) == 0) + return m_cameraInfoControl; + if (qstrcmp(name, QVideoDeviceSelectorControl_iid) == 0) return m_videoDeviceControl; |