Move qt_cam_copy_register to QtCamera

[harmattan/cameraplus] / lib / qtcamimagemode.cpp

diff --git a/lib/qtcamimagemode.cpp b/lib/qtcamimagemode.cpp
index 1132fab..6aae13b 100644 (file)
--- a/lib/qtcamimagemode.cpp
+++ b/lib/qtcamimagemode.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
@@ -28,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;
 
@@ -59,30 +64,31 @@ QtCamImageMode::~QtCamImageMode() {
 }
 
 bool QtCamImageMode::canCapture() {
-  return QtCamMode::canCapture() && d_ptr->dev->isWrapperReady();
+  return QtCamMode::canCapture() && d_ptr->dev->isReadyForCapture();
 }
 
 void QtCamImageMode::applySettings() {
   bool night = d_ptr->inNightMode();
 
-  int fps = night ? d->settings.nightFrameRate() : d->settings.frameRate();
+  int fps = night ? d->resolution.nightFrameRate() : d->resolution.frameRate();
 
-  d_ptr->setCaps("viewfinder-caps", d->settings.viewfinderResolution(), fps);
+  d_ptr->setCaps("viewfinder-caps", d->resolution.viewfinderResolution(), fps);
 
   // 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->settings.captureResolution(), -1);
+  d_ptr->setCaps("image-capture-caps", d->resolution.captureResolution(), -1);
 
-  setPreviewSize(d->settings.previewResolution());
+  d_ptr->setPreviewSize(d->resolution.previewResolution());
 
-  // TODO: ?
-  // d_ptr->resetCaps("video-capture-caps");
+  // 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() {
@@ -98,7 +104,7 @@ bool QtCamImageMode::capture(const QString& fileName) {
     return false;
   }
 
-  setFileName(fileName);
+  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);
@@ -106,10 +112,17 @@ 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->isRunning() || !d_ptr->dev->q_ptr->isIdle()) {
+  if (!d_ptr->dev->q_ptr->isIdle()) {
     return false;
   }
 
@@ -126,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;
+}