Ajout des images des instruments.

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

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

+import pygame

 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from widgets.home import Home
 from widgets.playingscreen import SongPlayingScreen, PlayingScreen
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from widgets.home import Home
 from widgets.playingscreen import SongPlayingScreen, PlayingScreen

+from widgets.instrumentselector import InstrumentSelector

 from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song


@@ -20,16 +22,22 @@ 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)
+            selector = InstrumentSelector()
+            selector.run()
+            selector.stop()
+            pygame.event.clear()
+            EventDispatcher.reset()
+            
+            song = musicXml2Song(home.songFile, printNotes=True)
+            synth.program_select(0, 0, 0)

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

-            #playingScreen = PlayingScreen(synth)

             playingScreen.run()
             playingScreen.run()

+            pygame.event.clear()

             EventDispatcher.reset()
             EventDispatcher.reset()