From b0b7c2b0e1762a7c0058e7f507a3b7cc9a03daf6 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 16 Jul 2015 11:29:59 +0200
Subject: all: use macros for symbol exposure

---
 ftnoir_tracker_ht/ftnoir_tracker_ht.cpp   | 18 ++----------------
 ftnoir_tracker_ht/ftnoir_tracker_ht.h     |  6 ++++++
 ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h |  7 -------
 3 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h

(limited to 'ftnoir_tracker_ht')

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)
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index b2fcb147..32fb6949 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -81,3 +81,9 @@ private slots:
     void doCancel();
     void camera_settings();
 };
+
+class TrackerDll : public Metadata
+{
+    QString name() { return QString("ht -- face tracker"); }
+    QIcon icon() { return QIcon(":/images/ht.png"); }
+};
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h b/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h
deleted file mode 100644
index 853d3181..00000000
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "opentrack/plugin-api.hpp"
-
-class TrackerDll : public Metadata
-{
-    QString name() { return QString("ht -- face tracker"); }
-    QIcon icon() { return QIcon(":/images/ht.png"); }
-};
-- 
cgit v1.2.3