Ajout description midi des instruments et sélection au niveau de fluidsynth.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 6f277a7..7901c9c 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -28,15 +28,20 @@ class MinWii(object):
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)

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

             
             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

             
             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()