c'est bof... on va essayer autre chose.

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 1a014e7..9f84ee5 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -7,58 +7,53 @@ $Id$
 $URL$
 """
 import pygame
 $URL$
 """
 import pygame

-from colorsys import hls_to_rgb
-from gradients import gradients

 from cursors import WarpingCursor
 from cursors import WarpingCursor

+from column import Column

 import events
 from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 import events
 from eventutils import event_handler, EventDispatcher, EventHandlerMixin

-from math import floor

 import types
 from musicxml import Tone
 import types
 from musicxml import Tone

-import fluidsynth

 
 from config import FRAMERATE
 from config import BORDER
 from config import FIRST_HUE
 
 from config import FRAMERATE
 from config import BORDER
 from config import FIRST_HUE

-from config import OFF_LUMINANCE
-from config import OFF_SATURATION
-from config import ON_TOP_LUMINANCE
-from config import ON_BOTTOM_LUMINANCE
-from config import ON_SATURATION
-from config import ON_COLUMN_OVERSIZING
-from config import ON_COLUMN_ALPHA
-from config import FONT
-from config import FONT_COLOR
+from config import DEFAULT_MIDI_VELOCITY
+
+from globals import BACKGROUND_LAYER
+from globals import CURSOR_LAYER
+from globals import PLAYING_MODES

 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, 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.cursor = None
         self._initRects()
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
         self.keyboardRects = []
         self.cursor = None
         self._initRects()

+        self.columns = {}

         self._initColumns()
         self._running = False
         self.draw(pygame.display.get_surface())
         self._initCursor()
         self._initColumns()
         self._running = False
         self.draw(pygame.display.get_surface())
         self._initCursor()

-            

     
     
     def _initRects(self) :
         """ création des espaces réservés pour
             afficher les colonnes.
         """
     
     
     def _initRects(self) :
         """ 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()
 
         
         screen = pygame.display.get_surface()
 


@@ -83,147 +78,84 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]
             c = Column(self, hue, rect, tone)
             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)
+            self.columns[tone.midi] = c
+        

     
     def _initCursor(self) :
         self.cursor = WarpingCursor(blinkMode=True)
     
     def _initCursor(self) :
         self.cursor = WarpingCursor(blinkMode=True)

-        self.add(self.cursor, layer=2)
+        self.add(self.cursor, layer=CURSOR_LAYER)

         
     def run(self):
         self._running = True
         clock = pygame.time.Clock()
         pygame.display.flip()
         
     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)
 
         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:
             self._running = False
     @event_handler(pygame.KEYDOWN)       
     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) :
     "fenêtre de jeu pour improvisation"
         
         
 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, 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)
-        
-        #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()
-    
+        super(PlayingScreen, self).__init__(synth, distinctNotes)
+            

     @event_handler(events.NOTEON)
     def noteon(self, evt) :
         tone = evt.tone
     @event_handler(events.NOTEON)
     def noteon(self, evt) :
         tone = evt.tone

-        self.fs.noteon(0, tone.midi, 64)
+        self.synth.noteon(0, tone.midi, DEFAULT_MIDI_VELOCITY)

 
     @event_handler(events.NOTEOFF)
     def noteoff(self, evt) :
         tone = evt.tone
 
     @event_handler(events.NOTEOFF)
     def noteoff(self, evt) :
         tone = evt.tone

-        self.fs.noteoff(0, tone.midi)
+        self.synth.noteoff(0, tone.midi)

 
 

-        

 
 class SongPlayingScreen(_PlayingScreenBase) :
     
 
 class SongPlayingScreen(_PlayingScreenBase) :
     

-    def __init__(self, song) :
-        super(SongPlayingScreen, self).__init__(song.distinctNotes)
+    def __init__(self, synth, song, mode=PLAYING_MODES['NORMAL']) :
+        super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)

         self.song = song
         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)
-        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
-        
-        topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION, ON_COLUMN_ALPHA)
-        bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION, ON_COLUMN_ALPHA)
-        onWidth = rect.width * ON_COLUMN_OVERSIZING
-        onLeft = rect.centerx - onWidth / 2
-        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.currentColumn = None
+        self.noteIterator = self.song.iterNotes()
+        self.displayNext()

     
     

-    def update(self, state) :
-        group = self.groups()[0]
-        if state :
-            group.change_layer(self, 1)
-            self.image = self.stateOn
-            self.rect = self.rectOn
-        else :
-            group.change_layer(self, 0)
-            self.image = self.stateOff
-            self.rect = self.rectOff
+    def displayNext(self) :
+        if self.currentColumn:
+            self.currentColumn.update(False)
+        note, verseIndex = self.noteIterator.next()
+        syllabus = note.lyrics[verseIndex].syllabus(encoding="iso-8859-1")
+        column = self.columns[note.midi]
+        column.update(True, syllabus)
+        self.currentColumn = column

     
     

-    @event_handler(pygame.MOUSEBUTTONDOWN)
-    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()
+    @event_handler(events.KEYDOWN)
+    def handleKeyDown(self, event) :
+        col = event.column
+        if col == self.currentColumn:
+            self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY)

     
     

-    def raiseNoteOn(self) :
-        evt = pygame.event.Event(events.NOTEON, tone=self.tone)
-        pygame.event.post(evt)
-
-    def raiseNoteOff(self) :
-        evt = pygame.event.Event(events.NOTEOFF, tone=self.tone)
-        pygame.event.post(evt)
-
-
-        
-def hls_to_rgba_8bits(h, l, s, a=1) :
-    #convert to rgb ranging from 0 to 255
-    rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (a,)]
-    return tuple(rgba)
+    @event_handler(events.KEYUP)
+    def handleKeyUp(self, event) :
+        self.synth.noteoff(0, self.currentColumn.tone.midi)
+        self.displayNext()
+    
\ No newline at end of file