Revert "Implemented per device resolution setting and selection"

[harmattan/cameraplus] / src / platformsettings.cpp

diff --git a/src/platformsettings.cpp b/src/platformsettings.cpp
index 2d20498..18e5a64 100644 (file)
--- a/src/platformsettings.cpp
+++ b/src/platformsettings.cpp
@@ -21,8 +21,10 @@
 #include "platformsettings.h"
 #include <QDir>
 #include <QSettings>
+#ifdef HARMATTAN
 #include <Quill>
 #include "quillitem.h"
+#endif
 
 #define PATH "/usr/share/cameraplus/config/cameraplus.ini"
 
@@ -34,6 +36,18 @@
 #define DBUS_THUMBNAILING_ENABLED                true
 #define BACKGROUND_RENDERING_COLOR               QColor(Qt::black)
 
+#ifdef HARMATTAN
+#define IMAGE_PATH QString("%1%2MyDocs%2DCIM%2").arg(QDir::homePath()).arg(QDir::separator())
+#define VIDEO_PATH IMAGE_PATH
+#define TEMP_VIDEO QString("%1%2MyDocs%2.cameraplus%2").arg(QDir::homePath()).arg(QDir::separator())
+#endif
+
+#ifdef SAILFISH
+#define IMAGE_PATH QString("%1%2Pictures%2Camera%2").arg(QDir::homePath()).arg(QDir::separator())
+#define VIDEO_PATH QString("%1%2Videos%2Camera%2").arg(QDir::homePath()).arg(QDir::separator())
+#define TEMP_VIDEO VIDEO_PATH
+#endif
+
 PlatformSettings::PlatformSettings(QObject *parent) :
   QObject(parent), m_settings(new QSettings(PATH, QSettings::IniFormat)) {
 
@@ -82,6 +96,7 @@ QSize PlatformSettings::landscapeSize(const QSize& size) {
 }
 
 void PlatformSettings::init() {
+#ifdef HARMATTAN
   // How we create thumbnails for portrait is really messy.
   // I am sure there is a better way to tell Quill to generate proper
   // portrait thumbnails without having 2 display levels but I don't know how.
@@ -106,6 +121,7 @@ void PlatformSettings::init() {
   QString tempPath = temporaryFilePath();
   QDir().mkpath(tempPath);
   Quill::setTemporaryFilePath(tempPath);
+#endif
 }
 
 PlatformSettings::Service PlatformSettings::service(const QString& id) {
@@ -123,3 +139,35 @@ PlatformSettings::Service PlatformSettings::service(const QString& id) {
 
   return service;
 }
+
+QString PlatformSettings::imageCaptureStartedSound() const {
+  return m_settings->value("sounds/imageCaptureStarted").toString();
+}
+
+QString PlatformSettings::imageCaptureEndedSound() const {
+  return m_settings->value("sounds/imageCaptureEnded").toString();
+}
+
+QString PlatformSettings::videoRecordingStartedSound() const {
+  return m_settings->value("sounds/videoRecordingStarted").toString();
+}
+
+QString PlatformSettings::videoRecordingEndedSound() const {
+  return m_settings->value("sounds/videoRecordingEnded").toString();
+}
+
+QString PlatformSettings::autoFocusAcquiredSound() const {
+  return m_settings->value("sounds/autoFocusAcquired").toString();
+}
+
+QString PlatformSettings::imagePath() const {
+  return IMAGE_PATH;
+}
+
+QString PlatformSettings::videoPath() const {
+  return VIDEO_PATH;
+}
+
+QString PlatformSettings::temporaryVideoPath() const {
+  return TEMP_VIDEO;
+}