Merge lp:~fboucault/camera-app/hdr_always_works into lp:camera-app/staging

[Florian Boucault]

Make sure that regardless of when HDR is enabled it will eventually be enabled in the backend.

[Florian Boucault (fboucault)]

Needs https://code.launchpad.net/~fboucault/qtubuntu-camera/set_exposure_before_init/+merge/281524

[Ugo Riboni (uriboni)]

Works as expected, and code looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:627
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/8/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/358
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/888
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26417

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/8/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'CameraApp/advancedcamerasettings.cpp'
--- CameraApp/advancedcamerasettings.cpp	2015-12-02 08:27:19 +0000
+++ CameraApp/advancedcamerasettings.cpp	2016-01-05 13:09:18 +0000
@@ -44,7 +44,8 @@
     m_cameraFlashControl(0),
     m_cameraExposureControl(0),
     m_imageEncoderControl(0),
-    m_videoEncoderControl(0)
+    m_videoEncoderControl(0),
+    m_hdrEnabled(false)
 {
 }
 
@@ -236,6 +237,9 @@
 
     m_cameraFlashControl = flashControlFromCamera(m_camera);
     m_cameraExposureControl = exposureControlFromCamera(m_camera);
+    QVariant exposureMode = m_hdrEnabled ? QVariant::fromValue(ExposureHdr)
+                                         : QVariant::fromValue(QCameraExposure::ExposureAuto);
+    m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
 
     if (m_cameraExposureControl) {
         QObject::connect(m_cameraExposureControl,
@@ -451,20 +455,20 @@
 
 bool AdvancedCameraSettings::hdrEnabled() const
 {
-    if (m_cameraExposureControl) {
-        QVariant exposureMode = m_cameraExposureControl->actualValue(QCameraExposureControl::ExposureMode);
-        return exposureMode.value<QCameraExposure::ExposureMode>() == ExposureHdr;
-    } else {
-        return false;
-    }
+    return m_hdrEnabled;
 }
 
 void AdvancedCameraSettings::setHdrEnabled(bool enabled)
 {
-    if (m_cameraExposureControl) {
-        QVariant exposureMode = enabled ? QVariant::fromValue(ExposureHdr)
-                                        : QVariant::fromValue(QCameraExposure::ExposureAuto);
-        m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
+    if (enabled != m_hdrEnabled) {
+        m_hdrEnabled = enabled;
+        if (m_cameraExposureControl) {
+            QVariant exposureMode = enabled ? QVariant::fromValue(ExposureHdr)
+                                            : QVariant::fromValue(QCameraExposure::ExposureAuto);
+            m_cameraExposureControl->setValue(QCameraExposureControl::ExposureMode, exposureMode);
+        } else {
+            Q_EMIT hdrEnabledChanged();
+        }
     }
 }
 
 
=== modified file 'CameraApp/advancedcamerasettings.h'
--- CameraApp/advancedcamerasettings.h	2015-11-17 15:25:03 +0000
+++ CameraApp/advancedcamerasettings.h	2016-01-05 13:09:18 +0000
@@ -108,6 +108,7 @@
     QCameraExposureControl* m_cameraExposureControl;
     QImageEncoderControl* m_imageEncoderControl;
     QVideoEncoderSettingsControl* m_videoEncoderControl;
+    bool m_hdrEnabled;
 };
 
 #endif // ADVANCEDCAMERASETTINGS_H