X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lib%2Fqtcamimagemode.cpp;h=6aae13b7ae638759bd5898b937ef822ddcb24840;hb=bbaadb8139399ca7d6088bf8ff69fa487eae57bd;hp=06ca23c5639c724612d058c653b890b8f2e624d6;hpb=6d43d172a593b11d737cf5ba982f129772d36412;p=harmattan%2Fcameraplus

diff --git a/lib/qtcamimagemode.cpp b/lib/qtcamimagemode.cpp
index 06ca23c..6aae13b 100644
--- a/lib/qtcamimagemode.cpp
+++ b/lib/qtcamimagemode.cpp
@@ -1,3 +1,23 @@
+/*!
+ * This file is part of CameraPlus.
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #include "qtcamimagemode.h"
 #include "qtcammode_p.h"
 #include "qtcamdevice_p.h"
@@ -8,18 +28,23 @@ class QtCamImageModePrivate : public QtCamModePrivate {
 public:
   QtCamImageModePrivate(QtCamDevicePrivate *dev) :
   QtCamModePrivate(dev),
-  settings(dev->conf->defaultImageSettings()) {
+  settings(dev->conf->imageSettings(dev->id)),
+  resolution(settings->defaultResolution()) {
 
   }
 
   ~QtCamImageModePrivate() {
+    delete settings;
   }
 
-  QtCamImageSettings settings;
+  QtCamImageSettings *settings;
+  QtCamImageResolution resolution;
 };
 
 QtCamImageMode::QtCamImageMode(QtCamDevicePrivate *dev, QObject *parent) :
-  QtCamMode(new QtCamImageModePrivate(dev), "mode-image", "image-done", parent) {
+  QtCamMode(new QtCamImageModePrivate(dev), "mode-image", parent) {
+
+  d_ptr->init(new DoneHandler(d_ptr, "image-done", this));
 
   d = (QtCamImageModePrivate *)d_ptr;
 
@@ -39,20 +64,31 @@ QtCamImageMode::~QtCamImageMode() {
 }
 
 bool QtCamImageMode::canCapture() {
-  return QtCamMode::canCapture() && d_ptr->dev->isWrapperReady();
+  return QtCamMode::canCapture() && d_ptr->dev->isReadyForCapture();
 }
 
 void QtCamImageMode::applySettings() {
-  d_ptr->setCaps("image-capture-caps", d->settings.captureResolution(),
-		 d->settings.frameRate());
-  d_ptr->setCaps("viewfinder-caps", d->settings.viewfinderResolution(),
-		 d->settings.frameRate());
+  bool night = d_ptr->inNightMode();
+
+  int fps = night ? d->resolution.nightFrameRate() : d->resolution.frameRate();
+
+  d_ptr->setCaps("viewfinder-caps", d->resolution.viewfinderResolution(), fps);
 
-  setPreviewSize(d->settings.previewResolution());
+  // FIXME:
+  // Ideally, we should query the image-capture-supported-caps and get a proper framerate
+  // as it seems that subdevsrc2 can only capture 15 FPS for at least the highest resolution
+  // we use. For now we will not set any FPS.
+  d_ptr->setCaps("image-capture-caps", d->resolution.captureResolution(), -1);
+
+  d_ptr->setPreviewSize(d->resolution.previewResolution());
+
+  // If we don't reset the caps then: if we switch from video to image then we fail
+  // the next time we restart the pipeline.
+  d_ptr->resetCaps("video-capture-caps");
 }
 
 void QtCamImageMode::start() {
-  // Nothing
+  d_ptr->enableViewfinderFilters();
 }
 
 void QtCamImageMode::stop() {
@@ -64,7 +100,11 @@ bool QtCamImageMode::capture(const QString& fileName) {
     return false;
   }
 
-  setFileName(fileName);
+  if (fileName.isEmpty()) {
+    return false;
+  }
+
+  d_ptr->setFileName(fileName);
 
   g_object_set(d_ptr->dev->cameraBin, "location", fileName.toUtf8().data(), NULL);
   g_signal_emit_by_name(d_ptr->dev->cameraBin, "start-capture", NULL);
@@ -72,8 +112,15 @@ bool QtCamImageMode::capture(const QString& fileName) {
   return true;
 }
 
-bool QtCamImageMode::setSettings(const QtCamImageSettings& settings) {
-  d->settings = settings;
+bool QtCamImageMode::setResolution(const QtCamImageResolution& resolution) {
+  d->resolution = resolution;
+
+  if (!d_ptr->dev->q_ptr->isRunning()) {
+    // We will return true here because setting the resolution on a non-running pipeline
+    // doesn't make much sense (Probably the only use case is as a kind of optimization only).
+    // We will set it anyway when the pipeline gets started.
+    return true;
+  }
 
   if (!d_ptr->dev->q_ptr->isIdle()) {
     return false;
@@ -92,3 +139,11 @@ void QtCamImageMode::setProfile(GstEncodingProfile *profile) {
 
   g_object_set(d_ptr->dev->cameraBin, "image-profile", profile, NULL);
 }
+
+QtCamImageSettings *QtCamImageMode::settings() const {
+  return d->settings;
+}
+
+QtCamImageResolution QtCamImageMode::currentResolution() {
+  return d->resolution;
+}