Move qt_cam_copy_register to QtCamera

[harmattan/cameraplus] / lib / qtcamconfig.h

diff --git a/lib/qtcamconfig.h b/lib/qtcamconfig.h
index 3fa00c7..bd1469c 100644 (file)
--- a/lib/qtcamconfig.h
+++ b/lib/qtcamconfig.h
@@ -24,15 +24,16 @@
 #define QT_CAM_CONFIG_H
 
 #include <QObject>
 #define QT_CAM_CONFIG_H
 
 #include <QObject>

-#include "qtcamimagesettings.h"
-#include "qtcamvideosettings.h"

 #include <QStringList>
 
 #include <QStringList>
 

+class QtCamImageSettings;
+class QtCamVideoSettings;
+class QtCamQuirks;
+

 #define SCANNER_TYPE_V4L2                     "v4l2"
 #define SCANNER_TYPE_ENUM                     "enum"
 
 #define RENDERER_TYPE_MEEGO                   "meego"
 #define SCANNER_TYPE_V4L2                     "v4l2"
 #define SCANNER_TYPE_ENUM                     "enum"
 
 #define RENDERER_TYPE_MEEGO                   "meego"

-#define RENDERER_TYPE_GENERIC                 "generic"

 
 #ifndef DATA_DIR
 #define DATA_DIR                              "/usr/share/qtcamera/config/"
 
 #ifndef DATA_DIR
 #define DATA_DIR                              "/usr/share/qtcamera/config/"


@@ -64,6 +65,7 @@ public:
 
   QtCamImageSettings *imageSettings(const QVariant& id);
   QtCamVideoSettings *videoSettings(const QVariant& id);
 
   QtCamImageSettings *imageSettings(const QVariant& id);
   QtCamVideoSettings *videoSettings(const QVariant& id);

+  QtCamQuirks *quirks(const QVariant& id);

 
   QString imageEncodingProfileName() const;
   QString imageEncodingProfilePath() const;
 
   QString imageEncodingProfileName() const;
   QString imageEncodingProfilePath() const;


@@ -76,12 +78,6 @@ public:
 
   QString audioCaptureCaps() const;
 
 
   QString audioCaptureCaps() const;
 

-  QString imageCaptureStartedSound() const;
-  QString imageCaptureEndedSound() const;
-  QString videoRecordingStartedSound() const;
-  QString videoRecordingEndedSound() const;
-  QString autoFocusAcquiredSound() const;
-

   QStringList viewfinderFilters() const;
 
   QString roiElement() const;
   QStringList viewfinderFilters() const;
 
   QString roiElement() const;


@@ -89,6 +85,8 @@ public:
   QString roiEnableProperty() const;
   QString roiMessage() const;
 
   QString roiEnableProperty() const;
   QString roiMessage() const;
 

+  bool isPreviewSupported() const;
+

 private:
   QtCamConfigPrivate *d_ptr;
 };
 private:
   QtCamConfigPrivate *d_ptr;
 };