Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 3 insertions, 10 deletions

diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
index b0766634..84e02fb0 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -1,5 +1,5 @@
 #include "ftnoir_tracker_joystick.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
 
 static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext )
 {
@@ -19,13 +19,6 @@ TrackerControls::TrackerControls() : tracker(nullptr)
     connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK()));
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
-    tie_setting(s.axis_0, ui.comboBox);
-    tie_setting(s.axis_1, ui.comboBox_2);
-    tie_setting(s.axis_2, ui.comboBox_3);
-    tie_setting(s.axis_3, ui.comboBox_4);
-    tie_setting(s.axis_4, ui.comboBox_5);
-    tie_setting(s.axis_5, ui.comboBox_6);
-
     {
         auto hr = CoInitialize( nullptr );
         LPDIRECTINPUT8 g_pDI = nullptr;
@@ -56,11 +49,11 @@ void TrackerControls::doOK() {
 }
 
 void TrackerControls::doCancel() {
-    s.b->revert();
+    s.b->reload();
     this->close();
 }
 
-extern "C" FTNOIR_TRACKER_BASE_EXPORT ITrackerDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
 {
     return new TrackerControls;
 }