Ajout Amsterdam.

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

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index adb6981..9c1ebfb 100755 (executable)
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -100,7 +100,9 @@ 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':
+        if event.key == pygame.K_q or \
+            event.unicode == u'q' or \
+            pygame.K_ESCAPE:

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


@@ -161,22 +163,26 @@ class PlayingScreen(PlayingScreenBase) :
 
     def __init__(self, synth) :
         distinctNotes = []
 
     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)
             
         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) :
     
 
 class SongPlayingScreen(PlayingScreenBase) :
     


@@ -227,7 +233,7 @@ class SongPlayingScreen(PlayingScreenBase) :
     def handleEasyColumnOver(self, event) :
         col = event.column
         if col.state and \
     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(
            not self.currentNotePlayed :
             self.playnote(col, event.pos)
             SongPlayingScreen.setNoteTimeout(


@@ -240,7 +246,7 @@ class SongPlayingScreen(PlayingScreenBase) :
     def handleNormalColumnOver(self, event) :
         col = event.column
         if col.state and \
     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
            not self.currentNotePlayed :
             self.playnote(col, event.pos)
             self.currentNotePlayed = True