X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/ce0df18443db4c43ba336f802eca6143be832093..0a9a61ff4ffe961742224a52f060104cd0e80bde:/src/app/minwii.py?ds=inline

diff --git a/src/app/minwii.py b/src/app/minwii.py
index a7ca431..be69eb9 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -9,27 +9,26 @@ $URL$
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from widgets.home import Home
-from widgets.playingscreen import _PlayingScreenBase, SongPlayingScreenTest
-import time
+from widgets.playingscreen import SongPlayingScreen, PlayingScreen
+from synth import Synth
+from eventutils import EventDispatcher
+from musicxml import musicXml2Song
 
-class MinWii(Desktop):
+class MinWii(object):
     
     def __init__(self) :
-        Desktop.__init__(self)
-        
-        # home = Home()
-        # home.connect(QUIT, self.quit)
-        # self.run(home)
-        
-        # class C:pass
-        # o = C()
-        # o.midi=1
-        # playingScreen = _PlayingScreenBase([o])
-        
-        import pygame
-        playingScreen = SongPlayingScreenTest()
-        playingScreen.draw(pygame.display.get_surface())
-        playingScreen.run()
-        
-        #pygame.display.flip()
-        #time.sleep(2)
+        app = Desktop()
+        synth = Synth()
+        synth.program_select(0, 0, 0)
+
+        if True :
+            #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')
+            playingScreen = SongPlayingScreen(synth, song)
+            #playingScreen = PlayingScreen(synth)
+            playingScreen.run()
+            EventDispatcher.reset()