Some more changes from previous commit.

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@58 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

6 files changed, 14 insertions, 4 deletions

diff --git a/FaceTrackNoIR.suo b/FaceTrackNoIR.suo
index 15da2e44..9e3ca2db 100644
--- a/FaceTrackNoIR.suo
+++ b/FaceTrackNoIR.suo
diff --git a/bin/FaceTrackNoIR.exe b/bin/FaceTrackNoIR.exe
index 020047d7..8231caf5 100644
--- a/bin/FaceTrackNoIR.exe
+++ b/bin/FaceTrackNoIR.exe
diff --git a/bin/NPClient.dll b/bin/NPClient.dll
index 8da41135..eedaf53b 100644
--- a/bin/NPClient.dll
+++ b/bin/NPClient.dll
diff --git a/bin/Settings/SimConnect.ini b/bin/Settings/SimConnect.ini
index b8d1db51..0abc2676 100644
--- a/bin/Settings/SimConnect.ini
+++ b/bin/Settings/SimConnect.ini
@@ -69,7 +69,7 @@ Inhibit_Roll=false
 Inhibit_X=false

 Inhibit_Y=false

 Inhibit_Z=false

-SetEngineStop=false

+SetEngineStop=true

 

 [FTN]

 LocalPCOnly=true

diff --git a/bin/Settings/Wings of Prey.ini b/bin/Settings/Wings of Prey.ini
index 022b058a..75ed83bb 100644
--- a/bin/Settings/Wings of Prey.ini
+++ b/bin/Settings/Wings of Prey.ini
@@ -47,6 +47,7 @@ Inhibit_X=false
 Inhibit_Y=false

 Inhibit_Z=false

 SetZero=false

+SetEngineStop=false

 

 [Curves]

 Yaw_point1=@Variant(\0\0\0\x1a@\x10\0\0\0\0\0\0@\x14\0\0\0\0\0\0)

@@ -75,7 +76,7 @@ Z_point3=@Variant(\0\0\0\x1a@L\x80\0\0\0\0\0@A\0\0\0\0\0\0)
 Z_point4=@Variant(\0\0\0\x1a@V\0\0\0\0\0\0@I\0\0\0\0\0\0)

 

 [FTIR]

-useTIRViews=true

+useTIRViews=false

 

 [TrackerSource]

 Selection=0

diff --git a/faceAPI/main.cpp b/faceAPI/main.cpp
index 3b260dca..e60535fe 100644
--- a/faceAPI/main.cpp
+++ b/faceAPI/main.cpp
@@ -209,6 +209,8 @@ smCameraHandle createFirstCamera()
 void run()

 {

 	char msg[100];

+	int state;

+

 	// Capture control-C

 //    signal(SIGINT, CtrlCHandler);

 

@@ -334,7 +336,7 @@ void run()
     smWindowHandle win_handle = 0;

     THROW_ON_ERROR(smVideoDisplayGetWindowHandle(video_display_handle,&win_handle));    

     SetWindowText(win_handle, _T("faceAPI Video-widget"));

-	MoveWindow(win_handle, 0, 0, 250, 150, true);

+	MoveWindow(win_handle, 0, 0, 250, 180, true);

 

     // Loop on the keyboard

     while (processKeyPress(engine_handle, video_display_handle) && !stopCommand)

@@ -372,7 +374,14 @@ void run()
 		if (pMemData) {

 			switch (pMemData->command) {

 				case FT_SM_START:

-					THROW_ON_ERROR(smEngineStart(engine_handle));		// Start tracking

+

+					//

+					// Only execute Start, if the engine is not yet tracking.

+					//

+					THROW_ON_ERROR(smEngineGetState(engine_handle, &state));

+					if (state != SM_API_ENGINE_STATE_HT_TRACKING) {

+						THROW_ON_ERROR(smEngineStart(engine_handle));	// Start tracking

+					}

 					pMemData->command = 0;								// Reset

 					break;