X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/0b332732d1a18bbf86ba8b8ee052f46059bace9c..41abf9e9670bd4ccd60c07ee7464509080bb7f8d:/src/minwii/app.py?ds=sidebyside

diff --git a/src/minwii/app.py b/src/minwii/app.py
index dfe24ca..87c2082 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,19 +49,41 @@ 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(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)
+            
+            # le bouton Home de la télécommande permet de sortir
+            # (envoi d'un événement clavier « q »)
+            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)
 
+        elif self.screen in (SCREEN_HOME, SCREEN_INSTRUMENTS) :
+            pygame_wiimouse._full_mouse_event_cb(wt, id, wmp)
+    
     def run(self) :
         "séquençage de l'affichage des écrans"
         displayFlags = 0
@@ -67,21 +96,22 @@ class MinWii(object):
         songFile, playMode, wiimoteIndex = '', 'NORMAL', 0
 
         while True :
-
+            WT.resume()
+            WT.selectWiimote(self.nwiimotes - 1) # la télécommande est la souris
+            self.screen = SCREEN_HOME
             exit, songFile, playMode, wiimoteIndex = \
                 self.selectSongAndOptions(songFile, playMode, wiimoteIndex)
             if exit : break
             
-            WT.selectWiimote(wiimoteIndex)
-            WT.resume()
-
+            
+            self.screen = SCREEN_INSTRUMENTS
             instrumentDescription = self.selectInstrument()
             if not instrumentDescription :
-                WT.pause()
                 continue
             
+            self.screen = SCREEN_PLAY
+            WT.selectWiimote(wiimoteIndex)
             self.runPlayingScreen(songFile, playMode, instrumentDescription)
-            
             WT.pause()
     
     
@@ -148,12 +178,15 @@ class MinWii(object):
             avec l'instrument midi 'instrumentDescription'.
         """
         playMode = PLAYING_MODES_DICT[playMode]
-        song = musicXml2Song(songFile)
         bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
         octave = instrumentDescription['octave']
         self.synth.adjust_octave(0, octave)
         self.synth.program_select(0, bank, preset)
-        playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
+        if playMode == PLAYING_MODES_DICT['IMPRO'] :
+            playingScreen = PlayingScreen(self.synth)
+        else :
+            song = musicXml2Song(songFile)
+            playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
         playingScreen.run()
         pygame.event.clear()
         EventDispatcher.reset()