From 47a512da1e98b88cd96fc761c567cef4eadd376c Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 18 Jun 2015 08:45:52 +0200
Subject: flush

It crashes after drawing a frame for now.
---
 opentrack/selected-libraries.cpp | 6 +++---
 opentrack/selected-libraries.hpp | 2 +-
 opentrack/tracker.cpp            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'opentrack')

diff --git a/opentrack/selected-libraries.cpp b/opentrack/selected-libraries.cpp
index 8cb226c8..d76c0111 100644
--- a/opentrack/selected-libraries.cpp
+++ b/opentrack/selected-libraries.cpp
@@ -14,15 +14,15 @@ static mem<t> make_instance(mem<dylib> lib)
     return ret;
 }
 
-SelectedLibraries::SelectedLibraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f) :
+SelectedLibraries::SelectedLibraries(QFrame* frame, mem<ITracker> t, dylibptr p, mem<IFilter> f) :
     pTracker(nullptr),
     pFilter(nullptr),
     pProtocol(nullptr),
     correct(false)
 {
-    pTracker = make_instance<ITracker>(t);
+    pTracker = t;
     pProtocol = make_instance<IProtocol>(p);
-    pFilter = make_instance<IFilter>(f);
+    pFilter = f;
 
     if (!pTracker || !pProtocol)
     {
diff --git a/opentrack/selected-libraries.hpp b/opentrack/selected-libraries.hpp
index ffaf882c..07ea419b 100644
--- a/opentrack/selected-libraries.hpp
+++ b/opentrack/selected-libraries.hpp
@@ -8,7 +8,7 @@ struct SelectedLibraries {
     mem<ITracker> pTracker;
     mem<IFilter> pFilter;
     mem<IProtocol> pProtocol;
-    SelectedLibraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f);
+    SelectedLibraries(QFrame* frame, mem<ITracker> t, dylibptr p, mem<IFilter> f);
     SelectedLibraries() : pTracker(nullptr), pFilter(nullptr), pProtocol(nullptr), correct(false) {}
     ~SelectedLibraries();
     bool correct;
diff --git a/opentrack/tracker.cpp b/opentrack/tracker.cpp
index c124111f..e39e54dd 100644
--- a/opentrack/tracker.cpp
+++ b/opentrack/tracker.cpp
@@ -47,7 +47,7 @@ double Tracker::map(double pos, Mapping& axis)
     axis.curve.setTrackingActive( !altp );
     axis.curveAlt.setTrackingActive( altp );
     auto& fc = altp ? axis.curveAlt : axis.curve;
-    return fc.getValue(pos) + axis.opts.zero;
+    return fc.getValue(pos);
 }
 
 void Tracker::t_compensate(const rmat& rmat, const double* xyz, double* output, bool rz)
-- 
cgit v1.2.3