Sélection de l'instrument à la souris.

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

diff --git a/src/minwii/app.py b/src/minwii/app.py
index dfe24ca..d456b8e 100755 (executable)
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -73,15 +73,13 @@ class MinWii(object):
             if exit : break
             
             WT.selectWiimote(wiimoteIndex)
             if exit : break
             
             WT.selectWiimote(wiimoteIndex)

-            WT.resume()

 
             instrumentDescription = self.selectInstrument()
             if not instrumentDescription :
 
             instrumentDescription = self.selectInstrument()
             if not instrumentDescription :

-                WT.pause()

                 continue
             
                 continue
             

+            WT.resume()

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

-            

             WT.pause()
     
     
             WT.pause()
     
     


@@ -148,12 +146,15 @@ class MinWii(object):
             avec l'instrument midi 'instrumentDescription'.
         """
         playMode = PLAYING_MODES_DICT[playMode]
             avec l'instrument midi 'instrumentDescription'.
         """
         playMode = PLAYING_MODES_DICT[playMode]

-        song = musicXml2Song(songFile)

         bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
         octave = instrumentDescription['octave']
         self.synth.adjust_octave(0, octave)
         self.synth.program_select(0, bank, preset)
         bank, preset = instrumentDescription['bank'], instrumentDescription['preset']
         octave = instrumentDescription['octave']
         self.synth.adjust_octave(0, octave)
         self.synth.program_select(0, bank, preset)

-        playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)
+        if playMode == PLAYING_MODES_DICT['IMPRO'] :
+            playingScreen = PlayingScreen(self.synth)
+        else :
+            song = musicXml2Song(songFile)
+            playingScreen = SongPlayingScreen(self.synth, song, mode=playMode)

         playingScreen.run()
         pygame.event.clear()
         EventDispatcher.reset()
         playingScreen.run()
         pygame.event.clear()
         EventDispatcher.reset()