Reset pipeline manager error and try to start camera device when device gets changed

[harmattan/cameraplus] / declarative / plugin.cpp

diff --git a/declarative/plugin.cpp b/declarative/plugin.cpp
index aeec702..dbc34ff 100644 (file)
--- a/declarative/plugin.cpp
+++ b/declarative/plugin.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
@@ -44,17 +44,26 @@
 #include "imageresolutionmodel.h"
 #include "videosettings.h"
 #include "videoresolutionmodel.h"
-#include "declarativeqtcameranotifications.h"
 #include "sounds.h"
+#include "cameraconfig.h"
+#include "videoplayer.h"
+#include "viewfinder.h"
+#include "capability.h"
+#if defined(QT4)
+#include <QDeclarativeEngine>
+#elif defined(QT5)
+#include <QQmlEngine>
+#endif
 
-#include <QtDeclarative>
-
-#define URI "QtCamera"
 #define MAJOR 1
 #define MINOR 0
 
 Plugin::Plugin(QObject *parent) :
+#if defined(QT4)
   QDeclarativeExtensionPlugin(parent) {
+#elif defined(QT5)
+  QQmlExtensionPlugin(parent) {
+#endif
 
 }
 
@@ -62,13 +71,19 @@ Plugin::~Plugin() {
 
 }
 
+#if defined(QT4)
 void Plugin::initializeEngine(QDeclarativeEngine *engine, const char *uri) {
+#elif defined(QT5)
+void Plugin::initializeEngine(QQmlEngine *engine, const char *uri) {
+#endif
   Q_UNUSED(uri);
 
   engine->addImageProvider("preview", new PreviewProvider);
 }
 
 void Plugin::registerTypes(const char *uri) {
+  Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCamera"));
+
   qmlRegisterType<Camera>(uri, MAJOR, MINOR, "Camera");
   qmlRegisterType<ImageMode>(uri, MAJOR, MINOR, "ImageMode");
   qmlRegisterType<VideoMode>(uri, MAJOR, MINOR, "VideoMode");
@@ -80,7 +95,7 @@ void Plugin::registerTypes(const char *uri) {
   qmlRegisterUncreatableType<WhiteBalance>(uri, MAJOR, MINOR, "WhiteBalance", QObject::tr("Cannot create separate instance of WhiteBalance"));
   qmlRegisterUncreatableType<ColorTone>(uri, MAJOR, MINOR, "ColorTone", QObject::tr("Cannot create separate instance of ColorTone"));
   qmlRegisterUncreatableType<Exposure>(uri, MAJOR, MINOR, "Exposure", QObject::tr("Cannot create separate instance of Exposure"));
-  qmlRegisterUncreatableType<Aperture>(uri, MAJOR, MINOR, "Aperture", QObject::tr("Cannot create separate instance of Iso"));
+  qmlRegisterUncreatableType<Aperture>(uri, MAJOR, MINOR, "Aperture", QObject::tr("Cannot create separate instance of Aperture"));
   qmlRegisterUncreatableType<Iso>(uri, MAJOR, MINOR, "Iso", QObject::tr("Cannot create separate instance of Iso"));
   qmlRegisterUncreatableType<NoiseReduction>(uri, MAJOR, MINOR, "NoiseReduction", QObject::tr("Cannot create separate instance of NoiseReduction"));
   qmlRegisterUncreatableType<FlickerReduction>(uri, MAJOR, MINOR, "FlickerReduction", QObject::tr("Cannot create separate instance of FlickerReduction"));
@@ -95,7 +110,6 @@ void Plugin::registerTypes(const char *uri) {
   qmlRegisterType<ImageSettings>(uri, MAJOR, MINOR, "ImageSettings");
   qmlRegisterType<VideoSettings>(uri, MAJOR, MINOR, "VideoSettings");
   qmlRegisterType<Sounds>(uri, MAJOR, MINOR, "Sounds");
-  qmlRegisterInterface<DeclarativeQtCameraNotifications>("DeclarativeQtCameraNotifications");
 
   qmlRegisterUncreatableType<ImageResolutionModel>(uri, MAJOR, MINOR, "ImageResolutionModel",
                          "ImageResolutionModel can be obtained from ImageSettings");
@@ -103,6 +117,13 @@ void Plugin::registerTypes(const char *uri) {
                          "VideoResolutionModel can be obtained from VideoSettings");
 
   qmlRegisterType<Mode>();
+  qmlRegisterType<CameraConfig>(uri, MAJOR, MINOR, "CameraConfig");
+
+  qmlRegisterType<VideoPlayer>("QtCameraExtras", MAJOR, MINOR, "VideoPlayer");
+  qmlRegisterType<Viewfinder>(uri, MAJOR, MINOR, "Viewfinder");
+  qmlRegisterType<Capability>();
 }
 
+#if defined(QT4)
 Q_EXPORT_PLUGIN2(declarativeqtcamera, Plugin);
+#endif