Affichage écran de lancement.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index cb6eef5..06e33f7 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -6,30 +6,53 @@ $Id$
 $URL$
 """
 
 $URL$
 """
 

+import pygame

 from pgu.gui import Desktop
 from pgu.gui import QUIT
 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.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 synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from config import SONG_FILE_PATH

+from time import sleep

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

+        LaunchScreen()

         app = Desktop()
         synth = Synth()
         app = Desktop()
         synth = Synth()

-        synth.program_select(0, 0, 0)
+
+        modeResolution = (1024,768)
+        pygame.display.set_mode(modeResolution)
+        pygame.display.set_caption('MinWii')

 
         while True :
 
         while True :

+            # sélection de la chanson

             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)

+            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(home.songFile, printNotes=True)
+            # lancement du lecteur / clavier
+            song = musicXml2Song(home.songFile)
+            bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
+            synth.program_select(0, bank, preset)

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

-            #playingScreen = PlayingScreen(synth)

             playingScreen.run()
             playingScreen.run()

+            pygame.event.clear()

             EventDispatcher.reset()
             EventDispatcher.reset()