prise en charge des indications de tempo des fichiers musicxml. Si absent, le tempo...

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c4fdc23..cb6eef5 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 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 synth import Synth
 from eventutils import EventDispatcher

+from musicxml import musicXml2Song
+from config import SONG_FILE_PATH

 
 class MinWii(object):
     
 
 class MinWii(object):
     


@@ -21,11 +23,13 @@ class MinWii(object):
         synth.program_select(0, 0, 0)
 
         while True :
         synth.program_select(0, 0, 0)
 
         while True :

-            home = Home()
+            home = Home(songPath=SONG_FILE_PATH)

             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             
             home.connect(QUIT, app.quit)
             app.run(home)
             app.close(home)
             

-            playingScreen = PlayingScreen(synth)
+            song = musicXml2Song(home.songFile, printNotes=True)
+            playingScreen = SongPlayingScreen(synth, song)
+            #playingScreen = PlayingScreen(synth)

             playingScreen.run()
             EventDispatcher.reset()
             playingScreen.run()
             EventDispatcher.reset()