main: refactor interlocked parts

1 files changed, 6 insertions, 3 deletions

diff --git a/facetracknoir/tracker.h b/facetracknoir/tracker.h
index afb86802..75f54084 100644
--- a/facetracknoir/tracker.h
+++ b/facetracknoir/tracker.h
@@ -15,27 +15,30 @@
 #include <QMutex>
 #include <QThread>
 
-class Tracker : protected QThread {
+class Tracker : private QThread {
     Q_OBJECT
 private:
     QMutex mtx;
     main_settings& s;
     // XXX can be const-cast when functionconfig const-correct -sh 20141004
     Mappings& m;
+    
     Timer t;
     Pose output_pose, raw_6dof, raw_center, unstopped_raw;
     double newpose[6];
     std::atomic<bool> centerp;
     std::atomic<bool> enabledp;
     std::atomic<bool> should_quit;
-
+    SelectedLibraries const& libs;
+    
     double map(double pos, Mapping& axis);
     void logic();
+    
     static void t_compensate(const double* input, double* output, bool rz);
 protected:
     void run() override;
 public:
-    Tracker(main_settings& s, Mappings& m);
+    Tracker(main_settings& s, Mappings& m, SelectedLibraries& libs);
     ~Tracker();
 
     void get_raw_and_mapped_poses(double* mapped, double* raw) const;