Changeset 137 in flair-src for trunk/lib/FlairSensorActuator/src/V4LCamera.cpp

Timestamp:

Feb 14, 2017, 3:06:20 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

singleton manager

File:

• trunk/lib/FlairSensorActuator/src/V4LCamera.cpp (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/V4LCamera.cpp

@@ -20 +20 @@
 #include <DoubleSpinBox.h>
 #include <CheckBox.h>
-#include <GridLayout.h>
 #include <Label.h>
 #include <cvimage.h>
@@ -33 +32 @@
 namespace sensor {
 
-V4LCamera::V4LCamera(const FrameworkManager *parent, string name,
+V4LCamera::V4LCamera(string name,
                      uint8_t camera_index, uint16_t width, uint16_t height,
                      cvimage::Type::Format format, uint8_t priority)
-    : Thread(parent, name, priority),
-      Camera(parent, name, width, height, format) {
+    : Thread(getFrameworkManager(), name, priority),
+      Camera(name, width, height, format) {
   capture = cvCaptureFromCAM(camera_index); // a mettre apres l'init dsp