summaryrefslogtreecommitdiffhomepage
path: root/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-06-11 20:05:36 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-06-11 20:05:36 +0200
commit64dea656becd8c914a3c8dc3f3b4f0d71bd3f2d0 (patch)
tree17aecacbb6d6c7c663ccd465ab92703dc52d51cf /FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
parent2f85648fe4b6ec33adb2fa90be16da49acd1ad71 (diff)
Defer PT apply to avoid deadlock
Diffstat (limited to 'FTNoIR_Tracker_PT/ftnoir_tracker_pt.h')
-rw-r--r--FTNoIR_Tracker_PT/ftnoir_tracker_pt.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
index 80abbc6a..47a9987b 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.h
@@ -44,6 +44,7 @@ public:
virtual void refreshVideo();
void apply(settings& s);
+ void apply_inner();
void center();
void reset(); // reset the trackers internal state variables
void run();
@@ -81,9 +82,10 @@ protected:
PTVideoWidget* video_widget;
QFrame* video_frame;
- bool tracking_valid;
-
+ bool tracking_valid, need_apply;
+
settings s;
+ settings* new_settings;
Timer time;
};