Renamed imports to declarative and libimports to libdeclarativeqtcamera

[harmattan/cameraplus] / src / cameraresources.h

diff --git a/src/cameraresources.h b/src/cameraresources.h
index c6c7594..ba1e448 100644 (file)
--- a/src/cameraresources.h
+++ b/src/cameraresources.h
@@ -26,6 +26,7 @@
 #include <QObject>
 #include <QThread>
 #include <policy/resource-set.h>
+
 class CameraResourcesWorker;
 
 class CameraResources : public QObject {
@@ -33,6 +34,7 @@ class CameraResources : public QObject {
 
   Q_PROPERTY(bool acquired READ acquired NOTIFY acquiredChanged);
   Q_PROPERTY(bool hijacked READ hijacked NOTIFY hijackedChanged);
+  Q_PROPERTY(bool scaleAcquired READ isScaleAcquired NOTIFY scaleAcquisitionChanged);
 
   Q_ENUMS(Mode);
   Q_ENUMS(ResourceType);
@@ -46,31 +48,24 @@ public:
     PostCapture,
   } Mode;
 
-  typedef enum {
-    AudioPlaybackType = ResourcePolicy::AudioPlaybackType,
-    VideoPlaybackType = ResourcePolicy::VideoPlaybackType,
-    AudioRecorderType = ResourcePolicy::AudioRecorderType,
-    VideoRecorderType = ResourcePolicy::VideoRecorderType,
-    ScaleButtonType = ResourcePolicy::ScaleButtonType,
-    SnapButtonType = ResourcePolicy::SnapButtonType,
-    LensCoverType = ResourcePolicy::LensCoverType,
-  } ResourceType;
-
   CameraResources(QObject *parent = 0);
   ~CameraResources();
 
   Q_INVOKABLE bool acquire(const Mode& mode);
 
-  Q_INVOKABLE bool isResourceGranted(const ResourceType& resource);
-
   bool acquired() const;
   bool hijacked() const;
+  bool isScaleAcquired() const;
 
 signals:
   void acquiredChanged();
   void hijackedChanged();
+  void updated();
+  void scaleAcquisitionChanged();
 
 private:
+  bool isResourceGranted(const ResourcePolicy::ResourceType& resource) const;
+
   CameraResourcesWorker *m_worker;
   QThread m_thread;
 };
@@ -86,11 +81,12 @@ public slots:
   void acquire(bool *ok, const CameraResources::Mode& mode);
   void acquired(bool *ok);
   void hijacked(bool *ok);
-  void isResourceGranted(bool *ok, const CameraResources::ResourceType& resource);
+  void isResourceGranted(bool *ok, int resource);
 
 signals:
   void acquiredChanged();
   void hijackedChanged();
+  void updated();
 
 private slots:
   void init();
@@ -115,7 +111,6 @@ private:
   ResourcePolicy::ResourceSet *m_set;
 
   CameraResources::Mode m_mode;
-  QMutex m_mutex;
   bool m_acquired;
   bool m_acquiring;
   bool m_hijacked;