Added preview-supported property to qtcamera.ini

If the camera source does not support preview then camerabin2 will
misbehave if we enable preview

diff --git a/data/n9/qtcamera.ini b/data/n9/qtcamera.ini
index fc42c95..3d10102 100644 (file)
--- a/data/n9/qtcamera.ini
+++ b/data/n9/qtcamera.ini
@@ -198,3 +198,6 @@ elements = facetracking, motiondetect
 element=facetracking
 enable=message
 message=regions-of-interest
+
+[general]
+preview-supported = true

diff --git a/lib/qtcamconfig.cpp b/lib/qtcamconfig.cpp
index 7200f64..1b2a1b8 100644 (file)
--- a/lib/qtcamconfig.cpp
+++ b/lib/qtcamconfig.cpp
@@ -215,3 +215,7 @@ QString QtCamConfig::roiEnableProperty() const {
 QString QtCamConfig::roiMessage() const {
   return d_ptr->conf->value("roi/message").toString();
 }
+
+bool QtCamConfig::isPreviewSupported() const {
+  return d_ptr->conf->value("general/preview-supported").toBool();
+}

diff --git a/lib/qtcamconfig.h b/lib/qtcamconfig.h
index 7ae3a25..cd7a493 100644 (file)
--- a/lib/qtcamconfig.h
+++ b/lib/qtcamconfig.h
@@ -82,6 +82,8 @@ public:
   QString roiEnableProperty() const;
   QString roiMessage() const;
 
+  bool isPreviewSupported() const;
+
 private:
   QtCamConfigPrivate *d_ptr;
 };

diff --git a/lib/qtcammode_p.h b/lib/qtcammode_p.h
index 02139b9..b724ffd 100644 (file)
--- a/lib/qtcammode_p.h
+++ b/lib/qtcammode_p.h
@@ -187,6 +187,12 @@ public:
 
       GstCaps *caps = gst_caps_from_string(preview.toLatin1());
 
+      if (!dev->conf->isPreviewSupported()) {
+       qWarning() << "Cannot set preview caps. Preview not supported";
+       gst_caps_unref(caps);
+       return;
+      }
+
       g_object_set(dev->cameraBin, "preview-caps", caps, "post-previews", TRUE, NULL);
 
       gst_caps_unref(caps);