Added QtCamFlash::ready to indicate readiness of flash

[harmattan/cameraplus] / lib / qtcamflash.cpp

diff --git a/lib/qtcamflash.cpp b/lib/qtcamflash.cpp
index 24f1eb2..cc6e16a 100644 (file)
--- a/lib/qtcamflash.cpp
+++ b/lib/qtcamflash.cpp
@@ -20,10 +20,19 @@
 
 #include "qtcamflash.h"
 #include "qtcamcapability_p.h"
+#include "qtcamflash_p.h"
 
 QtCamFlash::QtCamFlash(QtCamDevice *dev, QObject *parent) :
-  QtCamCapability(new QtCamCapabilityPrivate(dev, QtCamCapability::Flash, "flash-mode"), parent) {
+  QtCamCapability(new QtCamFlashPrivate(dev, parent), parent) {
 
+  QtCamFlashPrivate *pvt = dynamic_cast<QtCamFlashPrivate *>(d_ptr);
+
+  // We get a weird crash if we pass this as parent to QtCamFlashPrivate
+  pvt->setParent(this);
+
+  QObject::connect(pvt, SIGNAL(flashReadyChanged()), this, SIGNAL(flashReadyChanged()));
+
+  pvt->init();
 }
 
 QtCamFlash::~QtCamFlash() {
@@ -51,3 +60,7 @@ QtCamFlash::FlashMode QtCamFlash::value() {
 bool QtCamFlash::setValue(const QtCamFlash::FlashMode& mode) {
   return d_ptr->setIntValue(mode, false);
 }
+
+bool QtCamFlash::isReady() const {
+  return dynamic_cast<QtCamFlashPrivate *>(d_ptr)->isReady();
+}