Added ImageSettings::currentResolution and methods to find ImageResolution and set it

[harmattan/cameraplus] / declarative / imagemode.cpp

diff --git a/declarative/imagemode.cpp b/declarative/imagemode.cpp
index a58bf99..4f2fd23 100644 (file)
--- a/declarative/imagemode.cpp
+++ b/declarative/imagemode.cpp
@@ -39,11 +39,21 @@ bool ImageMode::capture(const QString& fileName) {
 }
 
 void ImageMode::preChangeMode() {
+  if (m_image) {
+    QObject::disconnect(m_image, SIGNAL(captureStarted()), this, SIGNAL(captureStarted()));
+    QObject::disconnect(m_image, SIGNAL(captureEnded()), this, SIGNAL(captureEnded()));
+  }
+
   m_image = 0;
 }
 
 void ImageMode::postChangeMode() {
   m_image = m_cam->device()->imageMode();
+
+  if (m_image) {
+    QObject::connect(m_image, SIGNAL(captureStarted()), this, SIGNAL(captureStarted()));
+    QObject::connect(m_image, SIGNAL(captureEnded()), this, SIGNAL(captureEnded()));
+  }
 }
 
 void ImageMode::changeMode() {