X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lib%2Fqtcamconfig.cpp;h=1b2a1b83f4dbe197169b601d4635559c021ba214;hb=0da718e86100458cc336d51ca79554e4fbac415d;hp=b570ac7bc5d6ea5b1e190ecc87784665ab3b0cd4;hpb=4f3bdd1a7e95c3bb30d08f32f5dfff1869443875;p=harmattan%2Fcameraplus

diff --git a/lib/qtcamconfig.cpp b/lib/qtcamconfig.cpp
index b570ac7..1b2a1b8 100644
--- a/lib/qtcamconfig.cpp
+++ b/lib/qtcamconfig.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
@@ -23,7 +23,7 @@
 #include <QStringList>
 #include <QDebug>
 
-#define CONFIGURATION_FILE                    "/etc/qtcamera/qtcamera.ini"
+#define CONFIGURATION_FILE                    DATA_DIR"/qtcamera.ini"
 
 class QtCamConfigPrivate {
 public:
@@ -196,26 +196,26 @@ QString QtCamConfig::videoSuffix() const {
   return d_ptr->conf->value("video/extension").toString();
 }
 
-QString QtCamConfig::imageCaptureStartedSound() const {
-  return d_ptr->conf->value("sounds/imageCaptureStarted").toString();
+QStringList QtCamConfig::viewfinderFilters() const {
+  return d_ptr->conf->value("viewfinder-filters/elements").toStringList();
 }
 
-QString QtCamConfig::imageCaptureEndedSound() const {
-  return d_ptr->conf->value("sounds/imageCaptureEnded").toString();
+QString QtCamConfig::roiElement() const {
+  return d_ptr->conf->value("roi/element").toString();
 }
 
-QString QtCamConfig::videoRecordingStartedSound() const {
-  return d_ptr->conf->value("sounds/videoRecordingStarted").toString();
+QString QtCamConfig::roiMessageName() const {
+  return d_ptr->conf->value("roi/message").toString();
 }
 
-QString QtCamConfig::videoRecordingEndedSound() const {
-  return d_ptr->conf->value("sounds/videoRecordingEnded").toString();
+QString QtCamConfig::roiEnableProperty() const {
+  return d_ptr->conf->value("roi/enable").toString();
 }
 
-QString QtCamConfig::autoFocusAcquiredSound() const {
-  return d_ptr->conf->value("sounds/autoFocusAcquired").toString();
+QString QtCamConfig::roiMessage() const {
+  return d_ptr->conf->value("roi/message").toString();
 }
 
-QStringList QtCamConfig::viewfinderFilters() const {
-  return d_ptr->conf->value("viewfinder-filters/elements").toStringList();
+bool QtCamConfig::isPreviewSupported() const {
+  return d_ptr->conf->value("general/preview-supported").toBool();
 }