Just put everything new in. Conflict resolution will be later

1 files changed, 7 insertions, 36 deletions

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