X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/bf4fd0cf6bb79dffd32e4995f0b312fb1a32502f..cf0a97e6fca3155000772d961bba89c215e1b457:/src/app/widgets/playingscreen.py?ds=sidebyside

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 571a3d9..1e7323c 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -21,7 +21,7 @@ from config import DEFAULT_MIDI_VELOCITY
 
 from globals import BACKGROUND_LAYER
 from globals import CURSOR_LAYER
-from globals import PLAYING_MODES
+from globals import PLAYING_MODES_DICT
 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
@@ -57,8 +57,8 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         screen = pygame.display.get_surface()
 
         # taille de la zone d'affichage utile (bordure autour)
-        dispWidth = screen.get_width() - 2 * BORDER
-        dispHeight = screen.get_height() - 2 * BORDER
+        self.dispWidth  = dispWidth = screen.get_width() - 2 * BORDER
+        self.dispHeight = dispHeight = screen.get_height() - 2 * BORDER
         
         columnWidth = int(round(float(dispWidth) / self.keyboardLength))
 
@@ -76,7 +76,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]
-            c = Column(self, hue, rect, tone)
+            c = Column(self, i, hue, rect, tone)
             self.add(c, layer=BACKGROUND_LAYER)
             self.columns[tone.midi] = c
         
@@ -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) :
@@ -110,22 +113,33 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         # parce qu'il s'agit du curseur
         for col in reversed(self.sprites()[:-1]) :
             if col.rect.collidepoint(*event.pos):
-                self.raiseKeyDown(col)
+                self.raiseColDown(col, event.pos)
                 break
 
     @event_handler(pygame.MOUSEBUTTONUP)
     def onMouseUp(self, event) :
         for col in reversed(self.sprites()[:-1]) :
             if col.rect.collidepoint(*event.pos) :
-                self.raiseKeyUp(col)
+                self.raiseColUp(col, event.pos)
+                break
+
+    @event_handler(pygame.MOUSEMOTION)
+    def onMouseMove(self, event) :
+        for col in reversed(self.sprites()[:-1]) :
+            if col.rect.collidepoint(*event.pos) :
+                self.raiseColOver(col, event.pos)
                 break
 
-    def raiseKeyDown(self, col) :
-        evt = pygame.event.Event(events.COLDOWN, column=col)
+    def raiseColDown(self, col, pos) :
+        evt = pygame.event.Event(events.COLDOWN, column=col, pos=pos)
         pygame.event.post(evt)
 
-    def raiseKeyUp(self, col) :
-        evt = pygame.event.Event(events.COLUP, column=col)
+    def raiseColUp(self, col, pos) :
+        evt = pygame.event.Event(events.COLUP, column=col, pos=pos)
+        pygame.event.post(evt)
+    
+    def raiseColOver(self, col, pos) :
+        evt = pygame.event.Event(events.COLOVER, column=col, pos=pos)
         pygame.event.post(evt)
 
         
@@ -155,32 +169,63 @@ class PlayingScreen(_PlayingScreenBase) :
 
 class SongPlayingScreen(_PlayingScreenBase) :
     
-    def __init__(self, synth, song, mode=PLAYING_MODES['NORMAL']) :
+    def __init__(self, synth, song, mode=PLAYING_MODES_DICT['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()
+        if mode == PLAYING_MODES_DICT['NORMAL'] :
+            EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown)
+            EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp)
+        elif mode == PLAYING_MODES_DICT['EASY'] :
+            EventDispatcher.addEventListener(events.COLOVER, self.handleColumnOver)
+            
     
-    def displayNext(self) :
+    def displayNext(self, event=None) :
         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
+        self.currentNote = note
         self.currentNotePlayed = False
     
-    @event_handler(events.COLDOWN)
     def handleColumnDown(self, event) :
         col = event.column
         if col.state:
             self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY)
             self.currentNotePlayed = True
     
-    @event_handler(events.COLUP)
     def handleColumnUp(self, event) :
         if self.currentNotePlayed :
             self.synth.noteoff(0, self.currentColumn.tone.midi)
             self.displayNext()
+    
+    def handleColumnOver(self, event) :
+        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 * \
+                            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) :
+        pygame.time.set_timer(events.NOTEEND, delay)
+    
+    def stop(self) :
+        pygame.time.set_timer(events.NOTEEND, 0)
+        super(SongPlayingScreen, self).stop()
+