correction import.

[minwii.git] / src / pywiiuse / pygame_wiimote.py

diff --git a/src/pywiiuse/pygame_wiimote.py b/src/pywiiuse/pygame_wiimote.py
index 26d9f9d..1750549 100755 (executable)
--- a/src/pywiiuse/pygame_wiimote.py
+++ b/src/pywiiuse/pygame_wiimote.py
@@ -22,7 +22,6 @@ import time
 
 # events to use. Is there a way to get ones known to be unused?
 base = pygame.USEREVENT
 
 # events to use. Is there a way to get ones known to be unused?
 base = pygame.USEREVENT

-print 'pygame_wiimote base :', pygame.USEREVENT

 WIIMOTE_BUTTON_PRESS = base + 1
 WIIMOTE_BUTTON_RELEASE = base + 2
 WIIMOTE_ACCEL = base + 3
 WIIMOTE_BUTTON_PRESS = base + 1
 WIIMOTE_BUTTON_RELEASE = base + 2
 WIIMOTE_ACCEL = base + 3


@@ -33,10 +32,6 @@ NUNCHUK_ACCEL = base + 7
 NUNCHUK_JOY = base + 8
 WIIMOTE_STATUS = base + 9
 WIIMOTE_DISCONNECT = base + 10
 NUNCHUK_JOY = base + 8
 WIIMOTE_STATUS = base + 9
 WIIMOTE_DISCONNECT = base + 10

-pygame.USEREVENT = WIIMOTE_DISCONNECT
-if pygame.USEREVENT > pygame.NUMEVENTS :
-    pygame.NUMEVENTS = pygame.USEREVENT
-

 
 wiiuse = None # import within the thread, why do I have to do this?
 
 
 wiiuse = None # import within the thread, why do I have to do this?
 


@@ -76,11 +71,6 @@ class wiimote_thread(Thread):
                             self.event_cb(m)
             except :
                 pass
                             self.event_cb(m)
             except :
                 pass

-                
-            #try:
-            #    wiiuse.poll(self.wiimotes, self.nmotes)
-            #except:
-            #    pass

 
             # allow executing functions in this thread
             while True:
 
             # allow executing functions in this thread
             while True:


@@ -88,7 +78,6 @@ class wiimote_thread(Thread):
                     func, args = self.queue.get_nowait()
                 except Empty:
                     break
                     func, args = self.queue.get_nowait()
                 except Empty:
                     break

-                print 'do:', func.__name__, args

                 func(*args)
 
     def do(self, func, *args):
                 func(*args)
 
     def do(self, func, *args):