3 files changed, 8 insertions, 44 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
index 6d87503f..f7e283f3 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
@@ -372,32 +372,6 @@ void Tracker::data(double *data)
     data[TZ] = pose[TZ] * .1;
 }
 
-class TrackerDll : public Metadata
-{
-    QString name() { return QString("aruco -- paper marker tracker"); }
-    QIcon icon() { return QIcon(":/images/aruco.png"); }
-};
-
-//-----------------------------------------------------------------------------
-//#pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
-
-extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
-{
-    return new TrackerDll;
-}
-
-//#pragma comment(linker, "/export:GetTracker=_GetTracker@0")
-
-extern "C" OPENTRACK_EXPORT ITracker* GetConstructor()
-{
-    return new Tracker;
-}
-
-extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( )
-{
-    return new TrackerControls;
-}
-
 TrackerControls::TrackerControls()
 {
     tracker = nullptr;
@@ -472,3 +446,5 @@ void TrackerControls::camera_settings()
 {
     open_camera_settings(tracker ? &tracker->camera : nullptr, s.camera_name, tracker ? &tracker->camera_mtx : nullptr);
 }
+
+OPENTRACK_DECLARE_TRACKER(Tracker, TrackerControls, TrackerDll)
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
index 297fecdb..ae574338 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.h
@@ -90,3 +90,9 @@ private slots:
     void update_tracker_calibration();
     void camera_settings();
 };
+
+class TrackerDll : public Metadata
+{
+    QString name() { return QString("aruco -- paper marker tracker"); }
+    QIcon icon() { return QIcon(":/images/aruco.png"); }
+};
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h
deleted file mode 100644
index ac393bfb..00000000
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (c) 2013 Stanisław Halik <sthalik@misaki.pl>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#include "opentrack/plugin-api.hpp"
-
-//-----------------------------------------------------------------------------
-class TrackerDll : public Metadata
-{
-    // ITrackerDll interface
-    void getFullName(QString *strToBeFilled);
-    void getShortName(QString *strToBeFilled);
-    void getDescription(QString *strToBeFilled);
-    void getIcon(QIcon *icon);
-};