X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/5034abc0164f6c09cb53291d2fe3e71c33cc4cf9..73cb300f687b50db29e9054fc3a5ed5784cf0069:/src/minwii/widgets/playingscreen.py?ds=inline diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py index 9519053..cd0ba54 100755 --- a/src/minwii/widgets/playingscreen.py +++ b/src/minwii/widgets/playingscreen.py @@ -9,6 +9,8 @@ $URL$ import pygame import types +import kinect.pygamedisplay as kinect + import minwii.events as events from minwii.log import eventLogger from minwii.eventutils import event_handler, EventDispatcher, EventHandlerMixin @@ -43,8 +45,10 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : self.columns = {} self._initColumns() self._running = False - self.draw(pygame.display.get_surface()) - self._initCursor() + self.kinectRgb = kinect.RGBSprite(alpha=128) + self.add(self.kinectRgb, layer=CURSOR_LAYER) + self._initCursor() + def _initRects(self) : """ création des espaces réservés pour @@ -94,6 +98,7 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : pygame.mouse.set_visible(False) while self._running : EventDispatcher.dispatchEvents() + self.kinectRgb.update() dirty = self.draw(pygame.display.get_surface()) pygame.display.update(dirty) clock.tick(FRAMERATE) @@ -106,9 +111,8 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) : @event_handler(pygame.KEYDOWN) def handleKeyDown(self, event) : - if event.key == pygame.K_q or \ - event.unicode == u'q' or \ - pygame.K_ESCAPE: + if event.key in (pygame.K_q, pygame.K_ESCAPE) or \ + event.unicode == u'q' : self.stop() @event_handler(pygame.MOUSEBUTTONDOWN) @@ -323,6 +327,9 @@ class SongPlayingScreen(PlayingScreenBase) : def setNoteTimeout(self) : delay = self.currentNote.duration * self.quarterNoteDuration delay = delay + delay * self.tempoTrim + delay = int(delay) + if delay < 1 : + delay = 1 # durée minimale, car 0 désactiverait le timer. pygame.time.set_timer(events.NOTEEND, delay) def tempoTrimUp(self, step=0.1) :