Move qt_cam_copy_register to QtCamera

[harmattan/cameraplus] / lib / qtcamera.cpp

diff --git a/lib/qtcamera.cpp b/lib/qtcamera.cpp
index 3f712bd..97f4304 100644 (file)
--- a/lib/qtcamera.cpp
+++ b/lib/qtcamera.cpp
@@ -1,7 +1,28 @@
+/*!
+ * This file is part of CameraPlus.
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+

 #include "qtcamera.h"
 #include "qtcamscanner.h"
 #include "qtcamconfig.h"
 #include "qtcamdevice.h"
 #include "qtcamera.h"
 #include "qtcamscanner.h"
 #include "qtcamconfig.h"
 #include "qtcamdevice.h"

+#include "gst/gstcopy.h"

 #include <gst/gst.h>
 
 class QtCameraPrivate {
 #include <gst/gst.h>
 
 class QtCameraPrivate {


@@ -14,6 +35,7 @@ QtCamera::QtCamera(QObject *parent) :
   QObject(parent), d_ptr(new QtCameraPrivate) {
 
   gst_init(0, 0);
   QObject(parent), d_ptr(new QtCameraPrivate) {
 
   gst_init(0, 0);

+  qt_cam_copy_register();

 
   d_ptr->conf = new QtCamConfig(this);
   d_ptr->scanner = new QtCamScanner(d_ptr->conf, this);
 
   d_ptr->conf = new QtCamConfig(this);
   d_ptr->scanner = new QtCamScanner(d_ptr->conf, this);


@@ -25,6 +47,7 @@ QtCamera::QtCamera(const QString& configPath, QObject *parent) :
   QObject(parent), d_ptr(new QtCameraPrivate) {
 
   gst_init(0, 0);
   QObject(parent), d_ptr(new QtCameraPrivate) {
 
   gst_init(0, 0);

+  qt_cam_copy_register();

 
   d_ptr->conf = new QtCamConfig(configPath, this);
   d_ptr->scanner = new QtCamScanner(d_ptr->conf, this);
 
   d_ptr->conf = new QtCamConfig(configPath, this);
   d_ptr->scanner = new QtCamScanner(d_ptr->conf, this);


@@ -36,6 +59,7 @@ QtCamera::QtCamera(QtCamConfig *config, QObject *parent) :
   QObject(parent), d_ptr(new QtCameraPrivate) {
 
   gst_init(0, 0);
   QObject(parent), d_ptr(new QtCameraPrivate) {
 
   gst_init(0, 0);

+  qt_cam_copy_register();

 
   d_ptr->conf = config;
   d_ptr->scanner = new QtCamScanner(d_ptr->conf, this);
 
   d_ptr->conf = config;
   d_ptr->scanner = new QtCamScanner(d_ptr->conf, this);


@@ -49,7 +73,6 @@ QtCamera::~QtCamera() {
   gst_deinit();
 }
 
   gst_deinit();
 }
 

-

 void QtCamera::refreshDevices() {
   d_ptr->scanner->refresh();
 }
 void QtCamera::refreshDevices() {
   d_ptr->scanner->refresh();
 }