qq préparatif avant de rentrer dans le vif du sujet : jouer les chansons dans les...

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

diff --git a/src/app/config.py b/src/app/config.py
index 119f141..827c5a4 100755 (executable)
--- a/src/app/config.py
+++ b/src/app/config.py
@@ -21,3 +21,4 @@ ON_COLUMN_OVERSIZING = 2
 ON_COLUMN_ALPHA = 1
 FONT = pygame.font.Font(None, 80)
 FONT_COLOR = (0,0,0)
 ON_COLUMN_ALPHA = 1
 FONT = pygame.font.Font(None, 80)
 FONT_COLOR = (0,0,0)

+DEFAULT_MIDI_VELOCITY = 96
\ No newline at end of file

diff --git a/src/app/minwii.py b/src/app/minwii.py
index d083093..be69eb9 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -9,7 +9,7 @@ $URL$
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from widgets.home import Home
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from widgets.home import Home

-from widgets.playingscreen import SongPlayingScreen
+from widgets.playingscreen import SongPlayingScreen, PlayingScreen

 from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from synth import Synth
 from eventutils import EventDispatcher
 from musicxml import musicXml2Song


@@ -21,7 +21,7 @@ class MinWii(object):
         synth = Synth()
         synth.program_select(0, 0, 0)
 
         synth = Synth()
         synth.program_select(0, 0, 0)
 

-        while True :
+        if True :

             #home = Home()
             #home.connect(QUIT, app.quit)
             #app.run(home)
             #home = Home()
             #home.connect(QUIT, app.quit)
             #app.run(home)


@@ -29,5 +29,6 @@ class MinWii(object):
             
             song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/bon_tabac.xml')
             playingScreen = SongPlayingScreen(synth, song)
             
             song = musicXml2Song('/Users/pinbe/dev/minwii/src/songs/chansons/bon_tabac.xml')
             playingScreen = SongPlayingScreen(synth, song)

+            #playingScreen = PlayingScreen(synth)

             playingScreen.run()
             EventDispatcher.reset()
             playingScreen.run()
             EventDispatcher.reset()

diff --git a/src/app/player.py b/src/app/player.py
deleted file mode 100755 (executable)
index 4c90eb3..0000000
--- a/src/app/player.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Lecteur de chanson
-
-$Id$
-$URL$
-"""

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 7e94d0e..a28e07d 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -15,7 +15,6 @@ from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from math import floor
 import types
 from musicxml import Tone
 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


@@ -29,10 +28,15 @@ from config import ON_COLUMN_OVERSIZING
 from config import ON_COLUMN_ALPHA
 from config import FONT
 from config import FONT_COLOR
 from config import ON_COLUMN_ALPHA
 from config import FONT
 from config import FONT_COLOR

+from config import DEFAULT_MIDI_VELOCITY

 
 BACKGROUND_LAYER = 0
 FOREGROUND_LAYER = 1
 CURSOR_LAYER = 2
 
 BACKGROUND_LAYER = 0
 FOREGROUND_LAYER = 1
 CURSOR_LAYER = 2

+PLAYING_MODES = {'EASY':0
+                ,'NORMAL':1
+                ,'ADVANCED':2
+                ,'EXPERT':3}

 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 


@@ -48,6 +52,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         self.keyboardRects = []
         self.cursor = None
         self._initRects()
         self.keyboardRects = []
         self.cursor = None
         self._initRects()

+        self.columns = {}

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


@@ -89,6 +94,8 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             tone = self.distinctNotes[i]
             c = Column(self, hue, rect, tone)
             self.add(c, layer=BACKGROUND_LAYER)
             tone = self.distinctNotes[i]
             c = Column(self, hue, rect, tone)
             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)


@@ -116,6 +123,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         
 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]
 
     def __init__(self, synth) :
     scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72]
 
     def __init__(self, synth) :


@@ -129,7 +137,7 @@ class PlayingScreen(_PlayingScreenBase) :
     @event_handler(events.NOTEON)
     def noteon(self, evt) :
         tone = evt.tone
     @event_handler(events.NOTEON)
     def noteon(self, evt) :
         tone = evt.tone

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

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


@@ -139,14 +147,23 @@ class PlayingScreen(_PlayingScreenBase) :
 
 class SongPlayingScreen(_PlayingScreenBase) :
     
 
 class SongPlayingScreen(_PlayingScreenBase) :
     

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

         super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
         self.song = song
         super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
         self.song = song

+        self.noteIterator = self.song.iterNotes()
+        self.play()
+    
+    def play(self) :
+        note, verseIndex = self.noteIterator.next()
+        syllabus = note.lyrics[verseIndex].syllabus()
+        column = self.columns[note.midi]
+        column.update(True, syllabus)
+    

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

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

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


@@ -159,8 +176,13 @@ 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.state = False
+        
+        # nom de l'intonation

         self.tone = tone
         self.tone = tone

-        toneName = FONT.render(tone.nom, True, (0,0,0))        
+        toneName = FONT.render(tone.nom, True, (0,0,0))
+        
+        # état off : surface unie et nom de l'intonation

         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)


@@ -168,34 +190,52 @@ class Column(pygame.sprite.DirtySprite, EventHandlerMixin) :
         tw, th, = toneName.get_size()
         toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
         sur.blit(toneName, toneRect)
         tw, th, = toneName.get_size()
         toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
         sur.blit(toneName, toneRect)

-        self.stateOff = sur
+        self.surOff = sur

         self.rectOff = rect
         
         self.rectOff = rect
         

+        
+        # état on : surface dégradée avec nom de la note avec largeur agrandie

         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))
         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)
+        self.surOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)

         w, h = rectOn.w, rectOn.h
         toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
         w, h = rectOn.w, rectOn.h
         toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))

-        self.stateOn.blit(toneName, toneRect)
+        self.surOn.blit(toneName, toneRect)

         self.rectOn = rectOn
         
         self.rectOn = rectOn
         

-        self.image = self.stateOff
+        self.image = self.surOff

         self.rect = rect
         self.rect = rect

+        #EventDispatcher.addEventListener(pygame.MOUSEBUTTONDOWN, self.onMouseDown)
+        #EventDispatcher.addEventListener(pygame.MOUSEBUTTONUP, self.onMouseUp)

     
     

-    def update(self, state) :
+    def update(self, state, syllabus='') :

         group = self.groups()[0]
         group = self.groups()[0]

+        if state == self.state :
+            # no changes
+            return

         if state :
             group.change_layer(self, FOREGROUND_LAYER)
         if state :
             group.change_layer(self, FOREGROUND_LAYER)

-            self.image = self.stateOn
+            sur = self.surOn
+            if syllabus :
+                sur = sur.copy()
+                renderedSyl = FONT.render(syllabus, True, (0,0,0))
+                sw, sh, = renderedSyl.get_size()
+                w, h = self.rectOn.w, self.rectOn.h
+                sylRect = pygame.Rect(((w - sw) / 2, (h - sh) / 2), (sw, sh))
+                sur.blit(renderedSyl, sylRect)
+                
+            self.image = sur

             self.rect = self.rectOn
         else :
             group.change_layer(self, BACKGROUND_LAYER)
             self.rect = self.rectOn
         else :
             group.change_layer(self, BACKGROUND_LAYER)

-            self.image = self.stateOff
+            self.image = self.surOff

             self.rect = self.rectOff
             self.rect = self.rectOff

+        self.state = state
+        self.dirty = 1    

     
     @event_handler(pygame.MOUSEBUTTONDOWN)
     def onMouseDown(self, event) :
     
     @event_handler(pygame.MOUSEBUTTONDOWN)
     def onMouseDown(self, event) :