From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 2 Apr 2013 18:41:01 +0200
Subject: Just put everything new in. Conflict resolution will be later

---
 ftnoir_tracker_base/ftnoir_tracker_base.h        | 43 ++++--------------------
 ftnoir_tracker_base/ftnoir_tracker_base_global.h |  2 +-
 ftnoir_tracker_base/ftnoir_tracker_sm_types.h    |  7 ++--
 ftnoir_tracker_base/ftnoir_tracker_types.h       |  2 +-
 4 files changed, 13 insertions(+), 41 deletions(-)

(limited to 'ftnoir_tracker_base')

diff --git a/ftnoir_tracker_base/ftnoir_tracker_base.h b/ftnoir_tracker_base/ftnoir_tracker_base.h
index 396df4d1..416d3944 100644
--- a/ftnoir_tracker_base/ftnoir_tracker_base.h
+++ b/ftnoir_tracker_base/ftnoir_tracker_base.h
@@ -35,6 +35,9 @@
 #include "ftnoir_tracker_types.h"
 #include <QtGui/QWidget>
 #include <QtGui/QFrame>
+#include <QWaitCondition>
+#include <QMutex>
+#include <QFrame>
 
 ////////////////////////////////////////////////////////////////////////////////
 #ifdef __cplusplus
@@ -52,29 +55,14 @@
 struct ITracker
 {
     virtual ~ITracker() {}
-	virtual void Initialize( QFrame *videoframe ) = 0;
-	virtual void StartTracker( HWND parent_window ) = 0;
-	virtual void StopTracker(bool exit) = 0;
-	virtual bool GiveHeadPoseData(THeadPoseData *data) = 0;
+    virtual void StartTracker( QFrame* frame ) = 0;
+    virtual bool GiveHeadPoseData(THeadPoseData *data) = 0;
 
-	virtual bool notifyZeroed() {
-		return false;
-	}
-	virtual void refreshVideo() {}
-	virtual void notifyCenter() {
-		return;
-	}
+    virtual void WaitForExit() = 0;
 };
 
 typedef ITracker* ITrackerPtr;
 
-// Factory function that creates instances of the Tracker object.
-EXTERN_C
-FTNOIR_TRACKER_BASE_EXPORT
-ITrackerPtr
-__stdcall
-GetTracker(void);
-
 ////////////////////////////////////////////////////////////////////////////////
 // COM-Like abstract interface.
 // This interface doesn't require __declspec(dllexport/dllimport) specifier.
@@ -83,20 +71,12 @@ GetTracker(void);
 // Instances are obtained via factory function.
 struct ITrackerDialog
 {
-	virtual ~ITrackerDialog() {}
+    virtual ~ITrackerDialog() {}
 	virtual void Initialize(QWidget *parent) = 0;
 	virtual void registerTracker(ITracker *tracker) = 0;
 	virtual void unRegisterTracker() = 0;
 };
 
-typedef ITrackerDialog* ITrackerDialogPtr;
-
-// Factory function that creates instances of the Tracker object.
-EXTERN_C
-FTNOIR_TRACKER_BASE_EXPORT
-ITrackerDialogPtr
-__stdcall
-GetTrackerDialog(void);
 
 ////////////////////////////////////////////////////////////////////////////////
 // COM-Like abstract interface.
@@ -115,14 +95,5 @@ struct ITrackerDll
 	virtual void getIcon(QIcon *icon) = 0;
 };
 
-typedef ITrackerDll* ITrackerDllPtr;
-
-// Factory function that creates instances of the Tracker object.
-EXTERN_C
-FTNOIR_TRACKER_BASE_EXPORT
-ITrackerDllPtr
-__stdcall
-GetTrackerDll(void);
-
 
 #endif // FTNOIR_TRACKER_BASE_H
diff --git a/ftnoir_tracker_base/ftnoir_tracker_base_global.h b/ftnoir_tracker_base/ftnoir_tracker_base_global.h
index 9f4a6118..a449c282 100644
--- a/ftnoir_tracker_base/ftnoir_tracker_base_global.h
+++ b/ftnoir_tracker_base/ftnoir_tracker_base_global.h
@@ -1,7 +1,7 @@
 #ifndef FTNOIR_TRACKER_BASE_GLOBAL_H
 #define FTNOIR_TRACKER_BASE_GLOBAL_H
 
-#include <Qt/qglobal.h>
+#include <QtGlobal>
 
 #ifdef FTNOIR_TRACKER_BASE_LIB
 # define FTNOIR_TRACKER_BASE_EXPORT Q_DECL_EXPORT
diff --git a/ftnoir_tracker_base/ftnoir_tracker_sm_types.h b/ftnoir_tracker_base/ftnoir_tracker_sm_types.h
index a8802e4a..1faf893f 100644
--- a/ftnoir_tracker_base/ftnoir_tracker_sm_types.h
+++ b/ftnoir_tracker_base/ftnoir_tracker_sm_types.h
@@ -1,10 +1,11 @@
 //
 // Definitions for the Shared Memory to send the data to FaceTrackNoIR
 //
-static const char* SM_MM_DATA = "SM_SharedMem";
-static const char* SM_FACEAPI = "SM_FaceAPI";
-static const char* SM_MUTEX = "SM_Mutex";
+#define SM_MM_DATA "SM_SharedMem"
+#define SM_FACEAPI "SM_FaceAPI"
+#define SM_MUTEX "SM_Mutex"
 
+#include "faceapi/stdafx.h"
 #include <sm_api.h>
 
 struct TFaceData {
diff --git a/ftnoir_tracker_base/ftnoir_tracker_types.h b/ftnoir_tracker_base/ftnoir_tracker_types.h
index ace7a6e3..ee443b95 100644
--- a/ftnoir_tracker_base/ftnoir_tracker_types.h
+++ b/ftnoir_tracker_base/ftnoir_tracker_types.h
@@ -44,7 +44,7 @@ struct THeadPoseData {
 		: x(x), y(y), z(z), yaw(yaw), pitch(pitch), roll(roll), frame_number(0) {}
 
 	double x, y, z, yaw, pitch, roll;
-	long frame_number;
+    unsigned char frame_number;
 };
 #pragma pack(pop)
 
-- 
cgit v1.2.3