Merge lp:~schwann/qtubuntu-camera/camera-torch-support into lp:qtubuntu-camera

[Günter Schwann]

Support FlashTorch

Support FlashTorch
This enable support for the torch component as well.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-camera-ci/28/rebuild

review: Approve (continuous-integration)

[Victor Tuson Palau (vtuson)]

I try the deb but broke the cam and the app running via QTcreator gives the following error
/usr/lib/arm-linux-gnueabihf/qt5/bin/qmlscene: symbol lookup error: /usr/lib/arm-linux-gnueabihf/qt5/plugins/mediaservice/libaalcamera.so: undefined symbol: _ZN12SharedSignal8instanceEv

[Günter Schwann (schwann)]

Ok - so we need to wait for an image including the new libhybris (with video support)

[Victor Tuson Palau (vtuson)]

> Ok - so we need to wait for an image including the new libhybris (with video
> support)
please ping me in irc when this us ready to test. thanks

[lp:~schwann/qtubuntu-camera/camera-torch-support]

53. By Günter Schwann on 2013-06-14

Trunk merged

[Günter Schwann (schwann)]

Victor - it's fixed now. You can test it again (didn't see you on IRC ;)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-camera-ci/31/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

The debian package of the last build here on the saucy image-13 works fine for me.

[lp:~schwann/qtubuntu-camera/camera-torch-support]

54. By Günter Schwann on 2013-07-02

Trunk merged

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/20
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-camera-ci/38/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-camera-ci/39/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/22
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-camera-ci/40/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-camera-ci/41/rebuild

review: Approve (continuous-integration)

[Victor Tuson Palau (vtuson)]

using the latest build Camera.FlashTorch works fine.

[Victor Tuson Palau (vtuson)]

WFM!

review: Approve

=== modified file 'src/aalcameraflashcontrol.cpp'
--- src/aalcameraflashcontrol.cpp	2013-06-05 16:11:12 +0000
+++ src/aalcameraflashcontrol.cpp	2013-07-02 13:37:08 +0000
@@ -39,7 +39,8 @@
 {
     if (m_service->isBackCameraUsed()) {
         if (mode==QCameraExposure::FlashAuto || mode==QCameraExposure::FlashOff ||
-                mode==QCameraExposure::FlashOn || mode==QCameraExposure::FlashVideoLight) {
+                mode==QCameraExposure::FlashOn || mode==QCameraExposure::FlashVideoLight ||
+                mode==QCameraExposure::FlashTorch) {
             return true;
         }
     } else {
@@ -98,6 +99,7 @@
     case QCameraExposure::FlashOn:
         return FLASH_MODE_ON;
     case QCameraExposure::FlashVideoLight:
+    case QCameraExposure::FlashTorch:
         return FLASH_MODE_TORCH;
     case QCameraExposure::FlashAuto:
     default:
@@ -113,7 +115,7 @@
     case FLASH_MODE_ON:
         return QCameraExposure::FlashOn;
     case FLASH_MODE_TORCH:
-        return QCameraExposure::FlashVideoLight;
+        return QCameraExposure::FlashTorch;
     case FLASH_MODE_AUTO:
     default:
         return QCameraExposure::FlashAuto;