X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/63f3b77711f17de3cd3515d1a97f566438c551a7..afeb92b07428059fd3a1022aefa64a1aeba68152:/src/app/minwii.py

diff --git a/src/app/minwii.py b/src/app/minwii.py
index cb6eef5..6f277a7 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,10 +6,12 @@ $Id$
 $URL$
 """
 
+import pygame
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from widgets.home import Home
 from widgets.playingscreen import SongPlayingScreen, PlayingScreen
+from widgets.instrumentselector import InstrumentSelector
 from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
@@ -20,7 +22,6 @@ class MinWii(object):
     def __init__(self) :
         app = Desktop()
         synth = Synth()
-        synth.program_select(0, 0, 0)
 
         while True :
             home = Home(songPath=SONG_FILE_PATH)
@@ -28,8 +29,15 @@ class MinWii(object):
             app.run(home)
             app.close(home)
             
+            selector = InstrumentSelector()
+            selector.run()
+            selector.stop()
+            pygame.event.clear()
+            EventDispatcher.reset()
+            
             song = musicXml2Song(home.songFile, printNotes=True)
+            synth.program_select(0, 0, 0)
             playingScreen = SongPlayingScreen(synth, song)
-            #playingScreen = PlayingScreen(synth)
             playingScreen.run()
+            pygame.event.clear()
             EventDispatcher.reset()