X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/145a1e9a14954feaf5e3f6806e33c5cd49439bc9..3eb9b81124d56b9ed8069d16c6c326f2832d29ac:/src/minwii/widgets/playingscreen.py?ds=sidebyside

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index 0e179dd..9c1ebfb 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)
@@ -160,22 +163,26 @@ class PlayingScreen(PlayingScreenBase) :
 
     def __init__(self, synth) :
         distinctNotes = []
+        self.currentColumn = None
         for midi in self.scale :
             tone = Tone(midi)
             distinctNotes.append(tone)
         
         super(PlayingScreen, self).__init__(synth, distinctNotes)
             
-    @event_handler(events.NOTEON)
-    def noteon(self, evt) :
-        tone = evt.tone
-        self.synth.noteon(0, tone.midi, 96)
-
-    @event_handler(events.NOTEOFF)
-    def noteoff(self, evt) :
-        tone = evt.tone
-        self.synth.noteoff(0, tone.midi)
+    @event_handler(events.COLDOWN)
+    def noteon(self, event) :
+        col = event.column
+        col.update(True)
+        self.currentColumn = col
+        self.playnote(col, event.pos)
 
+    @event_handler(events.COLUP)
+    def noteoff(self, event) :
+        if self.currentColumn :
+            self.currentColumn.update(False)
+            self.synth.noteoff(0, self.currentColumn.tone.midi)
+    
 
 class SongPlayingScreen(PlayingScreenBase) :
     
@@ -226,7 +233,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 +246,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,11 +299,17 @@ class SongPlayingScreen(PlayingScreenBase) :
     def displayNext(self, event=None) :
         if self.currentColumn:
             self.currentColumn.update(False)
-        note, verseIndex = self.noteIterator.next()
+        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