From 36f82a4f0dc4f002123cc313eab7c845dcd13572 Mon Sep 17 00:00:00 2001
From: Wim Vriend <facetracknoir@gmail.com>
Date: Sat, 9 Feb 2013 15:29:53 +0000
Subject: Created a FaceTrackNoIR-version of FreeTrackClient.dll, because the
 existing one was crashing ArmA2. Made a 64-bit version too. The FTReportName
 function was a trouble-maker. In the repo of FreeTrack it expects a pointer
 to a name, in reality, it should receive an integer... Cost me a while to
 figure out why ArmA kept crashing :(

Also added the option to enable/disable FreeTrack or TrackIR in the FreeTrack 2.0 settings-dialog.

Even more, added a button so users can 'repair' the location of NPClient.dll. Some users complained that their SW didn't work with TrackIR any more, after running FaceTrackNoIR...

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@270 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb
---
 FaceTrackNoIR/FaceTrackNoIR.ui | 14 +++++++-------
 FaceTrackNoIR/tracker.cpp      |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'FaceTrackNoIR')

diff --git a/FaceTrackNoIR/FaceTrackNoIR.ui b/FaceTrackNoIR/FaceTrackNoIR.ui
index e4fd2a7c..8c3db4a4 100644
--- a/FaceTrackNoIR/FaceTrackNoIR.ui
+++ b/FaceTrackNoIR/FaceTrackNoIR.ui
@@ -342,7 +342,7 @@ Support FaceTrackNoIR!</string>
             <widget class="QLCDNumber" name="lcdNumOutputPosX">
              <property name="geometry">
               <rect>
-               <x>114</x>
+               <x>112</x>
                <y>34</y>
                <width>50</width>
                <height>21</height>
@@ -370,7 +370,7 @@ Support FaceTrackNoIR!</string>
             <widget class="QLCDNumber" name="lcdNumOutputPosY">
              <property name="geometry">
               <rect>
-               <x>114</x>
+               <x>112</x>
                <y>52</y>
                <width>50</width>
                <height>21</height>
@@ -398,7 +398,7 @@ Support FaceTrackNoIR!</string>
             <widget class="QLCDNumber" name="lcdNumOutputPosZ">
              <property name="geometry">
               <rect>
-               <x>114</x>
+               <x>112</x>
                <y>70</y>
                <width>50</width>
                <height>21</height>
@@ -474,7 +474,7 @@ Support FaceTrackNoIR!</string>
             <widget class="QLabel" name="lblRotZ">
              <property name="geometry">
               <rect>
-               <x>166</x>
+               <x>164</x>
                <y>74</y>
                <width>20</width>
                <height>16</height>
@@ -490,7 +490,7 @@ Support FaceTrackNoIR!</string>
             <widget class="QLabel" name="lblRotX">
              <property name="geometry">
               <rect>
-               <x>168</x>
+               <x>166</x>
                <y>35</y>
                <width>20</width>
                <height>16</height>
@@ -506,9 +506,9 @@ Support FaceTrackNoIR!</string>
             <widget class="QLabel" name="lblRotY">
              <property name="geometry">
               <rect>
-               <x>166</x>
+               <x>164</x>
                <y>55</y>
-               <width>22</width>
+               <width>25</width>
                <height>16</height>
               </rect>
              </property>
diff --git a/FaceTrackNoIR/tracker.cpp b/FaceTrackNoIR/tracker.cpp
index 1dd2cf1b..2c09917b 100644
--- a/FaceTrackNoIR/tracker.cpp
+++ b/FaceTrackNoIR/tracker.cpp
@@ -424,6 +424,9 @@ bool bTracker2Confid = false;
 		if(::WaitForSingleObject(m_StopThread, 0) == WAIT_OBJECT_0)
 		{
 			dinkeyboard->Unacquire();			// Unacquire keyboard
+			dinkeyboard->Release();
+			dinmouse->Unacquire();				// Unacquire mouse
+			dinmouse->Release();
 			din->Release();						// Release DirectInput
 
 			// Set event
-- 
cgit v1.2.3