update modules to refactored API

3 files changed, 10 insertions, 32 deletions

diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
index b7d078c2..b7f088e9 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
@@ -19,12 +19,12 @@ Hydra_Tracker::~Hydra_Tracker()
 	sixenseExit();
 }
 
-void Hydra_Tracker::StartTracker(QFrame*)
+void Hydra_Tracker::start_tracker(QFrame*)
 {
 	sixenseInit();
 }
 
-void Hydra_Tracker::GetHeadPoseData(double *data)
+void Hydra_Tracker::data(double *data)
 {
     
 	sixenseSetActiveBase(0);
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
index 672efa28..a498a1cb 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.h
@@ -15,21 +15,21 @@ class Hydra_Tracker : public ITracker
 public:
     Hydra_Tracker();
     ~Hydra_Tracker();
-    void StartTracker(QFrame *) override;
-    void GetHeadPoseData(double *data) override;
+    void start_tracker(QFrame *) override;
+    void data(double *data) override;
     volatile bool should_quit;
 private:
     settings s;
     QMutex mutex;
 };
 
-class TrackerControls: public QWidget, public ITrackerDialog
+class TrackerControls: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    explicit TrackerControls();
-    void registerTracker(ITracker *) {}
-    void unRegisterTracker() {}
+    TrackerControls();
+    void register_tracker(ITracker *) {}
+    void unregister_tracker() {}
 private:
     settings s;
     Ui::UIHydraControls ui;
@@ -41,9 +41,7 @@ private slots:
 class FTNoIR_TrackerDll : public Metadata
 {
 public:
-    void getFullName(QString *strToBeFilled);
-    void getShortName(QString *strToBeFilled);
-    void getDescription(QString *strToBeFilled);
-    void getIcon(QIcon *icon);
+    QString name() { return QString("Razer Hydra -- inertial device"); }
+    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
 };
 
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
index 18efea05..871312d1 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra_dll.cpp
@@ -3,26 +3,6 @@
 #include <QDebug>
 #include "facetracknoir/plugin-support.h"
 
-void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled)
-{
-    *strToBeFilled = "Hydra";
-}
-
-void FTNoIR_TrackerDll::getShortName(QString *strToBeFilled)
-{
-    *strToBeFilled = "Hydra";
-}
-
-void FTNoIR_TrackerDll::getDescription(QString *strToBeFilled)
-{
-    *strToBeFilled = "Hydra";
-}
-
-void FTNoIR_TrackerDll::getIcon(QIcon *icon)
-{
-    *icon = QIcon(":/images/facetracknoir.png");
-}
-
 extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
 {
 	return new FTNoIR_TrackerDll;