update modules to refactored API

3 files changed, 9 insertions, 41 deletions

diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index a1cb33a5..13b6aabb 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -161,7 +161,7 @@ Tracker::~Tracker()
 		delete videoWidget;
 }
 
-void Tracker::StartTracker(QFrame* videoframe)
+void Tracker::start_tracker(QFrame* videoframe)
 {
     videoframe->show();
     videoWidget = new HTVideoWidget(videoframe);
@@ -185,7 +185,7 @@ void Tracker::StartTracker(QFrame* videoframe)
 #endif
 }
 
-void Tracker::GetHeadPoseData(double *data)
+void Tracker::data(double *data)
 {
     lck_shm.lock();
     shm->timer = 0;
@@ -208,27 +208,6 @@ void Tracker::GetHeadPoseData(double *data)
     lck_shm.unlock();
 }
 
-//-----------------------------------------------------------------------------
-void TrackerDll::getFullName(QString *strToBeFilled)
-{
-    *strToBeFilled = "HT face tracker";
-}
-
-void TrackerDll::getShortName(QString *strToBeFilled)
-{
-	*strToBeFilled = "HT";
-}
-
-void TrackerDll::getDescription(QString *strToBeFilled)
-{
-	*strToBeFilled = "";
-}
-
-void TrackerDll::getIcon(QIcon *icon)
-{
-    *icon = QIcon(":/images/ht.png");
-}
-
 extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new TrackerDll;
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.h b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
index ea2cb75e..119ffa7d 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.h
@@ -37,8 +37,8 @@ class Tracker : public QObject, public ITracker
 public:
 	Tracker();
     ~Tracker() override;
-    void StartTracker(QFrame* frame);
-    void GetHeadPoseData(double *data);
+    void start_tracker(QFrame* frame);
+    void data(double *data);
     void load_settings(ht_config_t* config);
 private:
     settings s;
@@ -50,13 +50,13 @@ private:
 };
 
 // Widget that has controls for FTNoIR protocol client-settings.
-class TrackerControls : public QWidget, public ITrackerDialog
+class TrackerControls : public ITrackerDialog
 {
     Q_OBJECT
 public:
 	explicit TrackerControls();
-    void registerTracker(ITracker *) {}
-    void unRegisterTracker() {}
+    void register_tracker(ITracker *) {}
+    void unregister_tracker() {}
 
 private:
 	Ui::Form ui;
diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h b/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h
index 66e57100..d684f72f 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht_dll.h
@@ -1,18 +1,7 @@
-/* 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 "facetracknoir/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);
+    QString name() { return QString("ht -- face tracker"); }
+    QIcon icon() { return QIcon(":/images/ht.png"); }
 };