Merge branch 'posix' of ssh://git.code.sf.net/p/facetracknoir/codegit into posix

1 files changed, 3 insertions, 5 deletions

diff --git a/ftnoir_tracker_sm/ftnoir_tracker_sm.h b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
index 39997970..ae79436d 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_sm.h
+++ b/ftnoir_tracker_sm/ftnoir_tracker_sm.h
@@ -32,6 +32,7 @@
 #include "Windows.h"

 #include "math.h"

 #include "facetracknoir/global-settings.h"

+#include "compat/compat.h"

 #include <QFrame>

 

 using namespace std;

@@ -48,18 +49,15 @@ public:
     void WaitForExit();

 

 	void loadSettings();

-	bool SMCreateMapping();

 

 private:

 	//

 	// global variables

 	//

-	HANDLE hSMMemMap;

-	SMMemMap *pMemData;

-	HANDLE hSMMutex;

+    PortableLockedShm lck_shm;

+    SMMemMap *pMemData;

 	QProcess *faceAPI;

 

-//	int numTracker;

 	bool bEnableRoll;

 	bool bEnablePitch;

 	bool bEnableYaw;