Refactor and rename isWrapperReady to isReadyForCapture()

This better describes what the function should do.
We will check the "ready-for-capture" property on video source
if we don't have a wrapper instead of returning false.

diff --git a/lib/qtcamdevice_p.h b/lib/qtcamdevice_p.h
index 3334cb4..b0cb65d 100644 (file)
--- a/lib/qtcamdevice_p.h
+++ b/lib/qtcamdevice_p.h
@@ -181,13 +181,18 @@ public:
     }
   }
 
     }
   }
 

-  bool isWrapperReady() {
-    if (!wrapperVideoSource) {
+  bool isReadyForCapture() {
+    GstElement *src = videoSource;
+    if (wrapperVideoSource) {
+      src = wrapperVideoSource;
+    }
+
+    if (!src) {

       return false;
     }
 
     gboolean ready = FALSE;
       return false;
     }
 
     gboolean ready = FALSE;

-    g_object_get(wrapperVideoSource, "ready-for-capture", &ready, NULL);
+    g_object_get(src, "ready-for-capture", &ready, NULL);

 
     return ready == TRUE;
   }
 
     return ready == TRUE;
   }

diff --git a/lib/qtcamimagemode.cpp b/lib/qtcamimagemode.cpp
index 073bf24..09af7f7 100644 (file)
--- a/lib/qtcamimagemode.cpp
+++ b/lib/qtcamimagemode.cpp
@@ -64,7 +64,7 @@ QtCamImageMode::~QtCamImageMode() {
 }
 
 bool QtCamImageMode::canCapture() {
 }
 
 bool QtCamImageMode::canCapture() {

-  return QtCamMode::canCapture() && d_ptr->dev->isWrapperReady();
+  return QtCamMode::canCapture() && d_ptr->dev->isReadyForCapture();

 }
 
 void QtCamImageMode::applySettings() {
 }
 
 void QtCamImageMode::applySettings() {