fenêtre d'impro ok.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@65 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 162f182..ce4937f 100755 (executable)
--- 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
@@ -110,7 +112,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         
 class PlayingScreen(_PlayingScreenBase) :
     "fenêtre de jeu pour improvisation"
-    scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
+    scale = [55, 57, 59, 60, 62, 64, 66, 67, 69, 71, 72]
 
     def __init__(self) :
         distinctNotes = []
@@ -118,7 +120,30 @@ class PlayingScreen(_PlayingScreenBase) :
             tone = Tone(midi)
             distinctNotes.append(tone)
         
-        super(PlayingScreen, self).__init__(distinctNotes)        
+        super(PlayingScreen, self).__init__(distinctNotes)
+        
+        #cracra code
+        soundFont = '/Users/pinbe/dev/minwii/fluid-soundfont-3.1/FluidR3_GM.sf2'
+        bank = preset = 0
+
+        self.fs = fs = fluidsynth.Synth()
+        fs.start()
+        self.fsid = fsid = fs.sfload(soundFont)
+        fs.program_select(0, fsid, bank, preset)
+
+    def __del__(self) :
+        self.fs.delete()
+    
+    @event_handler(events.NOTEON)
+    def noteon(self, evt) :
+        tone = evt.tone
+        self.fs.noteon(0, tone.midi, 64)
+
+    @event_handler(events.NOTEOFF)
+    def noteoff(self, evt) :
+        tone = evt.tone
+        self.fs.noteoff(0, tone.midi)
+
         
 
 class SongPlayingScreen(_PlayingScreenBase) :
@@ -139,7 +164,7 @@ 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 +206,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)