projects
/
minwii.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changement des photos de la guitare et du violon.
[minwii.git]
/
src
/
app
/
minwii.py
diff --git
a/src/app/minwii.py
b/src/app/minwii.py
index
350f32d
..
6f277a7
100755
(executable)
--- 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 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
from synth import Synth
from eventutils import EventDispatcher
from musicxml import musicXml2Song
@@
-28,8
+29,14
@@
class MinWii(object):
app.run(home)
app.close(home)
app.run(home)
app.close(home)
+ selector = InstrumentSelector()
+ selector.run()
+ selector.stop()
+ pygame.event.clear()
+ EventDispatcher.reset()
+
song = musicXml2Song(home.songFile, printNotes=True)
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()
playingScreen = SongPlayingScreen(synth, song)
playingScreen.run()
pygame.event.clear()