X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/ccd80f6896303234addbb0f619335b6e59df7746..b0a3123973062597484f6bc64ad0900eddc21ba7:/src/app/widgets/playingscreen.py?ds=sidebyside diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index 9f84ee5..67039e7 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -15,22 +15,22 @@ import types from musicxml import Tone from config import FRAMERATE -from config import BORDER from config import FIRST_HUE -from config import DEFAULT_MIDI_VELOCITY +from config import MIDI_VELOCITY_RANGE +from config import MIDI_PAN_RANGE from globals import BACKGROUND_LAYER from globals import CURSOR_LAYER -from globals import PLAYING_MODES +from globals import PLAYING_MODES_DICT -class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : +class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : 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__() + super(PlayingScreenBase, self).__init__() self.synth = synth self.distinctNotes = distinctNotes self.keyboardLength = 0 @@ -41,31 +41,24 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : self._initColumns() self._running = False self.draw(pygame.display.get_surface()) - self._initCursor() - + self._initCursor() 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 self.keyboardLength = len(self.distinctNotes) screen = pygame.display.get_surface() - # taille de la zone d'affichage utile (bordure autour) - dispWidth = screen.get_width() - 2 * BORDER - dispHeight = screen.get_height() - 2 * BORDER + self.dispWidth = dispWidth = screen.get_width() + self.dispHeight = dispHeight = screen.get_height() columnWidth = int(round(float(dispWidth) / self.keyboardLength)) rects = [] for i in range(self.keyboardLength) : - upperLeftCorner = (i*columnWidth + BORDER, BORDER) + upperLeftCorner = (i*columnWidth, 0) rect = pygame.Rect(upperLeftCorner, (columnWidth, dispHeight)) rects.append(rect) @@ -77,7 +70,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : for i, rect in enumerate(self.keyboardRects) : hue = FIRST_HUE - hueStep * i tone = self.distinctNotes[i] - c = Column(self, hue, rect, tone) + c = Column(self, i, hue, rect, tone) self.add(c, layer=BACKGROUND_LAYER) self.columns[tone.midi] = c @@ -95,18 +88,66 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : EventDispatcher.dispatchEvents() dirty = self.draw(pygame.display.get_surface()) pygame.display.update(dirty) - clock.tick(FRAMERATE) - + clock.tick() + + def stop(self) : + self._running = False + self.synth.system_reset() 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 + self.stop() + + @event_handler(pygame.MOUSEBUTTONDOWN) + def onMouseDown(self, event) : + # TODO à cleaner : on vire le dernier élément + # parce qu'il s'agit du curseur + for col in reversed(self.sprites()[:-1]) : + if col.rect.collidepoint(*event.pos): + self.raiseColDown(col, event.pos) + break + + @event_handler(pygame.MOUSEBUTTONUP) + def onMouseUp(self, event) : + for col in reversed(self.sprites()[:-1]) : + if col.rect.collidepoint(*event.pos) : + self.raiseColUp(col, event.pos) + break + + @event_handler(pygame.MOUSEMOTION) + def onMouseMove(self, event) : + for col in reversed(self.sprites()[:-1]) : + if col.rect.collidepoint(*event.pos) : + self.raiseColOver(col, event.pos) + break + + def raiseColDown(self, col, pos) : + evt = pygame.event.Event(events.COLDOWN, column=col, pos=pos) + pygame.event.post(evt) + + def raiseColUp(self, col, pos) : + evt = pygame.event.Event(events.COLUP, column=col, pos=pos) + pygame.event.post(evt) + + def raiseColOver(self, col, pos) : + evt = pygame.event.Event(events.COLOVER, column=col, pos=pos) + pygame.event.post(evt) + + def getVelocity(self, pos) : + vel = (float(self.dispWidth) - pos[1]) / self.dispWidth + vel = int(vel * (MIDI_VELOCITY_RANGE[1] - MIDI_VELOCITY_RANGE[0])) + MIDI_VELOCITY_RANGE[0] + return vel + def getPan(self, index) : + pan = float(index) / (self.keyboardLength -1) + pan = int(pan * (MIDI_PAN_RANGE[1] - MIDI_PAN_RANGE[0])) + MIDI_PAN_RANGE[0] + return pan + -class PlayingScreen(_PlayingScreenBase) : +class PlayingScreen(PlayingScreenBase) : "fenêtre de jeu pour improvisation" scale = [55, 57, 59, 60, 62, 64, 65, 67, 69, 71, 72] @@ -122,7 +163,7 @@ class PlayingScreen(_PlayingScreenBase) : @event_handler(events.NOTEON) def noteon(self, evt) : tone = evt.tone - self.synth.noteon(0, tone.midi, DEFAULT_MIDI_VELOCITY) + self.synth.noteon(0, tone.midi, 96) @event_handler(events.NOTEOFF) def noteoff(self, evt) : @@ -130,32 +171,72 @@ class PlayingScreen(_PlayingScreenBase) : self.synth.noteoff(0, tone.midi) -class SongPlayingScreen(_PlayingScreenBase) : +class SongPlayingScreen(PlayingScreenBase) : - def __init__(self, synth, song, mode=PLAYING_MODES['NORMAL']) : + def __init__(self, synth, song, mode=PLAYING_MODES_DICT['EASY']) : super(SongPlayingScreen, self).__init__(synth, song.distinctNotes) self.song = song + self.quarterNoteDuration = song.quarterNoteDuration self.currentColumn = None self.noteIterator = self.song.iterNotes() self.displayNext() + if mode == PLAYING_MODES_DICT['NORMAL'] : + EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown) + EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp) + elif mode == PLAYING_MODES_DICT['EASY'] : + EventDispatcher.addEventListener(events.COLOVER, self.handleColumnOver) + - def displayNext(self) : + def displayNext(self, event=None) : if self.currentColumn: self.currentColumn.update(False) note, verseIndex = self.noteIterator.next() - syllabus = note.lyrics[verseIndex].syllabus(encoding="iso-8859-1") + syllabus = note.lyrics[verseIndex].syllabus() column = self.columns[note.midi] column.update(True, syllabus) self.currentColumn = column + self.currentNote = note + self.currentNotePlayed = False - @event_handler(events.KEYDOWN) - def handleKeyDown(self, event) : + def handleColumnDown(self, event) : col = event.column - if col == self.currentColumn: - self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY) + if col.state: + pan = self.getPan(col.index) + self.synth.cc(0, 10, pan) + vel = self.getVelocity(event.pos) + self.synth.noteon(0, col.tone.midi, vel) + self.currentNotePlayed = True + + def handleColumnUp(self, event) : + if self.currentNotePlayed : + self.synth.noteoff(0, self.currentColumn.tone.midi) + self.displayNext() - @event_handler(events.KEYUP) - def handleKeyUp(self, event) : - self.synth.noteoff(0, self.currentColumn.tone.midi) + def handleColumnOver(self, event) : + col = event.column + if col.state and not self.currentNotePlayed : + pan = self.getPan(col.index) + self.synth.cc(0, 10, pan) + vel = self.getVelocity(event.pos) + self.synth.noteon(0, col.tone.midi, vel) + SongPlayingScreen.setNoteTimeout( + int(self.currentNote.duration * \ + self.quarterNoteDuration) + ) + self.currentNotePlayed = True + + @event_handler(events.NOTEEND) + def clearTimeOutAndDisplayNext(self, evt) : + pygame.time.set_timer(evt.type, 0) + self.synth.noteoff(0, self.currentNote.midi) self.displayNext() - \ No newline at end of file + + @staticmethod + def setNoteTimeout(delay) : + pygame.time.set_timer(events.NOTEEND, delay) + + def stop(self) : + pygame.time.set_timer(events.NOTEEND, 0) + super(SongPlayingScreen, self).stop() + + \ No newline at end of file