diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-03-14 13:40:09 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-03-14 13:44:32 +0100 |
| commit | 599afab6c9991df3d87d538ef65fe54533d25a11 (patch) | |
| tree | 55bba99136ab4da1c71ee4a75eccb5006f1da0da /tracker-wii/wiiyourself/wiimote.h | |
| parent | c90f8fbd1a83ffeed6b0bb9d55e91f4a4a9b8641 (diff) | |
tracker/wii: revert to 2.3.10
Issue: #876
Diffstat (limited to 'tracker-wii/wiiyourself/wiimote.h')
| -rw-r--r-- | tracker-wii/wiiyourself/wiimote.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/tracker-wii/wiiyourself/wiimote.h b/tracker-wii/wiiyourself/wiimote.h index 73212e05..3588b7c7 100644 --- a/tracker-wii/wiiyourself/wiimote.h +++ b/tracker-wii/wiiyourself/wiimote.h @@ -10,18 +10,15 @@ #pragma once -#undef NDEBUG - -#include "warns-begin.hpp" - -#undef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <tchar.h> // auto Unicode/Ansi support #include <queue> // for HID write method #include <list> // for state recording -typedef unsigned __int64 QWORD; +#ifndef QWORD + typedef unsigned __int64 QWORD; +#endif #ifdef _MSC_VER // VC-specific: _DEBUG build only _ASSERT() sanity checks # include <crtdbg.h> @@ -184,7 +181,7 @@ class wiimote : public wiimote_state // get the frequency from speaker_freq enum static const unsigned FreqLookup [TOTAL_FREQUENCIES]; - static unsigned GetFreqLookup(unsigned index) + static const unsigned GetFreqLookup (unsigned index) { _ASSERT(index < TOTAL_FREQUENCIES); if(index >= TOTAL_FREQUENCIES) @@ -474,7 +471,7 @@ volatile int MotionPlusDetectCount; // waiting for the result volatile DWORD AsyncRumbleTimeout; // orientation estimation unsigned WiimoteNearGUpdates; - //unsigned NunchukNearGUpdates; + unsigned NunchukNearGUpdates; // audio HANDLE SampleThread; const wiimote_sample* volatile CurrentSample; // otherwise playing square wave @@ -489,5 +486,3 @@ volatile int MotionPlusDetectCount; // waiting for the result unsigned ExtTriggerFlags;// extension changes " } Recording; }; - -#include "warns-end.hpp" |