From 513ef3ab3ad8231b783905f7ddd7a83d6ef1ae1f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 20 Jul 2015 12:57:43 +0200
Subject: pt: cleanup some data races

---
 ftnoir_tracker_pt/ftnoir_tracker_pt.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt.cpp')

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index be946018..013777bc 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -72,6 +72,8 @@ void Tracker_PT::run()
 	if (!log_file.open(QIODevice::WriteOnly | QIODevice::Text)) return;
 	QTextStream log_stream(&log_file);
 #endif
+
+    apply_settings();
     
     while((commands & ABORT) == 0)
     {
@@ -152,9 +154,11 @@ void Tracker_PT::apply_settings()
 {
     qDebug()<<"Tracker:: Applying settings";
     QMutexLocker l(&camera_mtx);
+    camera.stop();
     camera.set_device_index(camera_name_to_index(s.camera_name));
     camera.set_res(s.cam_res_x, s.cam_res_y);
     camera.set_fps(s.cam_fps);
+    camera.start();
     cv::Mat intrinsics_ = cv::Mat::eye(3, 3, CV_32FC1);
     cv::Mat dist_coeffs_ = cv::Mat::zeros(5, 1, CV_32FC1);
     intrinsics = cv::Mat();
@@ -183,8 +187,6 @@ void Tracker_PT::start_tracker(QFrame *parent_window)
     video_layout->addWidget(video_widget);
     video_frame->setLayout(video_layout);
     video_widget->resize(video_frame->width(), video_frame->height());
-    camera.start();
-    apply_settings();
     start();
 }
 
-- 
cgit v1.2.3


From faec4b17c7cffb2836b4f364326f494af93bb7c1 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 20 Jul 2015 12:58:12 +0200
Subject: cleanup ftnoir code

---
 ftnoir_tracker_pt/ftnoir_tracker_pt.cpp | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt.cpp')

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index 013777bc..48a62c2c 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -190,18 +190,7 @@ void Tracker_PT::start_tracker(QFrame *parent_window)
     start();
 }
 
-#ifndef OPENTRACK_API
-void Tracker::StopTracker(bool exit)
-{
-    set_command(PAUSE);
-}
-#endif
-
-#ifdef OPENTRACK_API
-#define THeadPoseData double
-#endif
-
-void Tracker_PT::data(THeadPoseData *data)
+void Tracker_PT::data(double *data)
 {
     if (ever_success)
     {
@@ -237,14 +226,6 @@ void Tracker_PT::data(THeadPoseData *data)
     }
 }
 
-//-----------------------------------------------------------------------------
-#ifdef OPENTRACK_API
 #include "ftnoir_tracker_pt_dialog.h"
 OPENTRACK_DECLARE_TRACKER(Tracker_PT, TrackerDialog_PT, TrackerDll)
-#else
-#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-OPENTRACK_EXPORT ITrackerPtr __stdcall GetTracker()
-{
-    return new Tracker_PT;
-}
-#endif
+
-- 
cgit v1.2.3