X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/d3b1dcc8991d9b0110133abe6eeb43f69848a78d..369d4200cf5ae0a7a96f25c6d0e9f5f750302ed3:/src/minwii/app.py?ds=sidebyside

diff --git a/src/minwii/app.py b/src/minwii/app.py
index e249c70..d456b8e 100755
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -7,6 +7,7 @@ $URL$
 """
 
 import pygame
+from pgu.gui import Theme
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from minwii.widgets.launch import LaunchScreen
@@ -20,6 +21,8 @@ from minwii.config import SONG_FILE_PATH
 from minwii.config import SCREEN_RESOLUTION
 from minwii.globals import PLAYING_MODES_DICT
 from minwii.log import console, LOG_FORMAT_VERSION, envLogger
+import os.path
+
 
 
 class MinWii(object):
@@ -29,7 +32,10 @@ class MinWii(object):
         self.wiimoteSupport = wiimoteSupport
         self.fullscreen = fullscreen
         LaunchScreen()
-        self.app = Desktop()
+        themedir = __file__.split(os.path.sep)[:-1] + ['widgets', 'data', 'minwii_theme']
+        themedir = os.path.sep.join(themedir)
+        theme = Theme(themedir)
+        self.app = Desktop(theme=theme)
         self.synth = Synth()
         self.screenResolution = SCREEN_RESOLUTION
         envLogger.info('résolution écran : %s', self.screenResolution)
@@ -67,15 +73,13 @@ class MinWii(object):
             if exit : break
             
             WT.selectWiimote(wiimoteIndex)
-            WT.resume()
 
             instrumentDescription = self.selectInstrument()
             if not instrumentDescription :
-                WT.pause()
                 continue
             
+            WT.resume()
             self.runPlayingScreen(songFile, playMode, instrumentDescription)
-            
             WT.pause()
     
     
@@ -142,12 +146,15 @@ class MinWii(object):
             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)
-        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()