X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/f96fb4a3b382ac97bcdfd86549f685b02ff7968a..a810f09e895d66ce684214e67969fe373bf96560:/src/app/minwii.py

diff --git a/src/app/minwii.py b/src/app/minwii.py
index a92590e..6f277a7 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,21 +6,38 @@ $Id$
 $URL$
 """
 
+import pygame
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from widgets.home import Home
-from widgets.playingscreen import PlayingScreen
+from widgets.playingscreen import SongPlayingScreen, PlayingScreen
+from widgets.instrumentselector import InstrumentSelector
+from synth import Synth
+from eventutils import EventDispatcher
+from musicxml import musicXml2Song
+from config import SONG_FILE_PATH
 
 class MinWii(object):
     
     def __init__(self) :
         app = Desktop()
-        
-        if True :
-            home = Home()
+        synth = Synth()
+
+        while True :
+            home = Home(songPath=SONG_FILE_PATH)
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             
-            playingScreen = PlayingScreen()
+            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.run()
+            pygame.event.clear()
+            EventDispatcher.reset()