Added reset button to exposure settings

[harmattan/cameraplus] / lib / qtcamvideomode.cpp

diff --git a/lib/qtcamvideomode.cpp b/lib/qtcamvideomode.cpp
index 21feb5a..762c108 100644 (file)
--- a/lib/qtcamvideomode.cpp
+++ b/lib/qtcamvideomode.cpp
@@ -1,7 +1,7 @@
 /*!
  * This file is part of CameraPlus.
  *
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012-2013 Mohammed Sameer <msameer@foolab.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -55,20 +55,13 @@ public:
 class VideoDoneHandler : public DoneHandler {
 public:
   VideoDoneHandler(QtCamModePrivate *d, QObject *parent = 0) :
-    DoneHandler(d, "video-done", parent) {}
+    DoneHandler(d, "video-done", parent), m_done(false) {}
 
   virtual void handleMessage(GstMessage *message) {
     DoneHandler::handleMessage(message);
-
     wake();
   }
 
-  void wake() {
-    lock();
-    m_cond.wakeOne();
-    unlock();
-  }
-
   void lock() {
     m_mutex.lock();
   }
@@ -81,7 +74,23 @@ public:
     m_cond.wait(&m_mutex);
   }
 
+  void reset() {
+    m_done = false;
+  }
+
+  bool isDone() {
+    return m_done;
+  }
+
 private:
+  void wake() {
+    lock();
+    m_done = true;
+    m_cond.wakeOne();
+    unlock();
+  }
+
+  bool m_done;
   QMutex m_mutex;
   QWaitCondition m_cond;
 };
@@ -163,6 +172,9 @@ bool QtCamVideoMode::startRecording(const QString& fileName, const QString& tmpF
   g_object_set(d_ptr->dev->cameraBin, "location", file.toUtf8().data(), NULL);
   g_signal_emit_by_name(d_ptr->dev->cameraBin, "start-capture", NULL);
 
+  VideoDoneHandler *handler = dynamic_cast<VideoDoneHandler *>(d_ptr->doneHandler);
+  handler->reset();
+
   emit recordingStateChanged();
 
   emit canCaptureChanged();
@@ -175,6 +187,11 @@ void QtCamVideoMode::stopRecording(bool sync) {
     VideoDoneHandler *handler = dynamic_cast<VideoDoneHandler *>(d_ptr->doneHandler);
     if (sync) {
       handler->lock();
+
+      if (handler->isDone()) {
+       handler->unlock();
+       return;
+      }
     }
 
     g_signal_emit_by_name(d_ptr->dev->cameraBin, "stop-capture", NULL);
@@ -218,4 +235,8 @@ QtCamVideoSettings *QtCamVideoMode::settings() {
   return d->settings;
 }
 
+QtCamVideoResolution QtCamVideoMode::currentResolution() {
+  return d->resolution;
+}
+
 #include "moc_qtcamvideomode.cpp"