X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/0bb53427dd76e9e9863362dd3c9b2d205b4f8043..0509328e5d3a7760b00b99cd2176d9089279f458:/src/app/widgets/playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index f699a56..7e94d0e 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -30,6 +30,10 @@ from config import ON_COLUMN_ALPHA
 from config import FONT
 from config import FONT_COLOR
 
+BACKGROUND_LAYER = 0
+FOREGROUND_LAYER = 1
+CURSOR_LAYER = 2
+
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     def __init__(self, synth, distinctNotes=[]) :
@@ -54,11 +58,12 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         """ création des espaces réservés pour
             afficher les colonnes.
         """
-        ambitus = self.distinctNotes[-1].midi - self.distinctNotes[0].midi
-        if ambitus <= 12 :
-            self.keyboardLength = 8
-        else :
-            self.keyboardLength = 11
+        #ambitus = self.distinctNotes[-1].midi - self.distinctNotes[0].midi
+        #if ambitus <= 12 :
+        #    self.keyboardLength = 8
+        #else :
+        #    self.keyboardLength = 11
+        self.keyboardLength = len(self.distinctNotes)
         
         screen = pygame.display.get_surface()
 
@@ -83,11 +88,11 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]
             c = Column(self, hue, rect, tone)
-            self.add(c, layer=0)
+            self.add(c, layer=BACKGROUND_LAYER)
     
     def _initCursor(self) :
-        self.cursor = WarpingCursor(blinkMode=False)
-        self.add(self.cursor, layer=2)
+        self.cursor = WarpingCursor(blinkMode=True)
+        self.add(self.cursor, layer=CURSOR_LAYER)
         
     def run(self):
         self._running = True
@@ -107,11 +112,6 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
     def handleKeyDown(self, event) :
         if event.key == pygame.K_q:
             self._running = False
-
-        
-    @event_handler(pygame.MOUSEMOTION)
-    def handleMouseMotion(self, event) :
-        pass
         
         
 class PlayingScreen(_PlayingScreenBase) :
@@ -139,16 +139,20 @@ class PlayingScreen(_PlayingScreenBase) :
 
 class SongPlayingScreen(_PlayingScreenBase) :
     
-    def __init__(self, song) :
-        super(SongPlayingScreen, self).__init__(song.distinctNotes)
+    def __init__(self, synth, song) :
+        super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
         self.song = song
+    
+    @event_handler(events.NOTEON)
+    def noteon(self, evt) :
+        tone = evt.tone
+        self.synth.noteon(0, tone.midi, 64)
+
+    @event_handler(events.NOTEOFF)
+    def noteoff(self, evt) :
+        tone = evt.tone
+        self.synth.noteoff(0, tone.midi)
 
-class SongPlayingScreenTest(_PlayingScreenBase) :
-    def __init__(self) :
-        class C:pass
-        o = C()
-        o.midi=1
-        super(SongPlayingScreenTest, self).__init__([o])
     
 
 class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
@@ -185,11 +189,11 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
     def update(self, state) :
         group = self.groups()[0]
         if state :
-            group.change_layer(self, 1)
+            group.change_layer(self, FOREGROUND_LAYER)
             self.image = self.stateOn
             self.rect = self.rectOn
         else :
-            group.change_layer(self, 0)
+            group.change_layer(self, BACKGROUND_LAYER)
             self.image = self.stateOff
             self.rect = self.rectOff