projects
/
minwii.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prise en charge du mode.
[minwii.git]
/
src
/
app
/
minwii.py
diff --git
a/src/app/minwii.py
b/src/app/minwii.py
index
dbf1b23
..
2e65952
100755
(executable)
--- a/
src/app/minwii.py
+++ b/
src/app/minwii.py
@@
-9,6
+9,7
@@
$URL$
import pygame
from pgu.gui import Desktop
from pgu.gui import QUIT
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 widgets.home import Home
from widgets.playingscreen import SongPlayingScreen, PlayingScreen
from widgets.instrumentselector import InstrumentSelector
@@
-16,13
+17,19
@@
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 globals import PLAYING_MODES_DICT
class MinWii(object):
def __init__(self) :
class MinWii(object):
def __init__(self) :
+ LaunchScreen()
app = Desktop()
synth = Synth()
app = Desktop()
synth = Synth()
+ 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)
while True :
# sélection de la chanson
home = Home(songPath=SONG_FILE_PATH)
@@
-42,10
+49,13
@@
class MinWii(object):
instrumentDescription = selector.selectedInstrument
# lancement du lecteur / clavier
instrumentDescription = selector.selectedInstrument
# lancement du lecteur / clavier
- song = musicXml2Song(home.songFile, printNotes=True)
+ songFile = home.songFile
+ playMode = home.modeSelect.value
+ playMode = PLAYING_MODES_DICT[playMode]
+ song = musicXml2Song(songFile)
bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
synth.program_select(0, bank, preset)
bank, preset = instrumentDescription['bank'], instrumentDescription['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()