utilisation de la flûte traversière.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 6f277a7..dbf1b23 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -24,19 +24,27 @@ class MinWii(object):
         synth = Synth()
 
         while True :
         synth = Synth()
 
         while True :

+            # sélection de la chanson

             home = Home(songPath=SONG_FILE_PATH)
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             home = Home(songPath=SONG_FILE_PATH)
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)

+            returnValue = home.returnValue
+            if not returnValue :
+                break

             
             

+            # sélection de l'instrument

             selector = InstrumentSelector()
             selector.run()
             selector.stop()
             pygame.event.clear()
             EventDispatcher.reset()
             selector = InstrumentSelector()
             selector.run()
             selector.stop()
             pygame.event.clear()
             EventDispatcher.reset()

+            instrumentDescription = selector.selectedInstrument

             
             

+            # lancement du lecteur / clavier

             song = musicXml2Song(home.songFile, printNotes=True)
             song = musicXml2Song(home.songFile, printNotes=True)

-            synth.program_select(0, 0, 0)
+            bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
+            synth.program_select(0, bank, preset)

             playingScreen = SongPlayingScreen(synth, song)
             playingScreen.run()
             pygame.event.clear()
             playingScreen = SongPlayingScreen(synth, song)
             playingScreen.run()
             pygame.event.clear()