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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 350f32d..56047ad 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -11,6 +11,7 @@ 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
@@ -19,17 +20,24 @@ from config import SONG_FILE_PATH
 class MinWii(object):
     
     def __init__(self) :
-        app = Desktop()
-        synth = Synth()
+        #app = Desktop()
+        #synth = Synth()
 
         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)
+            
+            selector = InstrumentSelector()
+            selector.run()
+            selector.stop()
+            pygame.event.clear()
+            EventDispatcher.reset()
+            break
             
             song = musicXml2Song(home.songFile, printNotes=True)
-            synth.program_select(0, 0, 45)
+            synth.program_select(0, 0, 0)
             playingScreen = SongPlayingScreen(synth, song)
             playingScreen.run()
             pygame.event.clear()