Merge branch 'unstable' into trackhat-ui

3 files changed, 15 insertions, 2 deletions

diff --git a/ftnoir_tracker_pt/camera.h b/ftnoir_tracker_pt/camera.h
index bffd19ee..63614ded 100644
--- a/ftnoir_tracker_pt/camera.h
+++ b/ftnoir_tracker_pt/camera.h
@@ -89,12 +89,13 @@ public:
     void start() override;
     void stop() override;
 
+    operator cv::VideoCapture&() { return *cap; }
+
 protected:
     bool _get_frame(cv::Mat* frame) override;
     void _set_fps() override;
     void _set_res() override;
     void _set_device_index() override;
-
 private:
     cv::VideoCapture* cap;
 };
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index 2f852343..d48f9252 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -86,7 +86,12 @@ void Tracker_PT::run()
         const double dt = time.elapsed() * 1e-9;
         time.start();
         cv::Mat frame;
-        const bool new_frame = camera.get_frame(dt, &frame);
+        bool new_frame;
+
+        {
+            QMutexLocker l(&camera_mtx);
+            new_frame = camera.get_frame(dt, &frame);
+        }
 
         if (new_frame && !frame.empty())
         {
@@ -145,6 +150,7 @@ void Tracker_PT::run()
 void Tracker_PT::apply_settings()
 {
     qDebug()<<"Tracker:: Applying settings";
+    QMutexLocker l(&camera_mtx);
     QMutexLocker lock(&mutex);
     camera.set_device_index(camera_name_to_index("PS3Eye Camera"));
     int res_x, res_y, cam_fps;
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.h b/ftnoir_tracker_pt/ftnoir_tracker_pt.h
index 3b9f1648..d0764933 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.h
@@ -17,6 +17,7 @@
 #include "point_tracker.h"
 #include "pt_video_widget.h"
 #include "opentrack/timer.hpp"
+#include "opentrack/opencv-camera-dialog.hpp"
 
 #include <QThread>
 #include <QMutex>
@@ -30,11 +31,15 @@
 #endif
 #include <vector>
 
+class TrackerDialog_PT;
+
 //-----------------------------------------------------------------------------
 // Constantly processes the tracking chain in a separate thread
 class Tracker_PT : public QThread, public ITracker
 {
     Q_OBJECT
+    friend class camera_dialog<Tracker_PT>;
+    friend class TrackerDialog_PT;
 public:
     Tracker_PT();
     ~Tracker_PT() override;
@@ -61,6 +66,7 @@ private:
     
     volatile int commands;
 
+    QMutex camera_mtx;
     CVCamera       camera;
     PointExtractor point_extractor;
     PointTracker   point_tracker;