implémentation du sélecteur d'instrument (début).

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index cb6eef5fe3d8dd70a21dc43535ada768aea77bce..6f277a73c668272ae5f8b218d1a056f5bab4d05c 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,7 +22,6 @@ class MinWii(object):
     def __init__(self) :
         app = Desktop()
         synth = Synth()
     def __init__(self) :
         app = Desktop()
         synth = Synth()

-        synth.program_select(0, 0, 0)

 
         while True :
             home = Home(songPath=SONG_FILE_PATH)
 
         while True :
             home = Home(songPath=SONG_FILE_PATH)


@@ -28,8 +29,15 @@ class MinWii(object):
             app.run(home)
             app.close(home)
             
             app.run(home)
             app.close(home)
             

+            selector = InstrumentSelector()
+            selector.run()
+            selector.stop()
+            pygame.event.clear()
+            EventDispatcher.reset()
+            

             song = musicXml2Song(home.songFile, printNotes=True)
             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()