implémentation du sélecteur d'instrument (début).

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 3e1a6d7..f5cbdb6 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -95,14 +95,17 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)
             clock.tick(FRAMERATE)
-
+    
+    def stop(self) :
+        self._running = False
+        self.synth.system_reset()
         pygame.mouse.set_visible(True)
         self.cursor._stopBlink()
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
         if event.key == pygame.K_q:
-            self._running = False
+            self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
     def onMouseDown(self, event) :
@@ -169,6 +172,7 @@ class SongPlayingScreen(_PlayingScreenBase) :
     def __init__(self, synth, song, mode=PLAYING_MODES['EASY']) :
         super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
         self.song = song
+        self.quarterNoteDuration = song.quarterNoteDuration
         self.currentColumn = None
         self.noteIterator = self.song.iterNotes()
         self.displayNext()
@@ -183,7 +187,7 @@ class SongPlayingScreen(_PlayingScreenBase) :
         if self.currentColumn:
             self.currentColumn.update(False)
         note, verseIndex = self.noteIterator.next()
-        syllabus = note.lyrics[verseIndex].syllabus(encoding="iso-8859-1")
+        syllabus = note.lyrics[verseIndex].syllabus()
         column = self.columns[note.midi]
         column.update(True, syllabus)
         self.currentColumn = column
@@ -205,16 +209,23 @@ class SongPlayingScreen(_PlayingScreenBase) :
         col = event.column
         if col.state and not self.currentNotePlayed :
             self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY)
-            SongPlayingScreen.setNoteTimeout(int(self.currentNote.duration * 600))
+            SongPlayingScreen.setNoteTimeout(
+                        int(self.currentNote.duration * \
+                            self.quarterNoteDuration)
+                                            )
             self.currentNotePlayed = True
     
     @event_handler(events.NOTEEND)
     def clearTimeOutAndDisplayNext(self, evt) : 
         pygame.time.set_timer(evt.type, 0)
+        self.synth.noteoff(0, self.currentNote.midi)
         self.displayNext()
     
     @staticmethod
     def setNoteTimeout(delay) :
-        print 'duration', delay
         pygame.time.set_timer(events.NOTEEND, delay)
+    
+    def stop(self) :
+        pygame.time.set_timer(events.NOTEEND, 0)
+        super(SongPlayingScreen, self).stop()