resetCamera() will set needed resolution after resetting camera.

[harmattan/cameraplus] / qml / MainPage.qml

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index 863a58c..c4f5de4 100644 (file)
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -30,6 +30,8 @@ import CameraPlus 1.0
 CameraPage {
     id: root
 
+    property bool deviceChangeInProgress: false
+
     CameraTheme {
         id: cameraTheme
     }
@@ -80,6 +82,10 @@ CameraPage {
 
     Settings {
         id: settings
+        onDeviceAboutToChange: {
+            root.deviceChangeInProgress = true
+        }
+
         onDeviceChanged: {
             viewfinder.cameraDeviceChanged()
 
@@ -87,9 +93,22 @@ CameraPage {
             pipelineManager.error = false
 
             if (root.resetCamera(settings.device, settings.mode)) {
+                root.deviceChangeInProgress = false
                 pipelineManager.startCamera()
             }
         }
+
+        onImageAspectRatioChanged: {
+            imageSettings.setImageResolution()
+        }
+
+        onImageResolutionChanged: {
+            imageSettings.setImageResolution()
+        }
+
+        onVideoResolutionChanged: {
+            videoSettings.setVideoResolution()
+        }
     }
 
     PipelineManager {
@@ -104,6 +123,13 @@ CameraPage {
             return false
         }
 
+        if (mode == Camera.ImageMode) {
+            imageSettings.setImageResolution()
+        }
+        else if (mode == Camera.VideoMode) {
+            videoSettings.setVideoResolution()
+        }
+
         return true
     }
 
@@ -197,19 +223,10 @@ CameraPage {
         camera: viewfinder.camera
 
         function setImageResolution() {
-            var aspectRatio = settings.device == 1 ? settings.secondaryImageAspectRatio : settings.primaryImageAspectRatio
-            var resolution = settings.device == 1 ? settings.secondaryImageResolution : settings.primaryImageResolution
-
-            if (!imageSettings.setResolution(aspectRatio, resolution)) {
+            if (!imageSettings.setResolution(settings.imageAspectRatio, settings.imageResolution)) {
                 showError(qsTr("Failed to set required resolution"))
             }
         }
-
-        onReadyChanged: {
-            if (ready) {
-                imageSettings.setImageResolution()
-            }
-        }
     }
 
     VideoSettings {
@@ -217,33 +234,10 @@ CameraPage {
         camera: viewfinder.camera
 
         function setVideoResolution() {
-            var aspectRatio = settings.device == 1 ? settings.secondaryVideoAspectRatio : settings.primaryVideoAspectRatio
-            var resolution = settings.device == 1 ? settings.secondaryVideoResolution : settings.primaryVideoResolution
-
-            if (!videoSettings.setResolution(aspectRatio, resolution)) {
+            if (!videoSettings.setResolution(settings.videoAspectRatio, settings.videoResolution)) {
                 showError(qsTr("Failed to set required resolution"))
             }
         }
-
-        onReadyChanged: {
-            if (ready) {
-                videoSettings.setVideoResolution()
-            }
-        }
-    }
-
-    Connections {
-        target: settings
-
-        onPrimaryImageResolutionChanged: imageSettings.setImageResolution()
-        onPrimaryImageAspectRatioChanged: imageSettings.setImageResolution()
-        onSecondaryImageResolutionChanged: imageSettings.setImageResolution()
-        onSecondaryImageAspectRatioChanged: imageSettings.setImageResolution()
-
-        onPrimaryVideoResolutionChanged: videoSettings.setVideoResolution()
-        onPrimaryVideoAspectRatioChanged: videoSettings.setVideoResolution()
-        onSecondaryVideoResolutionChanged: videoSettings.setVideoResolution()
-        onSecondaryVideoAspectRatioChanged: videoSettings.setVideoResolution()
     }
 
     ModeController {