X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/7a997df736f92a74b64450f23c70cf4547721506..1ddc7962970b99d8e6b3f760f99f1fdd76687987:/src/app/minwii.py?ds=sidebyside

diff --git a/src/app/minwii.py b/src/app/minwii.py
index dbf1b23..1cf7daf 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -9,6 +9,7 @@ $URL$
 import pygame
 from pgu.gui import Desktop
 from pgu.gui import QUIT
+from widgets.launch import LaunchScreen
 from widgets.home import Home
 from widgets.playingscreen import SongPlayingScreen, PlayingScreen
 from widgets.instrumentselector import InstrumentSelector
@@ -16,13 +17,40 @@ from synth import Synth
 from eventutils import EventDispatcher
 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')
+
         while True :
             # sélection de la chanson
             home = Home(songPath=SONG_FILE_PATH)
@@ -34,6 +62,7 @@ class MinWii(object):
                 break
             
             # sélection de l'instrument
+            WT.resume()
             selector = InstrumentSelector()
             selector.run()
             selector.stop()
@@ -42,10 +71,16 @@ class MinWii(object):
             instrumentDescription = selector.selectedInstrument
             
             # lancement du lecteur / clavier
-            song = musicXml2Song(home.songFile, printNotes=True)
+            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()