diff options
| -rw-r--r-- | faceapi/main.cpp | 2 | ||||
| -rw-r--r-- | ftnoir_tracker_base/ftnoir_tracker_ma_types.h | 33 | ||||
| -rw-r--r-- | ftnoir_tracker_sm/ftnoir_tracker_sm.h | 2 | ||||
| -rw-r--r-- | ftnoir_tracker_sm/ftnoir_tracker_sm_types.h (renamed from ftnoir_tracker_base/ftnoir_tracker_sm_types.h) | 0 |
4 files changed, 2 insertions, 35 deletions
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_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_base/ftnoir_tracker_sm_types.h b/ftnoir_tracker_sm/ftnoir_tracker_sm_types.h index 526f8cdc..526f8cdc 100644 --- a/ftnoir_tracker_base/ftnoir_tracker_sm_types.h +++ b/ftnoir_tracker_sm/ftnoir_tracker_sm_types.h |