Clean up zooming API

There is very little point these days in having properties
for both optical and digital zoom. Most mobile cameras don't
have a real optical zoom, but instead combine different cameras
with different focal lengths.

Change-Id: Icac48d949e767d7f3105c4d330e15273fe715fbe
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

1 files changed, 7 insertions, 13 deletions

diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index c8f7ae60d..1b8d69628 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -99,8 +99,7 @@ class Q_MULTIMEDIA_EXPORT QCameraFocus : public QObject
     Q_PROPERTY(FocusPointMode focusPointMode READ focusPointMode WRITE setFocusPointMode)
     Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint)
     Q_PROPERTY(QCameraFocusZoneList focusZones READ focusZones NOTIFY focusZonesChanged)
-    Q_PROPERTY(qreal opticalZoom READ opticalZoom NOTIFY opticalZoomChanged)
-    Q_PROPERTY(qreal digitalZoom READ digitalZoom NOTIFY digitalZoomChanged)
+    Q_PROPERTY(float zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
 
     Q_ENUMS(FocusMode)
     Q_ENUMS(FocusPointMode)
@@ -136,22 +135,17 @@ public:
 
     QCameraFocusZoneList focusZones() const;
 
-    qreal maximumOpticalZoom() const;
-    qreal maximumDigitalZoom() const;
-    qreal opticalZoom() const;
-    qreal digitalZoom() const;
+    float minimumZoomFactor() const;
+    float maximumZoomFactor() const;
+    float zoomFactor() const;
+    void setZoomFactor(float factor);
 
-    void zoomTo(qreal opticalZoom, qreal digitalZoom);
+    void zoomTo(float zoom, float rate);
 
 Q_SIGNALS:
-    void opticalZoomChanged(qreal);
-    void digitalZoomChanged(qreal);
-
+    void zoomFactorChanged(float);
     void focusZonesChanged();
 
-    void maximumOpticalZoomChanged(qreal);
-    void maximumDigitalZoomChanged(qreal);
-
 protected:
     ~QCameraFocus();