X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/0b66243b52ca111e54c2a2d0d18c1cc9bf972b0a..1146c6cc44b9dfde050dd218f343811661796ecc:/src/app/widgets/playingscreen.py diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index 3e1a6d7..736dd06 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -15,13 +15,13 @@ 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) : @@ -57,14 +57,14 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : 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) @@ -76,7 +76,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,14 +95,17 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : dirty = self.draw(pygame.display.get_surface()) pygame.display.update(dirty) clock.tick(FRAMERATE) - + + 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) : @@ -110,34 +113,44 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : # parce qu'il s'agit du curseur for col in reversed(self.sprites()[:-1]) : if col.rect.collidepoint(*event.pos): - self.raiseColDown(col) + 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) + 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) + self.raiseColOver(col, event.pos) break - def raiseColDown(self, col) : - evt = pygame.event.Event(events.COLDOWN, column=col) + def raiseColDown(self, col, pos) : + evt = pygame.event.Event(events.COLDOWN, column=col, pos=pos) pygame.event.post(evt) - def raiseColUp(self, col) : - evt = pygame.event.Event(events.COLUP, column=col) + def raiseColUp(self, col, pos) : + evt = pygame.event.Event(events.COLUP, column=col, pos=pos) pygame.event.post(evt) - def raiseColOver(self, col) : - evt = pygame.event.Event(events.COLOVER, column=col) + 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) : @@ -156,7 +169,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) : @@ -166,16 +179,17 @@ class PlayingScreen(_PlayingScreenBase) : class SongPlayingScreen(_PlayingScreenBase) : - def __init__(self, synth, song, mode=PLAYING_MODES['EASY']) : + 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['NORMAL'] : + if mode == PLAYING_MODES_DICT['NORMAL'] : EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown) EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp) - elif mode == PLAYING_MODES['EASY'] : + elif mode == PLAYING_MODES_DICT['EASY'] : EventDispatcher.addEventListener(events.COLOVER, self.handleColumnOver) @@ -183,7 +197,7 @@ class SongPlayingScreen(_PlayingScreenBase) : 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 @@ -193,7 +207,10 @@ class SongPlayingScreen(_PlayingScreenBase) : def handleColumnDown(self, event) : col = event.column if col.state: - self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY) + 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) : @@ -204,17 +221,27 @@ class SongPlayingScreen(_PlayingScreenBase) : def handleColumnOver(self, event) : col = event.column if col.state and not self.currentNotePlayed : - self.synth.noteon(0, col.tone.midi, DEFAULT_MIDI_VELOCITY) - SongPlayingScreen.setNoteTimeout(int(self.currentNote.duration * 600)) + 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() @staticmethod def setNoteTimeout(delay) : - print 'duration', delay pygame.time.set_timer(events.NOTEEND, delay) + + def stop(self) : + pygame.time.set_timer(events.NOTEEND, 0) + super(SongPlayingScreen, self).stop()