Build declarative plugin as a plugin

[harmattan/cameraplus] / declarative / camera.cpp

diff --git a/declarative/camera.cpp b/declarative/camera.cpp
index 518f2f6..07f3801 100644 (file)
--- a/declarative/camera.cpp
+++ b/declarative/camera.cpp
@@ -26,7 +26,7 @@
 #include "qtcamvideomode.h"
 #include "qtcamgraphicsviewfinder.h"
 #include "qtcamconfig.h"
-#include "notifications.h"
+#include "declarativeqtcameranotifications.h"
 #include "notificationscontainer.h"
 #include "sounds.h"
 #include <QDeclarativeInfo>
@@ -44,6 +44,7 @@
 #include "flickerreduction.h"
 #include "focus.h"
 #include "autofocus.h"
+#include "roi.h"
 
 #include "videomute.h"
 #include "videotorch.h"
@@ -68,6 +69,7 @@ Camera::Camera(QDeclarativeItem *parent) :
   m_flickerReduction(0),
   m_focus(0),
   m_autoFocus(0),
+  m_roi(0),
   m_videoMute(0),
   m_videoTorch(0) {
 
@@ -100,6 +102,7 @@ Camera::~Camera() {
   delete m_flickerReduction;
   delete m_focus;
   delete m_autoFocus;
+  delete m_roi;
   delete m_videoMute;
   delete m_videoTorch;
 }
@@ -271,11 +274,11 @@ QString Camera::videoSuffix() const {
   return m_cam->config()->videoSuffix();
 }
 
-Notifications *Camera::notifications() const {
+DeclarativeQtCameraNotifications *Camera::notifications() const {
   return m_notifications->notifications();
 }
 
-void Camera::setNotifications(Notifications *notifications) {
+void Camera::setNotifications(DeclarativeQtCameraNotifications *notifications) {
   if (m_notifications->setNotifications(notifications)) {
 
     if (Sounds *s = dynamic_cast<Sounds *>(notifications)) {
@@ -350,6 +353,10 @@ void Camera::resetCapabilities() {
   m_autoFocus = new AutoFocus(dev, this);
   emit autoFocusChanged();
 
+  delete m_roi;
+  m_roi = new Roi(dev, this);
+  emit roiChanged();
+
   delete m_videoMute;
   m_videoMute = new VideoMute(dev, this);
   emit videoMuteChanged();
@@ -411,6 +418,10 @@ AutoFocus *Camera::autoFocus() const {
   return m_autoFocus;
 }
 
+Roi *Camera::roi() const {
+  return m_roi;
+}
+
 VideoMute *Camera::videoMute() const {
   return m_videoMute;
 }