X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/79aca379ed6dffa4d71d66f513a973d2e3470c5a..35997bc815c869fcee2b1f158e3d28a6a3553c4e:/src/minwii/widgets/playingscreen.py

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index 0591929..ca6a1e3 100755
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -10,6 +10,7 @@ import pygame
 import types
 
 import minwii.events as events
+from minwii.log import eventLogger
 from minwii.eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from minwii.musicxml import Tone
 from minwii.config import FRAMERATE
@@ -99,7 +100,9 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
-        if event.key == pygame.K_q or event.unicode == u'q':
+        if event.key == pygame.K_q or \
+            event.unicode == u'q' or \
+            pygame.K_ESCAPE:
             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
@@ -226,7 +229,7 @@ class SongPlayingScreen(PlayingScreenBase) :
     def handleEasyColumnOver(self, event) :
         col = event.column
         if col.state and \
-           any(event.mouseEvent.buttons) and \
+           self.cursor.pressed and \
            not self.currentNotePlayed :
             self.playnote(col, event.pos)
             SongPlayingScreen.setNoteTimeout(
@@ -239,7 +242,7 @@ class SongPlayingScreen(PlayingScreenBase) :
     def handleNormalColumnOver(self, event) :
         col = event.column
         if col.state and \
-           any(event.mouseEvent.buttons) and \
+           self.cursor.pressed and \
            not self.currentNotePlayed :
             self.playnote(col, event.pos)
             self.currentNotePlayed = True
@@ -292,8 +295,17 @@ class SongPlayingScreen(PlayingScreenBase) :
     def displayNext(self, event=None) :
         if self.currentColumn:
             self.currentColumn.update(False)
-        note, verseIndex = self.noteIterator.next()
-        syllabus = note.lyrics[verseIndex].syllabus()
+        try :
+            note, verseIndex = self.noteIterator.next()
+        except StopIteration :
+            self.noteIterator = self.song.iterNotes()
+            note, verseIndex = self.noteIterator.next()
+            eventLogger.info(pygame.event.Event(events.SONGEND))
+        try :
+            syllabus = note.lyrics[verseIndex].syllabus()
+        except IndexError :
+            syllabus = u'…'
+        
         column = self.columns[note.midi]
         column.update(True, syllabus)
         self.currentColumn = column