[Pingus-CVS] r3192 - trunk/pingus/src/input

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-20 05:06:10 +0200 (Thu, 20 Sep 2007)
New Revision: 3192

Modified:
   trunk/pingus/src/input/wiimote.cpp
   trunk/pingus/src/input/wiimote.hpp
Log:
- little fix for the latest version of cwiid

Modified: trunk/pingus/src/input/wiimote.cpp
===================================================================
--- trunk/pingus/src/input/wiimote.cpp  2007-09-20 02:01:51 UTC (rev 3191)
+++ trunk/pingus/src/input/wiimote.cpp  2007-09-20 03:06:10 UTC (rev 3192)
@@ -157,9 +157,10 @@
   else 
     {
       std::cout << "Wiimote connected: " << m_wiimote << std::endl;
-      if (cwiid_set_mesg_callback(m_wiimote, &Wiimote::mesg_callback)) {
-        std::cerr << "Unable to set message callback" << std::endl;
-      }
+      if (cwiid_set_mesg_callback(m_wiimote, &Wiimote::mesg_callback))
+        {
+          std::cerr << "Unable to set message callback" << std::endl;
+        }
 
       // FIXME: Could init this depending on what events are actually bound
       if (cwiid_command(m_wiimote, CWIID_CMD_RPT_MODE, 
@@ -569,7 +570,7 @@
 }
 
 void
-Wiimote::mesg_callback(cwiid_wiimote_t* w, int mesg_count, union cwiid_mesg 
mesg[])
+Wiimote::mesg_callback(cwiid_wiimote_t* w, int mesg_count, union cwiid_mesg 
mesg[], timespec*)
 {
   wiimote->mesg(w, mesg_count, mesg);
 }

Modified: trunk/pingus/src/input/wiimote.hpp
===================================================================
--- trunk/pingus/src/input/wiimote.hpp  2007-09-20 02:01:51 UTC (rev 3191)
+++ trunk/pingus/src/input/wiimote.hpp  2007-09-20 03:06:10 UTC (rev 3192)
@@ -68,7 +68,7 @@
 {
 public:
   static void err_callback(cwiid_wiimote_t*, const char *s, va_list ap);
-  static void mesg_callback(cwiid_wiimote_t*, int mesg_count, union cwiid_mesg 
mesg[]);
+  static void mesg_callback(cwiid_wiimote_t*, int mesg_count, union cwiid_mesg 
mesg[], timespec*);
 
   static void init();
   static void deinit();