refactoring de la boîte de dialogue de sélection de la chanson (début).

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c4fdc23..b52657d 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -9,9 +9,11 @@ $URL$
 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 synth import Synth
 from eventutils import EventDispatcher
+from musicxml import musicXml2Song
+from config import SONG_FILE_PATH
 
 class MinWii(object):
     
@@ -20,12 +22,14 @@ class MinWii(object):
         synth = Synth()
         synth.program_select(0, 0, 0)
 
-        while True :
-            home = Home()
+        if True :
+            home = Home(songPath=SONG_FILE_PATH)
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             
-            playingScreen = PlayingScreen(synth)
+            song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/etoile_neige.xml', printNotes=True)
+            playingScreen = SongPlayingScreen(synth, song)
+            #playingScreen = PlayingScreen(synth)
             playingScreen.run()
             EventDispatcher.reset()