remplacement de la flûte.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 2cc4988..6f277a7 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,13 +6,38 @@ $Id$
 $URL$
 """
 
 $URL$
 """
 

-#from pgu.gui import Desktop
-#from pgu.gui import QUIT
+import pygame
+from pgu.gui import Desktop
+from pgu.gui import QUIT

 from widgets.home import Home
 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) :
 
 class MinWii(object):
     
     def __init__(self) :

-        playingScreen = PlayingScreen()
-        playingScreen.run()
+        app = Desktop()
+        synth = Synth()
+
+        while True :
+            home = Home(songPath=SONG_FILE_PATH)
+            home.connect(QUIT, app.quit)
+            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.run()
+            pygame.event.clear()
+            EventDispatcher.reset()