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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 975f401..4638267 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))
 
@@ -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) :
@@ -166,17 +169,17 @@ class PlayingScreen(_PlayingScreenBase) :
 
 class SongPlayingScreen(_PlayingScreenBase) :
     
-    def __init__(self, synth, song, mode=PLAYING_MODES['EASY']) :
+    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['NORMAL'] :
+        if mode == PLAYING_MODES_DICT['NORMAL'] :
             EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown)
             EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp)
-        elif mode == PLAYING_MODES['EASY'] :
+        elif mode == PLAYING_MODES_DICT['EASY'] :
             EventDispatcher.addEventListener(events.COLOVER, self.handleColumnOver)
             
     
@@ -215,9 +218,14 @@ class SongPlayingScreen(_PlayingScreenBase) :
     @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()