diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-17 08:28:51 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-17 08:28:51 +0200 |
| commit | e3a5755b1c675e66163a879ee5e5290bf0b01251 (patch) | |
| tree | 4de6d67c1b157459d92653e201b0a3846d40d8f7 /ftnoir_tracker_ht/ftnoir_tracker_ht.cpp | |
| parent | fe8fa2db6a8b01e06d6fa7129a38211ce164895e (diff) | |
| parent | 45b346cc1a4a7b7e6716ec8ee0f58ad03c60d865 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_ht/ftnoir_tracker_ht.cpp')
| -rw-r--r-- | ftnoir_tracker_ht/ftnoir_tracker_ht.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp index 577ae40d..86992911 100644 --- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp +++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "headtracker-ftnoir.h" #include "ftnoir_tracker_ht.h" -#include "ftnoir_tracker_ht_dll.h" #include "ui_ht-trackercontrols.h" #include "opentrack/plugin-api.hpp" #include <cmath> @@ -182,21 +181,6 @@ void Tracker::data(double* data) } } -extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() -{ - return new TrackerDll; -} - -extern "C" OPENTRACK_EXPORT ITracker* GetConstructor() -{ - return new Tracker; -} - -extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( ) -{ - return new TrackerControls; -} - TrackerControls::TrackerControls() : tracker(nullptr) { ui.setupUi(this); @@ -235,3 +219,5 @@ void TrackerControls::camera_settings() else open_camera_settings(nullptr, s.camera_name, nullptr); } + +OPENTRACK_DECLARE_TRACKER(Tracker, TrackerControls, TrackerDll) |