GStreamer: runtime check for controls that require GstPhotography.

Exposure, Flash, Focus and Locks controls were always initialized,
even when the GstPhotography interface was not available (on desktop
for example), causing some warnings and fooling the user in believing
that these features were available.
These controls are now lazily initialized and only when
GstPhotography is available.

The zoom control is not compile-checked anymore since it doesn't
actually require GstPhotography.

Change-Id: I5e8315d796dd920c9c29ccfa4155707f5f0fd7dc
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/plugins/gstreamer/camerabin/camerabinsession.h
index fa9dba989..7ef5b7ae3 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.h
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.h
@@ -121,13 +121,13 @@ public:
     CameraBinImageEncoder *imageEncodeControl() const { return m_imageEncodeControl; }
 
 #ifdef HAVE_GST_PHOTOGRAPHY
-    CameraBinExposure *cameraExposureControl() const  { return m_cameraExposureControl; }
-    CameraBinFlash *cameraFlashControl() const  { return m_cameraFlashControl; }
-    CameraBinFocus *cameraFocusControl() const  { return m_cameraFocusControl; }
-    CameraBinLocks *cameraLocksControl() const { return m_cameraLocksControl; }
-    CameraBinZoom *cameraZoomControl() const { return m_cameraZoomControl; }
+    CameraBinExposure *cameraExposureControl();
+    CameraBinFlash *cameraFlashControl();
+    CameraBinFocus *cameraFocusControl();
+    CameraBinLocks *cameraLocksControl();
 #endif
 
+    CameraBinZoom *cameraZoomControl() const { return m_cameraZoomControl; }
     CameraBinImageProcessing *imageProcessingControl() const { return m_imageProcessingControl; }
     CameraBinCaptureDestination *captureDestinationControl() const { return m_captureDestinationControl; }
     CameraBinCaptureBufferFormat *captureBufferFormatControl() const { return m_captureBufferFormatControl; }
@@ -238,9 +238,8 @@ private:
     CameraBinFlash *m_cameraFlashControl;
     CameraBinFocus *m_cameraFocusControl;
     CameraBinLocks *m_cameraLocksControl;
-    CameraBinZoom *m_cameraZoomControl;
 #endif
-
+    CameraBinZoom *m_cameraZoomControl;
     CameraBinImageProcessing *m_imageProcessingControl;
     CameraBinCaptureDestination *m_captureDestinationControl;
     CameraBinCaptureBufferFormat *m_captureBufferFormatControl;