bugfix sous windows.

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

diff --git a/src/app/minwii.py b/src/app/minwii.py
index fe17218..31bee79 100755 (executable)
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -29,6 +29,7 @@ class MinWii(object):
         self.app = Desktop()
         self.synth = Synth()
         self.screenResolution = (1024,768)
         self.app = Desktop()
         self.synth = Synth()
         self.screenResolution = (1024,768)

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

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


@@ -44,7 +45,7 @@ class MinWii(object):
             self.WT = _WTFacade()
 
     def run(self) :
             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')
 
         pygame.display.set_mode(self.screenResolution)
         pygame.display.set_caption('MinWii')


@@ -59,6 +60,10 @@ class MinWii(object):
             WT.resume()
 
             instrumentDescription = self.selectInstrument()
             WT.resume()
 
             instrumentDescription = self.selectInstrument()

+            if not instrumentDescription :
+                WT.pause()
+                continue
+            

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


@@ -78,23 +83,20 @@ class MinWii(object):
         app.run(home)
         app.close(home)
         
         app.run(home)
         app.close(home)
         

-        
-        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)
+        #logging
+        if home.exitApp :
+            console.info("sortie de l'application")

         else :
         else :

-            msg = 'chanson : %s\nmode : %s\nHID : wiimote %d'
-            msg = msg % (home.songFile,
-                         home.modeSelect.value,
-                         home.selectedWiimote.value + 1)
-        
-        console.info(msg)
+            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,
         
         return (home.exitApp,
                 home.songFile,


@@ -110,7 +112,13 @@ class MinWii(object):
         selector.stop()
         pygame.event.clear()
         EventDispatcher.reset()
         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'
     
     def runPlayingScreen(self, songFile, playMode, instrumentDescription) :
         """ Lance l'écran de jeu principal avec la chanson 'songFile' dans le mode 'playMode'


@@ -119,7 +127,7 @@ class MinWii(object):
         playMode = PLAYING_MODES_DICT[playMode]
         song = musicXml2Song(songFile)
         bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
         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)
         self.synth.adjust_octave(0, octave)
         self.synth.program_select(0, bank, preset)
         playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)