évitement d'une collision de nom avec le module logging de python.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 26e2a5e..d083093 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -9,18 +9,25 @@ $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
+from synth import Synth
+from eventutils import EventDispatcher
+from musicxml import musicXml2Song
 
 class MinWii(object):
     
     def __init__(self) :
         app = Desktop()
-        
+        synth = Synth()
+        synth.program_select(0, 0, 0)
+
         while 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)
             
-            playingScreen = PlayingScreen()
+            song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/bon_tabac.xml')
+            playingScreen = SongPlayingScreen(synth, song)
             playingScreen.run()
+            EventDispatcher.reset()