diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-06 11:41:16 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-06 11:41:16 +0200 |
| commit | 3a54a111567370ecf903704d702d12736b693a8e (patch) | |
| tree | 1981d1bb3a97165d954ed8856061bb44d88fdd7c /ftnoir_tracker_pt/ftnoir_tracker_pt.h | |
| parent | f58efb5c2c51e5866d4640036865792b822641f6 (diff) | |
| parent | fcb8ca75c0c274be2321f0ba91e9f129ae63e354 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt.h')
| -rw-r--r-- | ftnoir_tracker_pt/ftnoir_tracker_pt.h | 6 |
1 files changed, 6 insertions, 0 deletions
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; |