é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 06e33f7..b279000 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -17,7 +17,7 @@ from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from config import SONG_FILE_PATH
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from config import SONG_FILE_PATH

-from time import sleep
+from globals import PLAYING_MODES_DICT

 
 class MinWii(object):
     
 
 class MinWii(object):
     


@@ -49,10 +49,15 @@ class MinWii(object):
             instrumentDescription = selector.selectedInstrument
             
             # lancement du lecteur / clavier
             instrumentDescription = selector.selectedInstrument
             
             # lancement du lecteur / clavier

-            song = musicXml2Song(home.songFile)
+            songFile = home.songFile
+            playMode = home.modeSelect.value
+            playMode = PLAYING_MODES_DICT[playMode]
+            song = musicXml2Song(songFile)

             bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
             bank, preset = instrumentDescription['bank'], instrumentDescription['preset']

+            octave = instrumentDescription.get('octave', 0)
+            synth.adjust_octave(0, octave)

             synth.program_select(0, bank, preset)
             synth.program_select(0, bank, preset)

-            playingScreen = SongPlayingScreen(synth, song)
+            playingScreen = SongPlayingScreen(synth, song, mode=playMode)

             playingScreen.run()
             pygame.event.clear()
             EventDispatcher.reset()
             playingScreen.run()
             pygame.event.clear()
             EventDispatcher.reset()