Updated the camerabin2 based camera with QtMultimedia changes

Moved it to the separate plugin as the rest of gstreamer based services;
Updated with libqgsttools_p changes;
Implemented QMediaRecorder::status property;
Made gst_photography dependency optional,
it's not always available on desktop;
Added video recording case to auto integration test;
Moved backend implementation into qt namespace

Task-number: QTBUG-26046
Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

1 files changed, 30 insertions, 11 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro
index 6c0c1bf1c..bf81075bc 100644
--- a/src/plugins/gstreamer/camerabin/camerabin.pro
+++ b/src/plugins/gstreamer/camerabin/camerabin.pro
@@ -3,6 +3,8 @@ load(qt_build_config)
 TARGET = gstcamerabin
 PLUGIN_TYPE = mediaservice
 
+QT += multimedia-private
+
 load(qt_plugin)
 DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
 
@@ -13,22 +15,16 @@ INCLUDEPATH += $$PWD \
 
 INCLUDEPATH += camerabin
 
-LIBS += -lgstphotography-0.10
-
-DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
 
 HEADERS += \
+    $$PWD/camerabinserviceplugin.h \
     $$PWD/camerabinservice.h \
     $$PWD/camerabinsession.h \
     $$PWD/camerabincontrol.h \
     $$PWD/camerabinaudioencoder.h \
-    $$PWD/camerabinfocus.h \
     $$PWD/camerabinimageencoder.h \
-    $$PWD/camerabinlocks.h \
     $$PWD/camerabinrecorder.h \
     $$PWD/camerabincontainer.h \
-    $$PWD/camerabinexposure.h \
-    $$PWD/camerabinflash.h \
     $$PWD/camerabinimagecapture.h \
     $$PWD/camerabinimageprocessing.h \
     $$PWD/camerabinmetadata.h \
@@ -38,18 +34,15 @@ HEADERS += \
     $$PWD/camerabincapturebufferformat.h
 
 SOURCES += \
+    $$PWD/camerabinserviceplugin.cpp \
     $$PWD/camerabinservice.cpp \
     $$PWD/camerabinsession.cpp \
     $$PWD/camerabincontrol.cpp \
     $$PWD/camerabinaudioencoder.cpp \
     $$PWD/camerabincontainer.cpp \
-    $$PWD/camerabinexposure.cpp \
-    $$PWD/camerabinflash.cpp \
-    $$PWD/camerabinfocus.cpp \
     $$PWD/camerabinimagecapture.cpp \
     $$PWD/camerabinimageencoder.cpp \
     $$PWD/camerabinimageprocessing.cpp \
-    $$PWD/camerabinlocks.cpp \
     $$PWD/camerabinmetadata.cpp \
     $$PWD/camerabinrecorder.cpp \
     $$PWD/camerabinvideoencoder.cpp \
@@ -63,8 +56,34 @@ maemo6 {
 
     SOURCES += \
         $$PWD/camerabuttonlistener_meego.cpp
+
+    CONFIG += have_gst_photography
 }
 
+have_gst_photography {
+    DEFINES += HAVE_GST_PHOTOGRAPHY
+
+    HEADERS += \
+        $$PWD/camerabinfocus.h \
+        $$PWD/camerabinexposure.h \
+        $$PWD/camerabinflash.h \
+        $$PWD/camerabinlocks.h
+
+    SOURCES += \
+        $$PWD/camerabinexposure.cpp \
+        $$PWD/camerabinflash.cpp \
+        $$PWD/camerabinfocus.cpp \
+        $$PWD/camerabinlocks.cpp
+
+    LIBS += -lgstphotography-0.10
+    DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
+}
+
+
+
 target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
 INSTALLS += target
 
+OTHER_FILES += \
+    camerabin.json
+