X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/967c3023786aaf8753d5a7597c4a418d95807c5b..f7094076a9f447c33341612d1a530141d35d1a3a:/src/app/minwii.py?ds=sidebyside

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 06e33f7..fc45bdf 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -17,7 +17,10 @@ from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from config import SONG_FILE_PATH
-from time import sleep
+from globals import PLAYING_MODES_DICT
+from pywiiuse import pygame_wiimouse
+from pywiiuse.PyWiiUse import IR_BELOW
+
 
 class MinWii(object):
     
@@ -27,6 +30,16 @@ class MinWii(object):
         synth = Synth()
 
         modeResolution = (1024,768)
+
+        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)
+
         pygame.display.set_mode(modeResolution)
         pygame.display.set_caption('MinWii')
 
@@ -41,6 +54,7 @@ class MinWii(object):
                 break
             
             # sélection de l'instrument
+            WT.resume()
             selector = InstrumentSelector()
             selector.run()
             selector.stop()
@@ -49,10 +63,16 @@ class MinWii(object):
             instrumentDescription = selector.selectedInstrument
             
             # lancement du lecteur / clavier
-            song = musicXml2Song(home.songFile)
+            songFile = home.songFile
+            playMode = home.modeSelect.value
+            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)
+            playingScreen = SongPlayingScreen(synth, song, mode=playMode)
             playingScreen.run()
             pygame.event.clear()
             EventDispatcher.reset()
+            WT.pause()