X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/ce0df18443db4c43ba336f802eca6143be832093..898cc352cb6624da41e4befd97a07c99243433a4:/src/app/minwii.py?ds=sidebyside

diff --git a/src/app/minwii.py b/src/app/minwii.py
index a7ca431..56047ad 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,30 +6,39 @@ $Id$
 $URL$
 """
 
+import pygame
 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 widgets.instrumentselector import InstrumentSelector
+from synth import Synth
+from eventutils import EventDispatcher
+from musicxml import musicXml2Song
+from config import SONG_FILE_PATH
 
-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()
+
+        while True :
+            #home = Home(songPath=SONG_FILE_PATH)
+            #home.connect(QUIT, app.quit)
+            #app.run(home)
+            #app.close(home)
+            
+            selector = InstrumentSelector()
+            selector.run()
+            selector.stop()
+            pygame.event.clear()
+            EventDispatcher.reset()
+            break
+            
+            song = musicXml2Song(home.songFile, printNotes=True)
+            synth.program_select(0, 0, 0)
+            playingScreen = SongPlayingScreen(synth, song)
+            playingScreen.run()
+            pygame.event.clear()
+            EventDispatcher.reset()