Encore un coup pour préparer la personalisation du comportement des wiimotes.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@348 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/minwii/app.py b/src/minwii/app.py
index d456b8e..5d5d245 100755 (executable)
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -51,6 +51,7 @@ class MinWii(object):
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT

+            WT.setEventCallBack(pygame_wiimouse._default_event_cb)

             WT.pause()
         else :
             self.WT = _WTFacade()
             WT.pause()
         else :
             self.WT = _WTFacade()


@@ -67,6 +68,7 @@ class MinWii(object):
         songFile, playMode, wiimoteIndex = '', 'NORMAL', 0
 
         while True :
         songFile, playMode, wiimoteIndex = '', 'NORMAL', 0
 
         while True :

+            WT.resume()

 
             exit, songFile, playMode, wiimoteIndex = \
                 self.selectSongAndOptions(songFile, playMode, wiimoteIndex)
 
             exit, songFile, playMode, wiimoteIndex = \
                 self.selectSongAndOptions(songFile, playMode, wiimoteIndex)


@@ -78,7 +80,6 @@ class MinWii(object):
             if not instrumentDescription :
                 continue
             
             if not instrumentDescription :
                 continue
             

-            WT.resume()

             self.runPlayingScreen(songFile, playMode, instrumentDescription)
             WT.pause()
     
             self.runPlayingScreen(songFile, playMode, instrumentDescription)
             WT.pause()
     

diff --git a/src/pywiiuse/pygame_wiimouse.py b/src/pywiiuse/pygame_wiimouse.py
index 835bff8..7680581 100755 (executable)
--- a/src/pywiiuse/pygame_wiimouse.py
+++ b/src/pywiiuse/pygame_wiimouse.py
@@ -29,6 +29,9 @@ class wiimote_thread(Thread):
         self.start()
         self.startup.get(True) # wait for the thread to get started and acquire the motes
         self.eventCallBack = _default_event_cb
         self.start()
         self.startup.get(True) # wait for the thread to get started and acquire the motes
         self.eventCallBack = _default_event_cb

+    
+    def setEventCallBack(self, func) :
+        self.eventCallBack = func

 
     def run(self):
         '''This runs in a separate thread'''
 
     def run(self):
         '''This runs in a separate thread'''