X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/a4026ac6cb2afe5804ca826f7e8fa04254d36d46..3b16ad256b097d7e910682bf7708bb4f2f135ebe:/src/app/minwii.py

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 2e65952..1cf7daf 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -19,14 +19,35 @@ 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)
+        
+        if wimoteSupport :
+            from pywiiuse import pygame_wiimouse
+            from pywiiuse.PyWiiUse import IR_BELOW
+            pygame_wiimouse.init(1, 5) # look for 1, wait 5 seconds
+            n = pygame_wiimouse.get_count()
+            print '%d wiimotes' % n
+            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 :
+            class _WTFacade :
+                def pause(self):
+                    pass
+                def resume(self):
+                    pass
+            WT = _WTFacade()
+
         pygame.display.set_mode(modeResolution)
         pygame.display.set_caption('MinWii')
 
@@ -41,6 +62,7 @@ class MinWii(object):
                 break
             
             # sélection de l'instrument
+            WT.resume()
             selector = InstrumentSelector()
             selector.run()
             selector.stop()
@@ -54,8 +76,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()