Ajout des soundfonts

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index b4d5cb4..f699a56 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -10,11 +10,14 @@ 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 FIRST_HUE
 from config import OFF_LUMINANCE
 from config import BORDER
 from config import FIRST_HUE
 from config import OFF_LUMINANCE


@@ -27,14 +30,15 @@ from config import ON_COLUMN_ALPHA
 from config import FONT
 from config import FONT_COLOR
 
 from config import FONT
 from config import FONT_COLOR
 

-class _PlayingScreenBase(pygame.sprite.LayeredUpdates, EventHandlerMixin) :
+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__()
         """
         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 = []
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []


@@ -44,7 +48,6 @@ class _PlayingScreenBase(pygame.sprite.LayeredUpdates, 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) :


@@ -83,18 +86,22 @@ class _PlayingScreenBase(pygame.sprite.LayeredUpdates, EventHandlerMixin) :
             self.add(c, layer=0)
     
     def _initCursor(self) :
             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()
         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)
         while self._running :
             EventDispatcher.dispatchEvents()
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)

-            clock.tick(50)
+            clock.tick(FRAMERATE)
+
+        pygame.mouse.set_visible(True)
+        self.cursor._stopBlink()

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


@@ -111,14 +118,24 @@ class PlayingScreen(_PlayingScreenBase) :
     "fenêtre de jeu pour improvisation"
     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
 
     "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)
         
         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) :
     
 
 class SongPlayingScreen(_PlayingScreenBase) :
     


@@ -134,13 +151,19 @@ class SongPlayingScreenTest(_PlayingScreenBase) :
         super(SongPlayingScreenTest, self).__init__([o])
     
 
         super(SongPlayingScreenTest, self).__init__([o])
     
 

-class Column(pygame.sprite.Sprite, EventHandlerMixin) :
+class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :

     
     def __init__(self, group, hue, rect, tone) :
     
     def __init__(self, group, hue, rect, tone) :

-        pygame.sprite.Sprite.__init__(self, group)
+        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)
         sur.fill(rgba)
         sur = pygame.surface.Surface(rect.size)
         rgba = hls_to_rgba_8bits(hue, OFF_LUMINANCE, OFF_SATURATION)
         sur.fill(rgba)

+        w, h = rect.w, rect.h
+        tw, th, = toneName.get_size()
+        toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
+        sur.blit(toneName, toneRect)

         self.stateOff = sur
         self.rectOff = rect
         
         self.stateOff = sur
         self.rectOff = rect
         


@@ -151,11 +174,13 @@ class Column(pygame.sprite.Sprite, EventHandlerMixin) :
         rectOn = pygame.Rect((onLeft, 0),
                              (onWidth, rect.height))
         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         rectOn = pygame.Rect((onLeft, 0),
                              (onWidth, rect.height))
         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)

+        w, h = rectOn.w, rectOn.h
+        toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
+        self.stateOn.blit(toneName, toneRect)

         self.rectOn = rectOn
         
         self.image = self.stateOff
         self.rect = rect
         self.rectOn = rectOn
         
         self.image = self.stateOff
         self.rect = rect

-        self.toneName = FONT.render(tone.nom, True, (0,0,0))

     
     def update(self, state) :
         group = self.groups()[0]
     
     def update(self, state) :
         group = self.groups()[0]


@@ -172,16 +197,20 @@ class Column(pygame.sprite.Sprite, 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)