X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/f930cbccef5ed34b7b17b9e738458b048d93d1da..9096acac0bf12c658183483be6dc898db1a31756:/src/app/minwii.py?ds=sidebyside

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c5961af..fe17218 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -35,7 +35,7 @@ class MinWii(object):
     def initWiimotes(self) :
         if self.wiimoteSupport :
             from pywiiuse import pygame_wiimouse
-            pygame_wiimouse.init(4, 5, screenResolution) # look for 4, wait 5 seconds
+            pygame_wiimouse.init(4, 5, self.screenResolution) # look for 4, wait 5 seconds
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('%d wiimotes found', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
@@ -56,7 +56,6 @@ class MinWii(object):
             if exit : break
             
             WT.selectWiimote(selectedWiimoteIndex)
-            console.info('wiimote sélectionnée : %d', selectedWiimoteIndex)
             WT.resume()
 
             instrumentDescription = self.selectInstrument()
@@ -78,7 +77,25 @@ class MinWii(object):
         home.connect(QUIT, app.quit)
         app.run(home)
         app.close(home)
-        #console.debug('wiimote selected: %d', home.selecctedWiimoteIndex)
+        
+        
+        actual_wiimotes = self.WT.get_count()
+        if actual_wiimotes is None :
+            msg = 'chanson : %s\nmode : %s\nHID : souris'
+            msg = msg % (home.songFile,
+                         home.modeSelect.value)
+        elif actual_wiimotes == 0 :
+            msg = 'chanson : %s\nmode : %s\nHID : souris (pas de wiimote trouvée)'
+            msg = msg % (home.songFile,
+                         home.modeSelect.value)
+        else :
+            msg = 'chanson : %s\nmode : %s\nHID : wiimote %d'
+            msg = msg % (home.songFile,
+                         home.modeSelect.value,
+                         home.selectedWiimote.value + 1)
+        
+        console.info(msg)
+        
         return (home.exitApp,
                 home.songFile,
                 home.modeSelect.value,
@@ -112,6 +129,9 @@ class MinWii(object):
 
 
 class _WTFacade :
+    """ Classe utilitaire pour singer l'api
+        de pygame_wiimouse en cas d'abscence de wiimote.
+    """
     selectWimoteIndex = 0
     def pause(self):
         pass
@@ -119,3 +139,5 @@ class _WTFacade :
         pass
     def selectWiimote(self, i):
         pass
+    def get_count(self) :
+        return None