Revert "Move qt_cam_copy_register to QtCamera"

This reverts commit 9ad5a2d40dabd90687e8851fe336a32155be5933.

diff --git a/lib/qtcamdevice.cpp b/lib/qtcamdevice.cpp
index ed00c5e..38da29b 100644 (file)
--- a/lib/qtcamdevice.cpp
+++ b/lib/qtcamdevice.cpp
@@ -29,6 +29,7 @@
 #include "qtcamimagemode.h"
 #include "qtcamvideomode.h"
 #include "qtcamnotifications.h"
+#include "gst/gstcopy.h"
 #include "qtcampropertysetter.h"
 #include "qtcamanalysisbin.h"
 
@@ -36,6 +37,12 @@ QtCamDevice::QtCamDevice(QtCamConfig *config, const QString& name,
                         const QVariant& id, QObject *parent) :
   QObject(parent), d_ptr(new QtCamDevicePrivate) {
 
+  static gboolean register_copy = TRUE;
+  if (register_copy) {
+    qt_cam_copy_register();
+    register_copy = FALSE;
+  }
+
   d_ptr->q_ptr = this;
   d_ptr->name = name;
   d_ptr->id = id;

diff --git a/lib/qtcamera.cpp b/lib/qtcamera.cpp
index 46c01df..6fc24d7 100644 (file)
--- a/lib/qtcamera.cpp
+++ b/lib/qtcamera.cpp
@@ -22,15 +22,10 @@
 #include "qtcamscanner.h"
 #include "qtcamconfig.h"
 #include "qtcamdevice.h"
-#include "gst/gstcopy.h"
 #include <gst/gst.h>
 
 class QtCameraPrivate {
 public:
-  QtCameraPrivate() {
-    qt_cam_copy_register();
-  }
-
   QtCamConfig *conf;
   QtCamScanner *scanner;
 };