X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/dc8216d3cd94fe2a5d89c6e8a4fae5de2f25bc9b..cf0a97e6fca3155000772d961bba89c215e1b457:/src/app/minwii.py

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 4b23012..a0a9161 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -18,12 +18,13 @@ from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from config import SONG_FILE_PATH
 from globals import PLAYING_MODES_DICT
-from log import console
+from log import console, LOG_FORMAT_VERSION
 
 
 class MinWii(object):
     
     def __init__(self, wiimoteSupport=True) :
+        console.info('winwii log format version : %s', LOG_FORMAT_VERSION)
         self.wiimoteSupport = wiimoteSupport
         LaunchScreen()
         self.app = Desktop()
@@ -83,26 +84,20 @@ class MinWii(object):
         app.run(home)
         app.close(home)
         
-        
+        #logging
         if home.exitApp :
-            msg = "sortie de l'application"
+            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 :
-                msg = 'chanson : %s\nmode : %s\nHID : souris'
-                msg = msg % (home.songFile,
-                             home.modeSelect.value)
+                console.info('HID : souris')
             elif actual_wiimotes == 0 :
-                msg = 'chanson : %s\nmode : %s\nHID : souris (pas de wiimote trouvée)'
-                msg = msg % (home.songFile,
-                             home.modeSelect.value)
+                console.info('HID : souris (pas de wiimote trouvée)')
             else :
-                msg = 'chanson : %s\nmode : %s\nHID : wiimote %d'
-                msg = msg % (home.songFile,
-                             home.modeSelect.value,
-                             home.selectedWiimote.value + 1)
-        
-        console.info(msg)
+                console.info('HID : wiimote %d', home.selectedWiimote.value + 1)
+        #---
         
         return (home.exitApp,
                 home.songFile,
@@ -118,10 +113,13 @@ class MinWii(object):
         selector.stop()
         pygame.event.clear()
         EventDispatcher.reset()
-        if selector.selectedInstrument :
-            console.info('instrument : %(name)s\npreset : %(preset)d\nbank : %(bank)d\najustement octave : %(octave)d' % \
-                         selector.selectedInstrument)
-        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'