From: pin Date: Fri, 24 Jun 2011 12:16:42 +0000 (+0000) Subject: Implémentation du bouton « Home » de la télécommande. X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/commitdiff_plain/9f42e2eecaf0b45b5010129f16c7961aa7377dc9?ds=inline;hp=d6f0f1bc75a5e81a24d0b1a2bec08bd2a15e7352 Implémentation du bouton « Home » de la télécommande. git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@349 fe552daf-6dbe-4428-90eb-1537e0879342 --- diff --git a/src/minwii/app.py b/src/minwii/app.py index 5d5d245..da2bcb8 100755 --- a/src/minwii/app.py +++ b/src/minwii/app.py @@ -23,6 +23,13 @@ from minwii.globals import PLAYING_MODES_DICT from minwii.log import console, LOG_FORMAT_VERSION, envLogger import os.path +wiiuse = None +pygame_wiimouse = None + +SCREEN_HOME = 0 +SCREEN_INSTRUMENTS = 1 +SCREEN_PLAY = 2 + class MinWii(object): @@ -42,20 +49,35 @@ class MinWii(object): self.nwiimotes = 0 self.initWiimotes() self.firstSong = True + self.screen = SCREEN_HOME def initWiimotes(self) : if self.wiimoteSupport : + global wiiuse + from pywiiuse import PyWiiUse as wiiuse + global pygame_wiimouse from pywiiuse import pygame_wiimouse from minwii.config import IR_POSITION - pygame_wiimouse.init(4, 5, self.screenResolution, IR_POSITION) # look for 4, wait 5 seconds + pygame_wiimouse.init(2, 5, self.screenResolution, IR_POSITION) # look for 4, wait 5 seconds self.nwiimotes = nwiimotes = pygame_wiimouse.get_count() console.debug('wiimotes found : %d', nwiimotes) self.WT = WT = pygame_wiimouse.WT - WT.setEventCallBack(pygame_wiimouse._default_event_cb) + WT.setEventCallBack(self._wiimotesEventCallBack) WT.pause() else : self.WT = _WTFacade() - + + def _wiimotesEventCallBack(self, wt, id, wmp) : + if self.screen == SCREEN_PLAY : + pygame_wiimouse._default_event_cb(wt, id, wmp) + wm = wmp[0] + if id == self.nwiimotes - 1 and \ + wiiuse.is_just_pressed(wm, wiiuse.button['Home']) : + event = pygame.event.Event(pygame.KEYDOWN, + key = pygame.K_q, + unicode = u'q') + pygame.event.post(event) + def run(self) : "séquençage de l'affichage des écrans" displayFlags = 0 @@ -69,17 +91,19 @@ class MinWii(object): while True : WT.resume() - + self.screen = SCREEN_HOME exit, songFile, playMode, wiimoteIndex = \ self.selectSongAndOptions(songFile, playMode, wiimoteIndex) if exit : break WT.selectWiimote(wiimoteIndex) - + + self.screen = SCREEN_INSTRUMENTS instrumentDescription = self.selectInstrument() if not instrumentDescription : continue + self.screen = SCREEN_PLAY self.runPlayingScreen(songFile, playMode, instrumentDescription) WT.pause()