Sophie

Sophie

distrib > Mandriva > 2010.1 > i586 > media > contrib-updates-src > by-pkgid > f722e3fddb6bcd9335a8848a4b05a73c > files > 1

xbmc-10.1-1.pvr.2mdv2010.2.src.rpm

From d99326884c0e846c59a37e16747516414a813daa Mon Sep 17 00:00:00 2001
From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Date: Sat, 2 Oct 2010 15:59:33 +0000
Subject: [PATCH] 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
---
 .../Clients/WiiRemote/CWIID_WiiRemote.cpp          |    4 ++--
 .../Clients/WiiRemote/WiiUse_WiiRemote.cpp         |    6 +++---
 .../Clients/WiiRemote/WiiUse_WiiRemote.h           |    4 ++--
 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 08ba318..5fc42f1 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 bae0cf6..977a37c 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 b4eb749..dbdbb94 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);
-- 
1.7.3