X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/3d66754963905b237f7cd775601d7bf9b5fc3e33..0adb475173e22229c0eb5c6c79b8a8488894b7c9:/src/app/minwii.py

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c609246..d75dd5e 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -27,42 +27,46 @@ class MinWii(object):
         app = Desktop()
         synth = Synth()
 
-        modeResolution = (1024,768)
+        screenResolution = (1024,768)
         
         if wimoteSupport :
             from pywiiuse import pygame_wiimouse
-            from pywiiuse.PyWiiUse import IR_BELOW
-            pygame_wiimouse.init(4, 5) # look for 4, wait 5 seconds
-            n = pygame_wiimouse.get_count()
-            print '%d wiimotes' % n
+            pygame_wiimouse.init(4, 5, screenResolution) # look for 4, wait 5 seconds
+            nwiimotes = pygame_wiimouse.get_count()
+            print '%d wiimotes' % nwiimotes
             WT = pygame_wiimouse.WT
             WT.pause()
-            wm = pygame_wiimouse.Wiimote(0) # access the wiimote object
-            wm.enable_accels(0) # turn on acceleration reporting
-            wm.enable_ir(1, vres = modeResolution, position=IR_BELOW)
         else :
+            nwiimotes = 0
             class _WTFacade :
+                selectWimoteIndex = 0
                 def pause(self):
                     pass
                 def resume(self):
                     pass
+                def selectWiimote(self, i):
+                    pass
             WT = _WTFacade()
 
-        pygame.display.set_mode(modeResolution)
+        pygame.display.set_mode(screenResolution)
         pygame.display.set_caption('MinWii')
 
         while True :
             # sélection de la chanson
-            home = Home(songPath=SONG_FILE_PATH)
+            home = Home(songPath=SONG_FILE_PATH,
+                        nwiimotes=nwiimotes)
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             returnValue = home.returnValue
+            print 'home.selectedWiimoteIndex', home.selectedWiimoteIndex
             if not returnValue :
                 break
             
-            # sélection de l'instrument
+            WT.selectWiimote(home.selectedWiimoteIndex)
             WT.resume()
+
+            # sélection de l'instrument
             selector = InstrumentSelector()
             selector.run()
             selector.stop()