From 6b2fcdcbafffcd6a1c3c9141616b79f2f70ee755 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 19 Sep 2013 19:36:47 +0200
Subject: faceapi: move SM .h to appropriate dir

---
 faceapi/main.cpp                              |  2 +-
 ftnoir_tracker_base/ftnoir_tracker_ma_types.h | 33 ------------------------
 ftnoir_tracker_base/ftnoir_tracker_sm_types.h | 36 ---------------------------
 ftnoir_tracker_sm/ftnoir_tracker_sm.h         |  2 +-
 ftnoir_tracker_sm/ftnoir_tracker_sm_types.h   | 36 +++++++++++++++++++++++++++
 5 files changed, 38 insertions(+), 71 deletions(-)
 delete mode 100644 ftnoir_tracker_base/ftnoir_tracker_ma_types.h
 delete mode 100644 ftnoir_tracker_base/ftnoir_tracker_sm_types.h
 create mode 100644 ftnoir_tracker_sm/ftnoir_tracker_sm_types.h

diff --git a/faceapi/main.cpp b/faceapi/main.cpp
index 8128ee97..fb7d3f0a 100644
--- a/faceapi/main.cpp
+++ b/faceapi/main.cpp
@@ -27,7 +27,7 @@
 
 //FaceAPI headers
 #include <sm_api.h>
-#include "ftnoir_tracker_base/ftnoir_tracker_sm_types.h"
+#include "ftnoir_tracker_sm/ftnoir_tracker_sm_types.h"
 #include "utils.h"
 #include <exception>
 
diff --git a/ftnoir_tracker_base/ftnoir_tracker_ma_types.h b/ftnoir_tracker_base/ftnoir_tracker_ma_types.h
deleted file mode 100644
index b3101ad3..00000000
--- a/ftnoir_tracker_base/ftnoir_tracker_ma_types.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// Definitions for the Shared Memory to send the data to FaceTrackNoIR
-//
-#define MA_MM_DATA "MA_SharedMem"
-#define MA_FACEAPI "MA_FaceAPI"
-#define MA_MUTEX "MA_Mutex"
-
-struct TFaceData {
-	int DataID;
-//	smEngineHeadPoseData new_pose;
-};
-typedef TFaceData * PFaceData;
-
-struct SMMemMap {
-	int command;					// Command from FaceTrackNoIR
-	int status;						// Status from faceAPI
-	TFaceData data;
-	HANDLE handle;
-	int state;
-	int par_val_int;				// Value of parameter, indicated by 'command'
-	int par_val_float;
-	int initial_filter_level;		// Internal faceAPI Filter level
-	int handshake;
-};
-typedef SMMemMap * PSMMemMap;
-
-enum FTNoIR_Tracker_Command {
-	FT_MA_START = 10,
-	FT_MA_STOP  = 20,
-	FT_MA_SHOW_CAM = 30,
-	FT_MA_SET_PAR_FILTER = 50,
-	FT_MA_EXIT  = 100
-};
diff --git a/ftnoir_tracker_base/ftnoir_tracker_sm_types.h b/ftnoir_tracker_base/ftnoir_tracker_sm_types.h
deleted file mode 100644
index 526f8cdc..00000000
--- a/ftnoir_tracker_base/ftnoir_tracker_sm_types.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// Definitions for the Shared Memory to send the data to FaceTrackNoIR
-//
-#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 {
-	int DataID;
-	smEngineHeadPoseData new_pose;
-};
-typedef TFaceData * PFaceData;
-
-struct SMMemMap {
-	int command;					// Command from FaceTrackNoIR
-	int status;						// Status from faceAPI
-	TFaceData data;
-	HANDLE handle;
-	int state;
-	int par_val_int;				// Value of parameter, indicated by 'command'
-	int par_val_float;
-	int initial_filter_level;		// Internal faceAPI Filter level
-	int handshake;
-};
-typedef SMMemMap * PSMMemMap;
-
-enum FTNoIR_Tracker_Command {
-	FT_SM_START = 10,
-	FT_SM_STOP  = 20,
-	FT_SM_SHOW_CAM = 30,
-	FT_SM_SET_PAR_FILTER = 50,
-	FT_SM_EXIT  = 100
-};
diff --git a/ftnoir_tracker_sm/ftnoir_tracker_sm.h b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
index 44a5627a..95e1edeb 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_sm.h
+++ b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
@@ -23,7 +23,7 @@
 *																				*
 ********************************************************************************/
 #include "ftnoir_tracker_base/ftnoir_tracker_base.h"
-#include "ftnoir_tracker_base/ftnoir_tracker_sm_types.h"
+#include "ftnoir_tracker_sm/ftnoir_tracker_sm_types.h"
 #include "ui_ftnoir_sm_controls.h"
 
 #include <QMessageBox>
diff --git a/ftnoir_tracker_sm/ftnoir_tracker_sm_types.h b/ftnoir_tracker_sm/ftnoir_tracker_sm_types.h
new file mode 100644
index 00000000..526f8cdc
--- /dev/null
+++ b/ftnoir_tracker_sm/ftnoir_tracker_sm_types.h
@@ -0,0 +1,36 @@
+//
+// Definitions for the Shared Memory to send the data to FaceTrackNoIR
+//
+#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 {
+	int DataID;
+	smEngineHeadPoseData new_pose;
+};
+typedef TFaceData * PFaceData;
+
+struct SMMemMap {
+	int command;					// Command from FaceTrackNoIR
+	int status;						// Status from faceAPI
+	TFaceData data;
+	HANDLE handle;
+	int state;
+	int par_val_int;				// Value of parameter, indicated by 'command'
+	int par_val_float;
+	int initial_filter_level;		// Internal faceAPI Filter level
+	int handshake;
+};
+typedef SMMemMap * PSMMemMap;
+
+enum FTNoIR_Tracker_Command {
+	FT_SM_START = 10,
+	FT_SM_STOP  = 20,
+	FT_SM_SHOW_CAM = 30,
+	FT_SM_SET_PAR_FILTER = 50,
+	FT_SM_EXIT  = 100
+};
-- 
cgit v1.2.3