Changelog for 0.0.8

[harmattan/cameraplus] / declarative / viewfinder.cpp

diff --git a/declarative/viewfinder.cpp b/declarative/viewfinder.cpp
index 17a7659..c8f7d44 100644 (file)
--- a/declarative/viewfinder.cpp
+++ b/declarative/viewfinder.cpp
@@ -31,6 +31,7 @@
 #endif
 #include <QPainter>
 #include "qtcamdevice.h"
+#include <QMatrix4x4>
 
 #if defined(QT4)
 Viewfinder::Viewfinder(QDeclarativeItem *parent) :
@@ -42,6 +43,7 @@ Viewfinder::Viewfinder(QQuickItem *parent) :
   m_renderer(0),
   m_cam(0),
   m_conf(0),
+  m_dev(0),
   m_enabled(true) {
 
 #if defined(QT4)
@@ -56,7 +58,13 @@ Viewfinder::Viewfinder(QQuickItem *parent) :
 }
 
 Viewfinder::~Viewfinder() {
+  if (m_cam) {
+    m_cam->stop(true);
+  }
 
+  if (m_dev) {
+    m_dev->setViewfinder(0);
+  }
 }
 
 bool Viewfinder::isRenderingEnabled() const {
@@ -91,12 +99,14 @@ void Viewfinder::setCamera(Camera *camera) {
 
   if (m_cam) {
     QObject::disconnect(m_cam, SIGNAL(deviceChanged()), this, SLOT(deviceChanged()));
+    QObject::disconnect(m_cam, SIGNAL(prepareForDeviceChange()), this, SLOT(prepareForDeviceChange()));
   }
 
   m_cam = camera;
 
   if (m_cam) {
     QObject::connect(m_cam, SIGNAL(deviceChanged()), this, SLOT(deviceChanged()));
+    QObject::connect(m_cam, SIGNAL(prepareForDeviceChange()), this, SLOT(prepareForDeviceChange()));
   }
 
   if (isComponentComplete()) {
@@ -184,6 +194,12 @@ void Viewfinder::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeo
 }
 
 void Viewfinder::componentComplete() {
+#if defined(QT4)
+  QDeclarativeItem::componentComplete();
+#elif defined(QT5)
+  QQuickPaintedItem::componentComplete();
+#endif
+
   if (!m_cam) {
     qmlInfo(this) << "Camera not set";
     return;
@@ -212,10 +228,15 @@ void Viewfinder::deviceChanged() {
     return;
   }
 
-  QtCamDevice *dev = m_cam->device();
+  if (m_dev) {
+    qmlInfo(this) << "Cannot set a new device without cleaning up the existing one";
+    abort();
+  }
 
-  if (dev) {
-    dev->setViewfinder(this);
+  m_dev = m_cam->device();
+
+  if (m_dev) {
+    m_dev->setViewfinder(this);
   }
 
   emit renderAreaChanged();
@@ -226,12 +247,6 @@ GstElement *Viewfinder::sinkElement() {
   return m_renderer ? m_renderer->sinkElement() : 0;
 }
 
-bool Viewfinder::setDevice(QtCamDevice *device) {
-  Q_UNUSED(device);
-
-  return true;
-}
-
 void Viewfinder::stop() {
   if (m_renderer) {
     m_renderer->reset();
@@ -243,3 +258,10 @@ void Viewfinder::updateRequested() {
     update();
   }
 }
+
+void Viewfinder::prepareForDeviceChange() {
+  if (m_dev) {
+    m_dev->setViewfinder(0);
+    m_dev = 0;
+  }
+}