From 6722803ee7e8c34649a351df0ea069ab4065de3a Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 31 Mar 2015 05:52:43 +0200
Subject: hatire: minor opentrack API usage updates

---
 ftnoir_tracker_hatire/ftnoir_tracker_hat.h | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'ftnoir_tracker_hatire/ftnoir_tracker_hat.h')

diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat.h b/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
index ba96d91c..2abeb77d 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat.h
@@ -2,8 +2,7 @@
 #define FTNOIR_TRACKER_HAT_H
 
 #ifdef OPENTRACK_API
-#   include "ftnoir_tracker_base/ftnoir_tracker_base.h"
-#   include "facetracknoir/plugin-support.h"
+#   include "opentrack/plugin-support.h"
 #else
 #	include "..\ftnoir_tracker_base\ftnoir_tracker_base.h"
 #endif
@@ -30,10 +29,10 @@ public:
 	~FTNoIR_Tracker();
 
 #ifdef OPENTRACK_API
-    void StartTracker(QFrame*);
-    void GetHeadPoseData(double *data);
-    int preferredHz();
-    void center();
+    void start_tracker(QFrame*);
+    void data(double *data);
+    int preferredHz(); // unused
+    void center(); // unused
 #else
     void Initialize( QFrame *videoframe );
     void StartTracker(HWND parent_window);
@@ -134,11 +133,16 @@ public:
 #ifndef OPENTRACK_API
 	void Initialize();
 #endif
-
+    
+#ifdef OPENTRACK_API
+    QString name();
+    QIcon icon();
+#else
 	void getFullName(QString *strToBeFilled);
 	void getShortName(QString *strToBeFilled);
 	void getDescription(QString *strToBeFilled);
 	void getIcon(QIcon *icon);
+#endif
 
 private:
 	QString trackerFullName;									// Trackers' name and description
-- 
cgit v1.2.3