X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/2feaf292e83d3c06e228ea81b4cd0a018d50de36..972649bb3a4feb51c6073c99ad10a82d50786717:/src/app/minwii.py?ds=sidebyside

diff --git a/src/app/minwii.py b/src/app/minwii.py
index c5961af..31bee79 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -29,13 +29,14 @@ class MinWii(object):
         self.app = Desktop()
         self.synth = Synth()
         self.screenResolution = (1024,768)
+        console.info('résolution écran : %s', self.screenResolution)
         self.nwiimotes = 0
         self.initWiimotes()
     
     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
@@ -44,7 +45,7 @@ class MinWii(object):
             self.WT = _WTFacade()
 
     def run(self) :
-        "manage the screen sequence display"
+        "séquençage de l'affichage des écrans"
 
         pygame.display.set_mode(self.screenResolution)
         pygame.display.set_caption('MinWii')
@@ -56,10 +57,13 @@ class MinWii(object):
             if exit : break
             
             WT.selectWiimote(selectedWiimoteIndex)
-            console.info('wiimote sélectionnée : %d', selectedWiimoteIndex)
             WT.resume()
 
             instrumentDescription = self.selectInstrument()
+            if not instrumentDescription :
+                WT.pause()
+                continue
+            
             self.runPlayingScreen(songFile, playMode, instrumentDescription)
             
             WT.pause()
@@ -78,7 +82,22 @@ class MinWii(object):
         home.connect(QUIT, app.quit)
         app.run(home)
         app.close(home)
-        #console.debug('wiimote selected: %d', home.selecctedWiimoteIndex)
+        
+        #logging
+        if home.exitApp :
+            console.info("sortie de l'application")
+        else :
+            actual_wiimotes = self.WT.get_count()
+            console.info('chanson : %s', home.songFile)
+            console.info('mode : %s', home.modeSelect.value)
+            if actual_wiimotes is None :
+                console.info('HID : souris')
+            elif actual_wiimotes == 0 :
+                console.info('HID : souris (pas de wiimote trouvée)')
+            else :
+                console.info('HID : wiimote %d', home.selectedWiimote.value + 1)
+        #---
+        
         return (home.exitApp,
                 home.songFile,
                 home.modeSelect.value,
@@ -93,7 +112,13 @@ class MinWii(object):
         selector.stop()
         pygame.event.clear()
         EventDispatcher.reset()
-        return selector.selectedInstrument
+        instru = selector.selectedInstrument
+        if instru :
+            console.info('instrument : %s', instru['name'])
+            console.info('preset : %d', instru['preset'])
+            console.info('bank : %d', instru['bank'])
+            console.info('ajustement octave : %d', instru['octave'])
+        return instru
     
     def runPlayingScreen(self, songFile, playMode, instrumentDescription) :
         """ Lance l'écran de jeu principal avec la chanson 'songFile' dans le mode 'playMode'
@@ -102,7 +127,7 @@ class MinWii(object):
         playMode = PLAYING_MODES_DICT[playMode]
         song = musicXml2Song(songFile)
         bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
-        octave = instrumentDescription.get('octave', 0)
+        octave = instrumentDescription['octave']
         self.synth.adjust_octave(0, octave)
         self.synth.program_select(0, bank, preset)
         playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
@@ -112,6 +137,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 +147,5 @@ class _WTFacade :
         pass
     def selectWiimote(self, i):
         pass
+    def get_count(self) :
+        return None