MINWii s'appelle MINDs désormais.

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

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index 9519053..70d9aa6 100755 (executable)
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -106,9 +106,8 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :

-        if event.key == pygame.K_q or \
-            event.unicode == u'q' or \
-            pygame.K_ESCAPE:
+        if event.key in (pygame.K_q, pygame.K_ESCAPE) or \
+            event.unicode == u'q' :

             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)


@@ -323,6 +322,9 @@ class SongPlayingScreen(PlayingScreenBase) :
     def setNoteTimeout(self) :
         delay = self.currentNote.duration * self.quarterNoteDuration
         delay = delay + delay * self.tempoTrim
     def setNoteTimeout(self) :
         delay = self.currentNote.duration * self.quarterNoteDuration
         delay = delay + delay * self.tempoTrim

+        delay = int(delay)
+        if delay < 1 :
+            delay = 1 # durée minimale, car 0 désactiverait le timer.

         pygame.time.set_timer(events.NOTEEND, delay)
     
     def tempoTrimUp(self, step=0.1) :
         pygame.time.set_timer(events.NOTEEND, delay)
     
     def tempoTrimUp(self, step=0.1) :