X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/760a2904b59a2c59dd006def017dbdb45b64516a..8056dc2c3c20d098d82880edabac26ffe130cb09:/src/app/widgets/playingscreen.py?ds=sidebyside diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index 7e94d0e..fc6c801 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -7,32 +7,21 @@ $Id$ $URL$ """ import pygame -from colorsys import hls_to_rgb -from gradients import gradients from cursors import WarpingCursor +from column import Column 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 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 - -BACKGROUND_LAYER = 0 -FOREGROUND_LAYER = 1 -CURSOR_LAYER = 2 +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) : @@ -48,6 +37,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : self.keyboardRects = [] self.cursor = None self._initRects() + self.columns = {} self._initColumns() self._running = False self.draw(pygame.display.get_surface()) @@ -89,6 +79,8 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : 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) @@ -116,6 +108,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] def __init__(self, synth) : @@ -129,7 +122,7 @@ class PlayingScreen(_PlayingScreenBase) : @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) : @@ -139,14 +132,23 @@ class PlayingScreen(_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 + 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 - self.synth.noteon(0, tone.midi, 64) + self.synth.noteon(0, tone.midi, DEFAULT_MIDI_VELOCITY) @event_handler(events.NOTEOFF) def noteoff(self, evt) : @@ -155,70 +157,94 @@ class SongPlayingScreen(_PlayingScreenBase) : -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 - - def update(self, state) : - group = self.groups()[0] - if state : - group.change_layer(self, FOREGROUND_LAYER) - self.image = self.stateOn - self.rect = self.rectOn - else : - group.change_layer(self, BACKGROUND_LAYER) - self.image = self.stateOff - self.rect = self.rectOff - - @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() - - 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) +#class Column(pygame.sprite.DirtySprite, EventHandlerMixin) : +# +# def __init__(self, group, hue, rect, tone) : +# pygame.sprite.DirtySprite.__init__(self, group) +# self.state = False +# +# # nom de l'intonation +# self.tone = tone +# 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) +# 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.surOff = sur +# 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)) +# self.surOn = gradients.vertical(rectOn.size, topRgba, bottomRgba) +# w, h = rectOn.w, rectOn.h +# toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th)) +# self.surOn.blit(toneName, toneRect) +# self.rectOn = rectOn +# +# self.image = self.surOff +# self.rect = rect +# #EventDispatcher.addEventListener(pygame.MOUSEBUTTONDOWN, self.onMouseDown) +# #EventDispatcher.addEventListener(pygame.MOUSEBUTTONUP, self.onMouseUp) +# +# def update(self, state, syllabus='') : +# group = self.groups()[0] +# if state == self.state : +# # no changes +# return +# if state : +# group.change_layer(self, FOREGROUND_LAYER) +# 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.image = self.surOff +# self.rect = self.rectOff +# self.state = state +# self.dirty = 1 +# +# @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() +# +# 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) +# \ No newline at end of file