X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/e4e71a016e3c9457744817ed104b0b497aaa5ddd..55fc862ddb0c20e92bbd88621f92525131b5b215:/src/app/widgets/playingscreen.py?ds=sidebyside

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 162f182..9aeef24 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -10,10 +10,12 @@ import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients
 from cursors import WarpingCursor
+import events
 from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from math import floor
 import types
 from musicxml import Tone
+import fluidsynth
 
 from config import FRAMERATE
 from config import BORDER
@@ -30,12 +32,13 @@ from config import FONT_COLOR
 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
-    def __init__(self, distinctNotes=[]) :
+    def __init__(self, synth, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.
         """
         super(_PlayingScreenBase, self).__init__()
+        self.synth = synth
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []
@@ -45,7 +48,6 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         self._running = False
         self.draw(pygame.display.get_surface())
         self._initCursor()
-            
     
     
     def _initRects(self) :
@@ -84,19 +86,23 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             self.add(c, layer=0)
     
     def _initCursor(self) :
-        self.cursor = WarpingCursor(blinkMode=True)
+        self.cursor = WarpingCursor(blinkMode=False)
         self.add(self.cursor, layer=2)
         
     def run(self):
         self._running = True
         clock = pygame.time.Clock()
         pygame.display.flip()
+        pygame.mouse.set_visible(False)
         while self._running :
             EventDispatcher.dispatchEvents()
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)
             clock.tick(FRAMERATE)
 
+        pygame.mouse.set_visible(True)
+        self.cursor._stopBlink()
+
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
         if event.key == pygame.K_q:
@@ -112,34 +118,37 @@ class PlayingScreen(_PlayingScreenBase) :
     "fenêtre de jeu pour improvisation"
     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
 
-    def __init__(self) :
+    def __init__(self, synth) :
         distinctNotes = []
         for midi in self.scale :
             tone = Tone(midi)
             distinctNotes.append(tone)
         
-        super(PlayingScreen, self).__init__(distinctNotes)        
-        
+        super(PlayingScreen, self).__init__(synth, distinctNotes)
+            
+    @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 SongPlayingScreen(_PlayingScreenBase) :
     
     def __init__(self, song) :
         super(SongPlayingScreen, self).__init__(song.distinctNotes)
         self.song = song
-
-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) :
     
     def __init__(self, group, hue, rect, tone) :
         pygame.sprite.DirtySprite.__init__(self, group)
-        
+        self.tone = tone
         toneName = FONT.render(tone.nom, True, (0,0,0))        
         sur = pygame.surface.Surface(rect.size)
         rgba = hls_to_rgba_8bits(hue, OFF_LUMINANCE, OFF_SATURATION)
@@ -181,16 +190,20 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
     def onMouseDown(self, event) :
         if self.rect.collidepoint(*event.pos) :
             self.update(True)
+            self.raiseNoteOn()
 
     @event_handler(pygame.MOUSEBUTTONUP)
     def onMouseUp(self, event) :
         self.update(False)
+        self.raiseNoteOff()
     
     def raiseNoteOn(self) :
-        pass
-    
+        evt = pygame.event.Event(events.NOTEON, tone=self.tone)
+        pygame.event.post(evt)
+
     def raiseNoteOff(self) :
-        pass
+        evt = pygame.event.Event(events.NOTEOFF, tone=self.tone)
+        pygame.event.post(evt)