ok pour le mode normal.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index d083093..08bbcfd 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -9,7 +9,7 @@ $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 SongPlayingScreen
+from widgets.playingscreen import SongPlayingScreen, PlayingScreen

 from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song


@@ -21,13 +21,14 @@ class MinWii(object):
         synth = Synth()
         synth.program_select(0, 0, 0)
 
         synth = Synth()
         synth.program_select(0, 0, 0)
 

-        while True :
+        if True :

             #home = Home()
             #home.connect(QUIT, app.quit)
             #app.run(home)
             #app.close(home)
             
             #home = Home()
             #home.connect(QUIT, app.quit)
             #app.run(home)
             #app.close(home)
             

-            song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/bon_tabac.xml')
+            song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/quinquin.xml')

             playingScreen = SongPlayingScreen(synth, song)
             playingScreen = SongPlayingScreen(synth, song)

+            #playingScreen = PlayingScreen(synth)

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