From 8d85ec4d3107c4c9868c12cc04fbc518e5fede17 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 5 Jul 2015 18:54:06 +0200 Subject: simconnect: we can make qlibrary non-static, no crashes --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index 465d8d20..d6df58f0 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -29,8 +29,6 @@ #include "ftnoir_protocol_sc.h" #include "opentrack/plugin-api.hpp" -static QLibrary SCClientLib; - FTNoIR_Protocol::FTNoIR_Protocol() : should_stop(false), hSimConnect(nullptr) { } -- cgit v1.2.3 From a474a67b4b4af477be3d4497dfb128546c8261f3 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 5 Jul 2015 18:55:16 +0200 Subject: simconnect: use affinity --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index d6df58f0..f545e89b 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -28,6 +28,7 @@ ********************************************************************************/ #include "ftnoir_protocol_sc.h" #include "opentrack/plugin-api.hpp" +#include "opentrack/thread.hpp" FTNoIR_Protocol::FTNoIR_Protocol() : should_stop(false), hSimConnect(nullptr) { @@ -41,6 +42,8 @@ FTNoIR_Protocol::~FTNoIR_Protocol() void FTNoIR_Protocol::run() { + Affinity thr; + if (!SUCCEEDED(simconnect_open(&hSimConnect, "FaceTrackNoIR", NULL, 0, 0, 0))) return; #if 0 -- cgit v1.2.3 From e472979255f531d95e806a7d55a75ea3f222a88b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 5 Jul 2015 18:55:36 +0200 Subject: simconnect: don't hook on too many events --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index f545e89b..762afbfa 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -46,14 +46,13 @@ void FTNoIR_Protocol::run() if (!SUCCEEDED(simconnect_open(&hSimConnect, "FaceTrackNoIR", NULL, 0, 0, 0))) return; -#if 0 - simconnect_subscribetosystemevent(hSimConnect, EVENT_PING, "Frame"); - simconnect_mapclienteventtosimevent(hSimConnect, EVENT_INIT, ""); - simconnect_addclienteventtonotificationgroup(hSimConnect, GROUP0, EVENT_INIT, false); - simconnect_setnotificationgrouppriority(hSimConnect, GROUP0, SIMCONNECT_GROUP_PRIORITY_HIGHEST); -#endif - + simconnect_subscribetosystemevent(hSimConnect, EVENT_PING, "Frame"); + + //simconnect_mapclienteventtosimevent(hSimConnect, EVENT_INIT, ""); + //simconnect_addclienteventtonotificationgroup(hSimConnect, GROUP0, EVENT_INIT, false); + //simconnect_setnotificationgrouppriority(hSimConnect, GROUP0, SIMCONNECT_GROUP_PRIORITY_HIGHEST_MASKABLE); + while (!should_stop) { (void) (simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast(this))); -- cgit v1.2.3 From 5eb808e133282ac0374a8ec2d9bd8451d983b009 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 5 Jul 2015 18:55:53 +0200 Subject: sc: oops, actctx always failed --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index 762afbfa..9cb15752 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -76,7 +76,7 @@ void FTNoIR_Protocol::pose( const double *headpose ) { class ActivationContext { public: - ActivationContext(const int resid) :ok (false) { + ActivationContext(const int resid) : ok(false) { hactctx = INVALID_HANDLE_VALUE; actctx_cookie = 0; ACTCTXA actx = {0}; @@ -99,6 +99,8 @@ public: ReleaseActCtx(hactctx); hactctx = INVALID_HANDLE_VALUE; } + else + ok = true; } else { qDebug() << "SC: can't create win32 activation context" << GetLastError(); } -- cgit v1.2.3 From 56ee1d86556eb39383676fe2dd0bf8dd83d48a97 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 5 Jul 2015 18:55:59 +0200 Subject: sc: yaw was flipped --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index 9cb15752..1735305c 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -64,7 +64,7 @@ void FTNoIR_Protocol::run() void FTNoIR_Protocol::pose( const double *headpose ) { virtSCRotX = -headpose[Pitch]; // degrees - virtSCRotY = -headpose[Yaw]; + virtSCRotY = headpose[Yaw]; virtSCRotZ = headpose[Roll]; virtSCPosX = headpose[TX]/100.f; // cm to meters -- cgit v1.2.3 From 2bcab030f7640387e015f232df6254e1806aa586 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 5 Jul 2015 19:05:29 +0200 Subject: simconnect: allow operating after restarting fsx --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index 1735305c..eb8d1a79 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -44,22 +44,24 @@ void FTNoIR_Protocol::run() { Affinity thr; - if (!SUCCEEDED(simconnect_open(&hSimConnect, "FaceTrackNoIR", NULL, 0, 0, 0))) - return; + while (!should_stop) + { + if (SUCCEEDED(simconnect_open(&hSimConnect, "opentrack", NULL, 0, 0, 0))) + { + simconnect_subscribetosystemevent(hSimConnect, 0, "Frame"); - simconnect_subscribetosystemevent(hSimConnect, EVENT_PING, "Frame"); + while (!should_stop) + { + if (FAILED(simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast(this)))) + break; + Sleep(1); + } - //simconnect_mapclienteventtosimevent(hSimConnect, EVENT_INIT, ""); - //simconnect_addclienteventtonotificationgroup(hSimConnect, GROUP0, EVENT_INIT, false); - //simconnect_setnotificationgrouppriority(hSimConnect, GROUP0, SIMCONNECT_GROUP_PRIORITY_HIGHEST_MASKABLE); + (void) simconnect_close(hSimConnect); + } - while (!should_stop) - { - (void) (simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast(this))); - Sleep(1); + Sleep(100); } - - (void) simconnect_close(hSimConnect); } void FTNoIR_Protocol::pose( const double *headpose ) { -- cgit v1.2.3 From d2076ff5deb2046d1f8bcd2d324e5cd917c3871d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 6 Jul 2015 07:11:24 +0200 Subject: simconnect: increase timer precision just to be safe --- CMakeLists.txt | 2 +- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/CMakeLists.txt b/CMakeLists.txt index c45163dc..448375f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,7 +304,7 @@ endif() if(SDK_SIMCONNECT) opentrack_library(opentrack-proto-simconnect ftnoir_protocol_sc) - target_link_libraries(opentrack-proto-simconnect ${SDK_SIMCONNECT}/lib/SimConnect.lib) + target_link_libraries(opentrack-proto-simconnect ${SDK_SIMCONNECT}/lib/SimConnect.lib winmm) include_directories(opentrack-proto-simconnect SYSTEM PUBLIC ${SDK_SIMCONNECT}/inc) endif() diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index eb8d1a79..f767d232 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -44,6 +44,8 @@ void FTNoIR_Protocol::run() { Affinity thr; + (void) timeBeginPeriod(1); + while (!should_stop) { if (SUCCEEDED(simconnect_open(&hSimConnect, "opentrack", NULL, 0, 0, 0))) @@ -54,7 +56,7 @@ void FTNoIR_Protocol::run() { if (FAILED(simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast(this)))) break; - Sleep(1); + Sleep(3); } (void) simconnect_close(hSimConnect); @@ -62,6 +64,8 @@ void FTNoIR_Protocol::run() Sleep(100); } + + (void) timeEndPeriod(1); } void FTNoIR_Protocol::pose( const double *headpose ) { -- cgit v1.2.3 From e21853bff477cd90c5c60ba1a4ef9304df7538fe Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 6 Jul 2015 07:11:43 +0200 Subject: simconnect: don't sleep while exiting --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index f767d232..30590715 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -62,7 +62,8 @@ void FTNoIR_Protocol::run() (void) simconnect_close(hSimConnect); } - Sleep(100); + if (!should_stop) + Sleep(100); } (void) timeEndPeriod(1); -- cgit v1.2.3 From 555d0555e990a99c2061570dcebd0d868f1334b8 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 6 Jul 2015 07:19:21 +0200 Subject: simconnect: get rid of redundant logic --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 40 +------------------------------ ftnoir_protocol_sc/ftnoir_protocol_sc.h | 14 ----------- 2 files changed, 1 insertion(+), 53 deletions(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index 30590715..c9b0541a 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -144,9 +144,6 @@ bool FTNoIR_Protocol::correct() return false; } - // - // Get the functions from the DLL. - // simconnect_open = (importSimConnect_Open) SCClientLib.resolve("SimConnect_Open"); if (simconnect_open == NULL) { qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_Open function not found in DLL!"; @@ -163,8 +160,6 @@ bool FTNoIR_Protocol::correct() return false; } - //return true; - simconnect_calldispatch = (importSimConnect_CallDispatch) SCClientLib.resolve("SimConnect_CallDispatch"); if (simconnect_calldispatch == NULL) { qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_CallDispatch function not found in DLL!"; @@ -177,24 +172,6 @@ bool FTNoIR_Protocol::correct() return false; } - simconnect_mapclienteventtosimevent = (importSimConnect_MapClientEventToSimEvent) SCClientLib.resolve("SimConnect_MapClientEventToSimEvent"); - if (simconnect_subscribetosystemevent == NULL) { - qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_MapClientEventToSimEvent function not found in DLL!"; - return false; - } - - simconnect_addclienteventtonotificationgroup = (importSimConnect_AddClientEventToNotificationGroup) SCClientLib.resolve("SimConnect_AddClientEventToNotificationGroup"); - if (simconnect_subscribetosystemevent == NULL) { - qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_AddClientEventToNotificationGroup function not found in DLL!"; - return false; - } - - simconnect_setnotificationgrouppriority = (importSimConnect_SetNotificationGroupPriority) SCClientLib.resolve("SimConnect_SetNotificationGroupPriority"); - if (simconnect_subscribetosystemevent == NULL) { - qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_SetNotificationGroupPriority function not found in DLL!"; - return false; - } - qDebug() << "FTNoIR_Protocol::correct() says: SimConnect functions resolved in DLL!"; start(); @@ -204,22 +181,7 @@ bool FTNoIR_Protocol::correct() void FTNoIR_Protocol::handle() { - if (prevSCPosX != virtSCPosX || - prevSCPosY != virtSCPosY || - prevSCPosZ != virtSCPosZ || - prevSCRotX != virtSCRotX || - prevSCRotY != virtSCRotY || - prevSCRotZ != virtSCRotZ) - { - (void) simconnect_set6DOF(hSimConnect, virtSCPosX, virtSCPosY, virtSCPosZ, virtSCRotX, virtSCRotZ, virtSCRotY); - } - - prevSCPosX = virtSCPosX; - prevSCPosY = virtSCPosY; - prevSCPosZ = virtSCPosZ; - prevSCRotX = virtSCRotX; - prevSCRotY = virtSCRotY; - prevSCRotZ = virtSCRotZ; + (void) simconnect_set6DOF(hSimConnect, virtSCPosX, virtSCPosY, virtSCPosZ, virtSCRotX, virtSCRotZ, virtSCRotY); } void CALLBACK FTNoIR_Protocol::processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWORD, void *self_) diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.h b/ftnoir_protocol_sc/ftnoir_protocol_sc.h index e0fb7574..7c32d014 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.h +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.h @@ -54,9 +54,6 @@ typedef HRESULT (WINAPI *importSimConnect_Close)(HANDLE hSimConnect); typedef HRESULT (WINAPI *importSimConnect_CameraSetRelative6DOF)(HANDLE hSimConnect, float fDeltaX, float fDeltaY, float fDeltaZ, float fPitchDeg, float fBankDeg, float fHeadingDeg); typedef HRESULT (WINAPI *importSimConnect_CallDispatch)(HANDLE hSimConnect, DispatchProc pfcnDispatch, void * pContext); typedef HRESULT (WINAPI *importSimConnect_SubscribeToSystemEvent)(HANDLE hSimConnect, SIMCONNECT_CLIENT_EVENT_ID EventID, const char * SystemEventName); -typedef HRESULT (WINAPI *importSimConnect_MapClientEventToSimEvent)(HANDLE hSimConnect, SIMCONNECT_CLIENT_EVENT_ID EventID, const char * EventName); -typedef HRESULT (WINAPI *importSimConnect_AddClientEventToNotificationGroup)(HANDLE hSimConnect, SIMCONNECT_NOTIFICATION_GROUP_ID GroupID, SIMCONNECT_CLIENT_EVENT_ID EventID, BOOL bMaskable); -typedef HRESULT (WINAPI *importSimConnect_SetNotificationGroupPriority)(HANDLE hSimConnect, SIMCONNECT_NOTIFICATION_GROUP_ID GroupID, DWORD uPriority); struct settings : opts { value sxs_manifest; @@ -88,22 +85,11 @@ private: volatile float virtSCRotY; volatile float virtSCRotZ; - float prevSCPosX; - float prevSCPosY; - float prevSCPosZ; - - float prevSCRotX; - float prevSCRotY; - float prevSCRotZ; - importSimConnect_Open simconnect_open; // SimConnect function(s) in DLL importSimConnect_Close simconnect_close; importSimConnect_CameraSetRelative6DOF simconnect_set6DOF; importSimConnect_CallDispatch simconnect_calldispatch; importSimConnect_SubscribeToSystemEvent simconnect_subscribetosystemevent; - importSimConnect_MapClientEventToSimEvent simconnect_mapclienteventtosimevent; - importSimConnect_AddClientEventToNotificationGroup simconnect_addclienteventtonotificationgroup; - importSimConnect_SetNotificationGroupPriority simconnect_setnotificationgrouppriority; HANDLE hSimConnect; // Handle to SimConnect static void CALLBACK processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWORD cbData, void *pContext); -- cgit v1.2.3 From 68c8278b25b417c21dfbb0e3974044a36dfc151e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 6 Jul 2015 08:31:48 +0200 Subject: simconnect: don't set affinity, only meant for trackers --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index c9b0541a..c0e2fc02 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -28,7 +28,6 @@ ********************************************************************************/ #include "ftnoir_protocol_sc.h" #include "opentrack/plugin-api.hpp" -#include "opentrack/thread.hpp" FTNoIR_Protocol::FTNoIR_Protocol() : should_stop(false), hSimConnect(nullptr) { @@ -42,8 +41,6 @@ FTNoIR_Protocol::~FTNoIR_Protocol() void FTNoIR_Protocol::run() { - Affinity thr; - (void) timeBeginPeriod(1); while (!should_stop) @@ -56,7 +53,7 @@ void FTNoIR_Protocol::run() { if (FAILED(simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast(this)))) break; - Sleep(3); + Sleep(16); } (void) simconnect_close(hSimConnect); -- cgit v1.2.3 From 1388d95ecf71d517d24ccb6713641220a5553e4a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 6 Jul 2015 09:09:18 +0200 Subject: simconnect: use event handle without calldispatch in a loop We aren't supposed to calldispatch in a loop, since it locks up FSX. Use calldispatch only if FSX signals us that an event has been received. This might fix slowness reported in #174. --- CMakeLists.txt | 2 +- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/CMakeLists.txt b/CMakeLists.txt index 448375f3..c45163dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,7 +304,7 @@ endif() if(SDK_SIMCONNECT) opentrack_library(opentrack-proto-simconnect ftnoir_protocol_sc) - target_link_libraries(opentrack-proto-simconnect ${SDK_SIMCONNECT}/lib/SimConnect.lib winmm) + target_link_libraries(opentrack-proto-simconnect ${SDK_SIMCONNECT}/lib/SimConnect.lib) include_directories(opentrack-proto-simconnect SYSTEM PUBLIC ${SDK_SIMCONNECT}/inc) endif() diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index c0e2fc02..5f70b093 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -41,19 +41,27 @@ FTNoIR_Protocol::~FTNoIR_Protocol() void FTNoIR_Protocol::run() { - (void) timeBeginPeriod(1); + HANDLE event = CreateEvent(NULL, FALSE, FALSE, nullptr); + + if (event == nullptr) + { + qDebug() << "simconnect: event create" << GetLastError(); + return; + } while (!should_stop) { - if (SUCCEEDED(simconnect_open(&hSimConnect, "opentrack", NULL, 0, 0, 0))) + if (SUCCEEDED(simconnect_open(&hSimConnect, "opentrack", NULL, 0, event, 0))) { simconnect_subscribetosystemevent(hSimConnect, 0, "Frame"); while (!should_stop) { - if (FAILED(simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast(this)))) - break; - Sleep(16); + if (WaitForSingleObject(event, 10) == WAIT_OBJECT_0) + { + if (FAILED(simconnect_calldispatch(hSimConnect, processNextSimconnectEvent, reinterpret_cast(this)))) + break; + } } (void) simconnect_close(hSimConnect); @@ -63,7 +71,7 @@ void FTNoIR_Protocol::run() Sleep(100); } - (void) timeEndPeriod(1); + CloseHandle(event); } void FTNoIR_Protocol::pose( const double *headpose ) { @@ -169,8 +177,6 @@ bool FTNoIR_Protocol::correct() return false; } - qDebug() << "FTNoIR_Protocol::correct() says: SimConnect functions resolved in DLL!"; - start(); return true; -- cgit v1.2.3 From e3140d0293de8adb584dafe264f5f4024c82ff88 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 6 Jul 2015 09:14:12 +0200 Subject: simconnect: guard GNUC pragma --- ftnoir_protocol_sc/ftnoir_protocol_sc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ftnoir_protocol_sc/ftnoir_protocol_sc.cpp') diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp index 5f70b093..7d4e09f9 100644 --- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp +++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp @@ -84,7 +84,9 @@ void FTNoIR_Protocol::pose( const double *headpose ) { virtSCPosZ = -headpose[TZ]/100.f; } -#pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#ifdef __GNUC__ +# pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#endif class ActivationContext { public: -- cgit v1.2.3