nommage des événements.

[minwii.git] / src / app / minwii.py

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 2e65952..d75dd5e 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -19,27 +19,53 @@ from musicxml import musicXml2Song
 from config import SONG_FILE_PATH
 from globals import PLAYING_MODES_DICT
 
+
 class MinWii(object):
     
-    def __init__(self) :
+    def __init__(self, wimoteSupport=True) :
         LaunchScreen()
         app = Desktop()
         synth = Synth()
 
-        modeResolution = (1024,768)
-        pygame.display.set_mode(modeResolution)
+        screenResolution = (1024,768)
+        
+        if wimoteSupport :
+            from pywiiuse import pygame_wiimouse
+            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()
+        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(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
             
+            WT.selectWiimote(home.selectedWiimoteIndex)
+            WT.resume()
+
             # sélection de l'instrument
             selector = InstrumentSelector()
             selector.run()
@@ -54,8 +80,11 @@ class MinWii(object):
             playMode = PLAYING_MODES_DICT[playMode]
             song = musicXml2Song(songFile)
             bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
+            octave = instrumentDescription.get('octave', 0)
+            synth.adjust_octave(0, octave)
             synth.program_select(0, bank, preset)
             playingScreen = SongPlayingScreen(synth, song, mode=playMode)
             playingScreen.run()
             pygame.event.clear()
             EventDispatcher.reset()
+            WT.pause()