fix problèmes d'aligement du curseur avec le pointeur.

[minwii.git] / src / app / widgets / playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 162f182..223f4e5 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
 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
 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
 
 from config import FRAMERATE
 from config import BORDER


@@ -45,7 +47,6 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         self._running = False
         self.draw(pygame.display.get_surface())
         self._initCursor()
         self._running = False
         self.draw(pygame.display.get_surface())
         self._initCursor()

-            

     
     
     def _initRects(self) :
     
     
     def _initRects(self) :


@@ -96,6 +97,8 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)
             clock.tick(FRAMERATE)
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)
             clock.tick(FRAMERATE)

+        
+        self.cursor._stopBlink()

 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :


@@ -118,7 +121,31 @@ class PlayingScreen(_PlayingScreenBase) :
             tone = Tone(midi)
             distinctNotes.append(tone)
         
             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) :
+        print 'PlayingScreen.__del__'
+        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) :
         
 
 class SongPlayingScreen(_PlayingScreenBase) :


@@ -139,7 +166,7 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
     
     def __init__(self, group, hue, rect, tone) :
         pygame.sprite.DirtySprite.__init__(self, group)
     
     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)
         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 +208,20 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
     def onMouseDown(self, event) :
         if self.rect.collidepoint(*event.pos) :
             self.update(True)
     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)
 
     @event_handler(pygame.MOUSEBUTTONUP)
     def onMouseUp(self, event) :
         self.update(False)

+        self.raiseNoteOff()

     
     def raiseNoteOn(self) :
     
     def raiseNoteOn(self) :

-        pass
-    
+        evt = pygame.event.Event(events.NOTEON, tone=self.tone)
+        pygame.event.post(evt)
+

     def raiseNoteOff(self) :
     def raiseNoteOff(self) :

-        pass
+        evt = pygame.event.Event(events.NOTEOFF, tone=self.tone)
+        pygame.event.post(evt)