la sélection de l'instrut doit être faite plus tard.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index b52657d..350f32d 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,6 +6,7 @@ $Id$
 $URL$
 """
 
 $URL$
 """
 

+import pygame

 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


@@ -20,16 +21,16 @@ class MinWii(object):
     def __init__(self) :
         app = Desktop()
         synth = Synth()
     def __init__(self) :
         app = Desktop()
         synth = Synth()

-        synth.program_select(0, 0, 0)

 
 

-        if True :
+        while True :

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

-            song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/etoile_neige.xml', printNotes=True)
+            song = musicXml2Song(home.songFile, printNotes=True)
+            synth.program_select(0, 0, 45)

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

-            #playingScreen = PlayingScreen(synth)

             playingScreen.run()
             playingScreen.run()

+            pygame.event.clear()

             EventDispatcher.reset()
             EventDispatcher.reset()