Viewfinder settings control (1) for OS X/iOS

QCameraViewfinderSettingsControl - version for AVFoundation plugin
('obsolete' viewfinder settings control interface, camera session uses v2
instead). v1 is implemented using v2 (the v2 object from camera service).

Change-Id: I81207b52b0ba5a67e64465f0e5e0c80d7267df3e
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/plugins/avfoundation/camera/avfcameraservice.mm b/src/plugins/avfoundation/camera/avfcameraservice.mm
index 188dc821a..f9c7e5ae6 100644
--- a/src/plugins/avfoundation/camera/avfcameraservice.mm
+++ b/src/plugins/avfoundation/camera/avfcameraservice.mm
@@ -86,6 +86,7 @@ AVFCameraService::AVFCameraService(QObject *parent):
     m_cameraZoomControl = new AVFCameraZoomControl(this);
 #endif
     m_viewfinderSettingsControl2 = new AVFCameraViewfinderSettingsControl2(this);
+    m_viewfinderSettingsControl = new AVFCameraViewfinderSettingsControl(this);
 }
 
 AVFCameraService::~AVFCameraService()
@@ -110,6 +111,7 @@ AVFCameraService::~AVFCameraService()
     delete m_cameraZoomControl;
 #endif
     delete m_viewfinderSettingsControl2;
+    delete m_viewfinderSettingsControl;
 
     delete m_session;
 }
@@ -147,6 +149,9 @@ QMediaControl *AVFCameraService::requestControl(const char *name)
     if (qstrcmp(name, QCameraViewfinderSettingsControl2_iid) == 0)
         return m_viewfinderSettingsControl2;
 
+    if (qstrcmp(name, QCameraViewfinderSettingsControl_iid) == 0)
+        return m_viewfinderSettingsControl;
+
     if (qstrcmp(name,QMediaVideoProbeControl_iid) == 0) {
         AVFMediaVideoProbeControl *videoProbe = 0;
         videoProbe = new AVFMediaVideoProbeControl(this);