X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/898cc352cb6624da41e4befd97a07c99243433a4..8df567a914cb4a0ffe5e3401945a14dcc248ebac:/src/app/minwii.py

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 56047ad..dbf1b23 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -20,24 +20,31 @@ from config import SONG_FILE_PATH
 class MinWii(object):
     
     def __init__(self) :
-        #app = Desktop()
-        #synth = Synth()
+        app = Desktop()
+        synth = Synth()
 
         while True :
-            #home = Home(songPath=SONG_FILE_PATH)
-            #home.connect(QUIT, app.quit)
-            #app.run(home)
-            #app.close(home)
+            # sélection de la chanson
+            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()
-            break
+            instrumentDescription = selector.selectedInstrument
             
+            # lancement du lecteur / clavier
             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()