diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-22 14:56:28 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-22 14:56:28 +0200 |
commit | cccc8d3312f95054e6b20761b0e40be81158c4b6 (patch) | |
tree | 366463ffd4912e4096e8f6841ad59047704d7e21 | |
parent | 455ca63d2b5117f846e26cb5208f45f14e81b826 (diff) |
-Wreorder that went bad
-rw-r--r-- | ftnoir_protocol_ft/ftnoir_protocol_ft.cpp | 2 | ||||
-rw-r--r-- | ftnoir_protocol_ft/ftnoir_protocol_ft.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp index c0a186ff..0055a394 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp @@ -28,8 +28,8 @@ #include "ftnoir_csv/csv.h" FTNoIR_Protocol::FTNoIR_Protocol() : - pMemData((FTHeap*) shm.ptr()), shm(FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap)), + pMemData((FTHeap*) shm.ptr()), viewsStart(nullptr), viewsStop(nullptr), intGameID(0) diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h index 06992de5..ba98b4b7 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h @@ -60,7 +60,7 @@ class FTNoIR_Protocol : public IProtocol public: FTNoIR_Protocol(); ~FTNoIR_Protocol() override; - bool correct( ); + bool correct(); void pose( const double *headpose ); QString game_name() override { QMutexLocker foo(&game_name_mutex); @@ -68,18 +68,18 @@ public: } private: settings s; - FTHeap *pMemData; PortableLockedShm shm; + FTHeap *pMemData; QLibrary FTIRViewsLib; QProcess dummyTrackIR; importTIRViewsStart viewsStart; - importTIRViewsStop viewsStop; - + importTIRViewsStop viewsStop; + int intGameID; QString connected_game; QMutex game_name_mutex; - + static inline double getRadsFromDegrees(double degrees) { return degrees * 0.017453; } void start_tirviews(); void start_dummy(); |