diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-16 09:20:06 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-06-16 09:20:06 +0200 |
| commit | e4e564d4b8c43986e925996aca8cf10c6b30136e (patch) | |
| tree | 54d414e8a54d6af444dbfb10d15a66a07a9d97da /ftnoir_tracker_pt/ftnoir_tracker_pt.h | |
| parent | d4a35684220c9e06b64ce3d39df06616f0147bdc (diff) | |
| parent | 4c5c3904a55a748f3453f5b067e2d6d0f0a11848 (diff) | |
Merge branch 'unstable' of github.com:opentrack/opentrack into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt.h')
| -rw-r--r-- | ftnoir_tracker_pt/ftnoir_tracker_pt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.h b/ftnoir_tracker_pt/ftnoir_tracker_pt.h index 349cf2c8..771631cd 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt.h +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.h @@ -33,12 +33,12 @@ //----------------------------------------------------------------------------- // Constantly processes the tracking chain in a separate thread -class Tracker : public QThread, public ITracker +class Tracker_PT : public QThread, public ITracker { Q_OBJECT public: - Tracker(); - ~Tracker() override; + Tracker_PT(); + ~Tracker_PT() override; void start_tracker(QFrame* parent_window) override; void data(double* data) override; @@ -69,7 +69,7 @@ private: PTVideoWidget* video_widget; QFrame* video_frame; - settings s; + settings_pt s; Timer time; volatile bool ever_success; |