Added methods to obtain image and video suffixes from QtCamConfig

QML Camera component: added properties to obtain image and video suffixes

diff --git a/imports/camera.cpp b/imports/camera.cpp
index aa8fedc..cc27106 100644 (file)
--- a/imports/camera.cpp
+++ b/imports/camera.cpp
@@ -5,6 +5,9 @@
 #include "qtcamimagemode.h"
 #include "qtcamvideomode.h"
 #include "qtcamgraphicsviewfinder.h"
+#include "qtcamconfig.h"
+
+// TODO: a viewfinder class that inherits QDeclarativeItem
 
 Camera::Camera(QDeclarativeItem *parent) :
   QDeclarativeItem(parent),
@@ -145,3 +148,11 @@ void Camera::applyMode() {
     m_dev->imageMode()->activate();
   }
 }
+
+QString Camera::imageSuffix() const {
+  return m_cam->config()->imageSuffix();
+}
+
+QString Camera::videoSuffix() const {
+  return m_cam->config()->videoSuffix();
+}

diff --git a/imports/camera.h b/imports/camera.h
index 72051e5..4cf978f 100644 (file)
--- a/imports/camera.h
+++ b/imports/camera.h
@@ -18,6 +18,8 @@ class Camera : public QDeclarativeItem {
   Q_PROPERTY(CameraMode mode READ mode WRITE setMode NOTIFY modeChanged);
   Q_PROPERTY(bool idle READ isIdle NOTIFY idleStateChanged);
   Q_PROPERTY(bool running READ isRunning NOTIFY runningStateChanged);
+  Q_PROPERTY(QString imageSuffix READ imageSuffix CONSTANT);
+  Q_PROPERTY(QString videoSuffix READ videoSuffix CONSTANT);
   Q_ENUMS(CameraMode);
 
 public:
@@ -48,6 +50,9 @@ public:
   bool isIdle();
   bool isRunning();
 
+  QString imageSuffix() const;
+  QString videoSuffix() const;
+
 public slots:
   void stop();
 

diff --git a/lib/qtcamconfig.cpp b/lib/qtcamconfig.cpp
index 55e224e..25469e1 100644 (file)
--- a/lib/qtcamconfig.cpp
+++ b/lib/qtcamconfig.cpp
@@ -163,3 +163,11 @@ QString QtCamConfig::videoEncodingProfilePath() const {
 QString QtCamConfig::audioCaptureCaps() const {
   return d_ptr->conf->value("audio-capture-caps/caps").toString();
 }
+
+QString QtCamConfig::imageSuffix() const {
+  return d_ptr->conf->value("image/extension").toString();
+}
+
+QString QtCamConfig::videoSuffix() const {
+  return d_ptr->conf->value("video/extension").toString();
+}

diff --git a/lib/qtcamconfig.h b/lib/qtcamconfig.h
index c6f002c..af9bb3a 100644 (file)
--- a/lib/qtcamconfig.h
+++ b/lib/qtcamconfig.h
@@ -48,6 +48,9 @@ public:
   QString videoEncodingProfileName() const;
   QString videoEncodingProfilePath() const;
 
+  QString imageSuffix() const;
+  QString videoSuffix() const;
+
   QString audioCaptureCaps() const;
 
 private: