Merge QCameraZoomControl into QCameraFocusControl

The public API also only uses one class to control both.

Change-Id: I55ba5ae168d77d7a05a21f22164aaf0752482020
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 20 insertions, 0 deletions

diff --git a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h b/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
index 26135e534..56f4bc54d 100644
--- a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
+++ b/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
@@ -45,6 +45,8 @@
 
 #include <qcamerafocuscontrol.h>
 
+#include <AVFoundation/AVFoundation.h>
+
 @class AVCaptureDevice;
 
 QT_BEGIN_NAMESPACE
@@ -70,18 +72,36 @@ public:
 
     QCameraFocusZoneList focusZones() const override;
 
+    qreal maximumOpticalZoom() const override;
+    qreal maximumDigitalZoom() const override;
+
+    qreal requestedOpticalZoom() const override;
+    qreal requestedDigitalZoom() const override;
+    qreal currentOpticalZoom() const override;
+    qreal currentDigitalZoom() const override;
+
+    void zoomTo(qreal optical, qreal digital) override;
+
 private Q_SLOTS:
     void cameraStateChanged();
 
 private:
+#ifdef QOS_IOS
+    void zoomToRequestedDigital();
+#endif
 
     AVFCameraSession *m_session;
     QCameraFocus::FocusModes m_focusMode;
     QCameraFocus::FocusPointMode m_focusPointMode;
     QPointF m_customFocusPoint;
     QPointF m_actualFocusPoint;
+
+    CGFloat m_maxZoomFactor;
+    CGFloat m_zoomFactor;
+    CGFloat m_requestedZoomFactor;
 };
 
+
 QT_END_NAMESPACE
 
 #endif // AVFCAMERAFOCUSCONTROL_H