diff options
author | topfs2 <topfs2@svn> | 2010-10-02 15:59:33 +0000 |
---|---|---|
committer | topfs2 <topfs2@svn> | 2010-10-02 15:59:33 +0000 |
commit | 252783ace3d10687337d776cdb0268bf69a47f45 (patch) | |
tree | 82a3950b96d0956568c0d2fe6e3231f1cd9920c9 /tools/EventClients | |
parent | 817b01085423384a1c5889b0afd34c2e1f36ae05 (diff) |
Added #9763 - Fix 64-bit WiiRemote connection issues - Thanks eye.zak
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@34364 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/EventClients')
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp index 08ba318f86..5fc42f1054 100644 --- a/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp +++ b/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp @@ -35,9 +35,9 @@ CPacketHELO *g_Ping = NULL; #endif std::string g_BluetoothIconPath = std::string(ICON_PATH) + std::string("/bluetooth.png"); -long getTicks() +int32_t getTicks() { - long ticks; + int32_t ticks; struct timeval now; gettimeofday(&now, NULL); ticks = now.tv_sec * 1000l; diff --git a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp index bae0cf6f49..977a37c8be 100644 --- a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp +++ b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.cpp @@ -182,9 +182,9 @@ float smoothDeg(float oldVal, float newVal) return(newVal); } -long getTicks(void) +int32_t getTicks(void) { - long ticks; + int32_t ticks; struct timeval now; gettimeofday(&now, NULL); ticks = now.tv_sec * 1000l; @@ -194,7 +194,7 @@ long getTicks(void) int main(int argc, char** argv) { - long timeout = 0; + int32_t timeout = 0; bool connected = 0; wiimote** wiimotes; wiimotes = wiiuse_init(MAX_WIIMOTES); diff --git a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h index b4eb749b9e..dbdbb94435 100644 --- a/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h +++ b/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote.h @@ -84,7 +84,7 @@ class CWiiController{ unsigned short m_holdFlags; unsigned short m_currentAction; - long m_buttonDownTime; + int32_t m_buttonDownTime; float m_abs_roll; float m_abs_pitch; @@ -115,7 +115,7 @@ unsigned short g_repeat_rate = 400; int handle_disconnect(wiimote* ); int connectWiimote(wiimote** ); -long getTicks(void); +int32_t getTicks(void); void EnableMotionSensing(wiimote* wm) {if (!WIIUSE_USING_ACC(wm)) wiiuse_motion_sensing(wm, 1);} void DisableMotionSensing(wiimote* wm) {if (WIIUSE_USING_ACC(wm)) wiiuse_motion_sensing(wm, 0);} unsigned short convert_code(unsigned short); |