From 9ad5a2d40dabd90687e8851fe336a32155be5933 Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Thu, 12 Sep 2013 02:35:24 +0300 Subject: [PATCH] Move qt_cam_copy_register to QtCamera This ensures we do it only once per application instead of once per device. --- lib/qtcamdevice.cpp | 7 ------- lib/qtcamera.cpp | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/qtcamdevice.cpp b/lib/qtcamdevice.cpp index 38da29b..ed00c5e 100644 --- a/lib/qtcamdevice.cpp +++ b/lib/qtcamdevice.cpp @@ -29,7 +29,6 @@ #include "qtcamimagemode.h" #include "qtcamvideomode.h" #include "qtcamnotifications.h" -#include "gst/gstcopy.h" #include "qtcampropertysetter.h" #include "qtcamanalysisbin.h" @@ -37,12 +36,6 @@ 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 6fc24d7..46c01df 100644 --- a/lib/qtcamera.cpp +++ b/lib/qtcamera.cpp @@ -22,10 +22,15 @@ #include "qtcamscanner.h" #include "qtcamconfig.h" #include "qtcamdevice.h" +#include "gst/gstcopy.h" #include class QtCameraPrivate { public: + QtCameraPrivate() { + qt_cam_copy_register(); + } + QtCamConfig *conf; QtCamScanner *scanner; }; -- 2.25.1