Écran de sélection des instruments beaucoup plus beau.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c4fdc23..56047ad 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,26 +6,39 @@ $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

-from widgets.playingscreen import PlayingScreen
+from widgets.playingscreen import SongPlayingScreen, PlayingScreen
+from widgets.instrumentselector import InstrumentSelector

 from synth import Synth
 from eventutils import EventDispatcher
 from synth import Synth
 from eventutils import EventDispatcher

+from musicxml import musicXml2Song
+from config import SONG_FILE_PATH

 
 class MinWii(object):
     
     def __init__(self) :
 
 class MinWii(object):
     
     def __init__(self) :

-        app = Desktop()
-        synth = Synth()
-        synth.program_select(0, 0, 0)
+        #app = Desktop()
+        #synth = Synth()

 
         while True :
 
         while True :

-            home = Home()
-            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)

             
             

-            playingScreen = PlayingScreen(synth)
+            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()
             playingScreen.run()

+            pygame.event.clear()

             EventDispatcher.reset()
             EventDispatcher.reset()