X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/d3b1dcc8991d9b0110133abe6eeb43f69848a78d..d6f0f1bc75a5e81a24d0b1a2bec08bd2a15e7352:/src/minwii/app.py?ds=inline

diff --git a/src/minwii/app.py b/src/minwii/app.py
index e249c70..5d5d245 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)
@@ -45,6 +51,7 @@ class MinWii(object):
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
+            WT.setEventCallBack(pygame_wiimouse._default_event_cb)
             WT.pause()
         else :
             self.WT = _WTFacade()
@@ -61,21 +68,19 @@ class MinWii(object):
         songFile, playMode, wiimoteIndex = '', 'NORMAL', 0
 
         while True :
+            WT.resume()
 
             exit, songFile, playMode, wiimoteIndex = \
                 self.selectSongAndOptions(songFile, playMode, wiimoteIndex)
             if exit : break
             
             WT.selectWiimote(wiimoteIndex)
-            WT.resume()
 
             instrumentDescription = self.selectInstrument()
             if not instrumentDescription :
-                WT.pause()
                 continue
             
             self.runPlayingScreen(songFile, playMode, instrumentDescription)
-            
             WT.pause()
     
     
@@ -142,12 +147,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()