Merge lp:~fboucault/qtubuntu-camera/no_black_screens into lp:qtubuntu-camera

[Florian Boucault]

Fixed disconnection so that it always happens and reconnection always works.
Removed never executed code that was supposed to work around deletion issues.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

[Jim Hodapp (jhodapp)]

Looks good, thanks

review: Approve (code)

=== modified file 'src/aalcameraservice.cpp'
--- src/aalcameraservice.cpp	2014-07-08 15:12:58 +0000
+++ src/aalcameraservice.cpp	2014-07-21 15:59:58 +0000
@@ -39,8 +39,7 @@
 AalCameraService::AalCameraService(QObject *parent):
     QMediaService(parent),
     m_androidControl(0),
-    m_androidListener(0),
-    m_oldAndroidControl(0)
+    m_androidListener(0)
 {
     m_service = this;
 
@@ -77,8 +76,6 @@
     delete m_videoOutput;
     delete m_viewfinderControl;
     delete m_exposureControl;
-    if (m_oldAndroidControl)
-        android_camera_delete(m_oldAndroidControl);
     if (m_androidControl)
         android_camera_delete(m_androidControl);
     delete m_storageManager;
@@ -148,15 +145,6 @@
     if (m_androidControl)
         return true;
 
-    if (m_oldAndroidControl){
-        /// FIXME
-        /// becasue android_camera_disconnect() is asynchronous, it's not deleted directly when calling disconnect
-        /// properly implemented, whe should be notified when it can be deleted
-        /// in case 2 switches happend very fast, this delete might happen too eraly
-        android_camera_delete(m_oldAndroidControl);
-    }
-    m_oldAndroidControl = m_androidControl;
-
     CameraType device = BACK_FACING_CAMERA_TYPE;
     if (!isBackCameraUsed())
         device = FRONT_FACING_CAMERA_TYPE;
@@ -190,8 +178,7 @@
 
 void AalCameraService::disconnectCamera()
 {
-    if (m_service->videoOutputControl()->isViewfinderRunning())
-        m_service->videoOutputControl()->stopPreview();
+    m_service->videoOutputControl()->stopPreview();
 
     if (m_androidControl) {
         android_camera_disconnect(m_androidControl);
 
=== modified file 'src/aalcameraservice.h'
--- src/aalcameraservice.h	2014-07-08 15:12:58 +0000
+++ src/aalcameraservice.h	2014-07-21 15:59:58 +0000
@@ -105,7 +105,6 @@
 
     CameraControl *m_androidControl;
     CameraControlListener *m_androidListener;
-    CameraControl *m_oldAndroidControl;
 
     StorageManager *m_storageManager;
 };