Ajout du mode improvisation.

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

diff --git a/src/minwii/app.py b/src/minwii/app.py
index 1160d5b..f36094c 100755 (executable)
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -7,6 +7,7 @@ $URL$
 """
 
 import pygame
 """
 
 import pygame

+from pgu.gui import Theme

 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from minwii.widgets.launch import LaunchScreen
 from pgu.gui import Desktop
 from pgu.gui import QUIT
 from minwii.widgets.launch import LaunchScreen


@@ -17,8 +18,11 @@ from minwii.synth import Synth
 from minwii.eventutils import EventDispatcher
 from minwii.musicxml import musicXml2Song
 from minwii.config import SONG_FILE_PATH
 from minwii.eventutils import EventDispatcher
 from minwii.musicxml import musicXml2Song
 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
 from minwii.globals import PLAYING_MODES_DICT
 from minwii.log import console, LOG_FORMAT_VERSION, envLogger

+import os.path
+

 
 
 class MinWii(object):
 
 
 class MinWii(object):


@@ -28,9 +32,12 @@ class MinWii(object):
         self.wiimoteSupport = wiimoteSupport
         self.fullscreen = fullscreen
         LaunchScreen()
         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.synth = Synth()

-        self.screenResolution = (1024,768)
+        self.screenResolution = SCREEN_RESOLUTION

         envLogger.info('résolution écran : %s', self.screenResolution)
         self.nwiimotes = 0
         self.initWiimotes()
         envLogger.info('résolution écran : %s', self.screenResolution)
         self.nwiimotes = 0
         self.initWiimotes()


@@ -141,12 +148,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()