élargissement de la colonne si jamais parole trop large. On va virer le « atBorder...

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 08bbcfd..b279000 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,29 +6,58 @@ $Id$
 $URL$
 """
 
+import pygame
 from pgu.gui import Desktop
 from pgu.gui import QUIT
+from widgets.launch import LaunchScreen
 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 config import SONG_FILE_PATH
+from globals import PLAYING_MODES_DICT
 
 class MinWii(object):
     
     def __init__(self) :
+        LaunchScreen()
         app = Desktop()
         synth = Synth()
-        synth.program_select(0, 0, 0)
 
-        if True :
-            #home = Home()
-            #home.connect(QUIT, app.quit)
-            #app.run(home)
-            #app.close(home)
+        modeResolution = (1024,768)
+        pygame.display.set_mode(modeResolution)
+        pygame.display.set_caption('MinWii')
+
+        while True :
+            # sélection de la chanson
+            home = Home(songPath=SONG_FILE_PATH)
+            home.connect(QUIT, app.quit)
+            app.run(home)
+            app.close(home)
+            returnValue = home.returnValue
+            if not returnValue :
+                break
+            
+            # sélection de l'instrument
+            selector = InstrumentSelector()
+            selector.run()
+            selector.stop()
+            pygame.event.clear()
+            EventDispatcher.reset()
+            instrumentDescription = selector.selectedInstrument
             
-            song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/quinquin.xml')
-            playingScreen = SongPlayingScreen(synth, song)
-            #playingScreen = PlayingScreen(synth)
+            # lancement du lecteur / clavier
+            songFile = home.songFile
+            playMode = home.modeSelect.value
+            playMode = PLAYING_MODES_DICT[playMode]
+            song = musicXml2Song(songFile)
+            bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
+            octave = instrumentDescription.get('octave', 0)
+            synth.adjust_octave(0, octave)
+            synth.program_select(0, bank, preset)
+            playingScreen = SongPlayingScreen(synth, song, mode=playMode)
             playingScreen.run()
+            pygame.event.clear()
             EventDispatcher.reset()