GstCamera: Watch for zoom and max-zoom property changes in Gstreamer CameraBin

Camerabin can signal a change in those properties and we need to communicate those back to the application.

Change-Id: Iaa3ce57769c10460821126a467202a6a4139d040
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: Raine Mäkeläinen <raine.makelainen@jolla.com>

2 files changed, 35 insertions, 1 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinzoom.cpp b/src/plugins/gstreamer/camerabin/camerabinzoom.cpp
index bb3659493..401e13207 100644
--- a/src/plugins/gstreamer/camerabin/camerabinzoom.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinzoom.cpp
@@ -51,7 +51,9 @@ CameraBinZoom::CameraBinZoom(CameraBinSession *session)
     , m_requestedOpticalZoom(1.0)
     , m_requestedDigitalZoom(1.0)
 {
-
+    GstElement *camerabin = m_session->cameraBin();
+    g_signal_connect(G_OBJECT(camerabin), "notify::zoom", G_CALLBACK(updateZoom), this);
+    g_signal_connect(G_OBJECT(camerabin), "notify::max-zoom", G_CALLBACK(updateMaxZoom), this);
 }
 
 CameraBinZoom::~CameraBinZoom()
@@ -114,4 +116,32 @@ void CameraBinZoom::zoomTo(qreal optical, qreal digital)
         emit currentDigitalZoomChanged(digital);
 }
 
+void CameraBinZoom::updateZoom(GObject *o, GParamSpec *p, gpointer d)
+{
+    Q_UNUSED(p);
+
+    gfloat zoomFactor = 1.0;
+    g_object_get(o, ZOOM_PROPERTY, &zoomFactor, NULL);
+
+    CameraBinZoom *zoom = reinterpret_cast<CameraBinZoom *>(d);
+
+    QMetaObject::invokeMethod(zoom, "currentDigitalZoomChanged",
+                              Qt::QueuedConnection,
+                              Q_ARG(qreal, zoomFactor));
+}
+
+void CameraBinZoom::updateMaxZoom(GObject *o, GParamSpec *p, gpointer d)
+{
+    Q_UNUSED(p);
+
+    gfloat zoomFactor = 1.0;
+    g_object_get(o, MAX_ZOOM_PROPERTY, &zoomFactor, NULL);
+
+    CameraBinZoom *zoom = reinterpret_cast<CameraBinZoom *>(d);
+
+    QMetaObject::invokeMethod(zoom, "maximumDigitalZoomChanged",
+                              Qt::QueuedConnection,
+                              Q_ARG(qreal, zoomFactor));
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/gstreamer/camerabin/camerabinzoom.h b/src/plugins/gstreamer/camerabin/camerabinzoom.h
index 8ad4764b2..858ada2da 100644
--- a/src/plugins/gstreamer/camerabin/camerabinzoom.h
+++ b/src/plugins/gstreamer/camerabin/camerabinzoom.h
@@ -41,6 +41,7 @@
 #define CAMERABINZOOMCONTROL_H
 
 #include <qcamerazoomcontrol.h>
+#include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,6 +65,9 @@ public:
     void zoomTo(qreal optical, qreal digital) override;
 
 private:
+    static void updateZoom(GObject *o, GParamSpec *p, gpointer d);
+    static void updateMaxZoom(GObject *o, GParamSpec *p, gpointer d);
+
     CameraBinSession *m_session;
     qreal m_requestedOpticalZoom;
     qreal m_requestedDigitalZoom;