passage en V1 du format de log.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index 31bee79..55ea722 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -18,27 +18,29 @@ from eventutils import EventDispatcher
 from musicxml import musicXml2Song
 from config import SONG_FILE_PATH
 from globals import PLAYING_MODES_DICT
 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, envLogger

 
 
 class MinWii(object):
     
     def __init__(self, wiimoteSupport=True) :
 
 
 class MinWii(object):
     
     def __init__(self, wiimoteSupport=True) :

+        envLogger.info('winwii log format version : %s', LOG_FORMAT_VERSION)

         self.wiimoteSupport = wiimoteSupport
         LaunchScreen()
         self.app = Desktop()
         self.synth = Synth()
         self.screenResolution = (1024,768)
         self.wiimoteSupport = wiimoteSupport
         LaunchScreen()
         self.app = Desktop()
         self.synth = Synth()
         self.screenResolution = (1024,768)

-        console.info('résolution écran : %s', self.screenResolution)
+        envLogger.info('résolution écran : %s', self.screenResolution)

         self.nwiimotes = 0
         self.initWiimotes()
         self.nwiimotes = 0
         self.initWiimotes()

+        self.firstSong = True

     
     def initWiimotes(self) :
         if self.wiimoteSupport :
             from pywiiuse import pygame_wiimouse
             pygame_wiimouse.init(4, 5, self.screenResolution) # look for 4, wait 5 seconds
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
     
     def initWiimotes(self) :
         if self.wiimoteSupport :
             from pywiiuse import pygame_wiimouse
             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)
+            console.debug('wiimotes found : %d', nwiimotes)

             self.WT = WT = pygame_wiimouse.WT
             WT.pause()
         else :
             self.WT = WT = pygame_wiimouse.WT
             WT.pause()
         else :


@@ -85,9 +87,13 @@ class MinWii(object):
         
         #logging
         if home.exitApp :
         
         #logging
         if home.exitApp :

-            console.info("sortie de l'application")
+            console.debug("sortie de l'application")

         else :
             actual_wiimotes = self.WT.get_count()
         else :
             actual_wiimotes = self.WT.get_count()

+            if self.firstSong :
+                self.firstSong = False
+            else :
+                envLogger.info('NEW_LOG_FILE')

             console.info('chanson : %s', home.songFile)
             console.info('mode : %s', home.modeSelect.value)
             if actual_wiimotes is None :
             console.info('chanson : %s', home.songFile)
             console.info('mode : %s', home.modeSelect.value)
             if actual_wiimotes is None :