X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/9ee138507f97c1dddedc10cb0d471bc201693e77..9df37cf5c91975214a341a58e703c5b8f826ab45:/src/minwii/app.py?ds=sidebyside

diff --git a/src/minwii/app.py b/src/minwii/app.py
index f9385f6..f36094c 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
@@ -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.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):
@@ -28,9 +32,12 @@ 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 = (1024,768)
+        self.screenResolution = SCREEN_RESOLUTION
         envLogger.info('résolution écran : %s', self.screenResolution)
         self.nwiimotes = 0
         self.initWiimotes()
@@ -39,7 +46,8 @@ class MinWii(object):
     def initWiimotes(self) :
         if self.wiimoteSupport :
             from pywiiuse import pygame_wiimouse
-            pygame_wiimouse.init(4, 5, self.screenResolution) # look for 4, wait 5 seconds
+            from minwii.config import IR_POSITION
+            pygame_wiimouse.init(4, 5, self.screenResolution, IR_POSITION) # look for 4, wait 5 seconds
             self.nwiimotes = nwiimotes = pygame_wiimouse.get_count()
             console.debug('wiimotes found : %d', nwiimotes)
             self.WT = WT = pygame_wiimouse.WT
@@ -55,13 +63,16 @@ class MinWii(object):
         pygame.display.set_mode(self.screenResolution, displayFlags)
         pygame.display.set_caption('MINWii')
         WT = self.WT
+        
+        songFile, playMode, wiimoteIndex = '', 'NORMAL', 0
 
         while True :
 
-            exit, songFile, playMode, selectedWiimoteIndex = self.selectSongAndOptions()
+            exit, songFile, playMode, wiimoteIndex = \
+                self.selectSongAndOptions(songFile, playMode, wiimoteIndex)
             if exit : break
             
-            WT.selectWiimote(selectedWiimoteIndex)
+            WT.selectWiimote(wiimoteIndex)
             WT.resume()
 
             instrumentDescription = self.selectInstrument()
@@ -74,7 +85,7 @@ class MinWii(object):
             WT.pause()
     
     
-    def selectSongAndOptions(self) :
+    def selectSongAndOptions(self, songFile, playMode, wiimoteIndex) :
         """ lance l'écran de paramétrage et retourne un tuple comportant :
             - drapeau de sortie de l'application (booléen)
             - chemin du fichier de la chanson
@@ -82,6 +93,9 @@ class MinWii(object):
             - wiimote sélectionnée (entier)
         """
         home = Home(songPath=SONG_FILE_PATH,
+                    songFile=songFile,
+                    playMode=playMode,
+                    wiimoteIndex=wiimoteIndex,
                     nwiimotes=self.nwiimotes)
         app = self.app
         home.connect(QUIT, app.quit)
@@ -109,8 +123,8 @@ class MinWii(object):
         
         return (home.exitApp,
                 home.songFile,
-                home.modeSelect.value,
-                home.selectedWiimote.value)
+                home.selectedPlayMode,
+                home.selectedWiimoteIndex)
     
     def selectInstrument(self) :
         """ lance l'écran de sélection de l'instrument et retourne
@@ -134,12 +148,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()