Amélioration cosmétique.

[minwii.git] / src / minwii / app.py

diff --git a/src/minwii/app.py b/src/minwii/app.py
index da2bcb8..95bfaab 100755 (executable)
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -58,7 +58,7 @@ class MinWii(object):
             global pygame_wiimouse
             from pywiiuse import pygame_wiimouse
             from minwii.config import IR_POSITION
             global pygame_wiimouse
             from pywiiuse import pygame_wiimouse
             from minwii.config import IR_POSITION

-            pygame_wiimouse.init(2, 5, self.screenResolution, IR_POSITION) # look for 4, wait 5 seconds
+            pygame_wiimouse.init(5, 5, self.screenResolution, IR_POSITION) # look for 5, wait 5 seconds

             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT


@@ -70,13 +70,23 @@ class MinWii(object):
     def _wiimotesEventCallBack(self, wt, id, wmp) :
         if self.screen == SCREEN_PLAY :
             pygame_wiimouse._default_event_cb(wt, id, wmp)
     def _wiimotesEventCallBack(self, wt, id, wmp) :
         if self.screen == SCREEN_PLAY :
             pygame_wiimouse._default_event_cb(wt, id, wmp)

+            

             wm = wmp[0]
             wm = wmp[0]

-            if id == self.nwiimotes - 1 and \
-                wiiuse.is_just_pressed(wm, wiiuse.button['Home']) :
+            if id == self.nwiimotes - 1 :
+                # le bouton Home de la télécommande permet de sortir
+                # (envoi d'un événement clavier « q »)
+                if 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)
                     event = pygame.event.Event(pygame.KEYDOWN,
                                                key = pygame.K_q,
                                                unicode = u'q')
                     pygame.event.post(event)

+                elif wiiuse.is_just_pressed(wm, wiiuse.button['+']) :
+                    self.synth.inc_gain()
+                elif wiiuse.is_just_pressed(wm, wiiuse.button['-']) :
+                    self.synth.dec_gain()
+
+        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"
     
     def run(self) :
         "séquençage de l'affichage des écrans"


@@ -91,12 +101,12 @@ class MinWii(object):
 
         while True :
             WT.resume()
 
         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
             
             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()
             
             self.screen = SCREEN_INSTRUMENTS
             instrumentDescription = self.selectInstrument()


@@ -104,6 +114,7 @@ class MinWii(object):
                 continue
             
             self.screen = SCREEN_PLAY
                 continue
             
             self.screen = SCREEN_PLAY

+            WT.selectWiimote(wiimoteIndex)

             self.runPlayingScreen(songFile, playMode, instrumentDescription)
             WT.pause()
     
             self.runPlayingScreen(songFile, playMode, instrumentDescription)
             WT.pause()