X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/ae79067c99dcb4473df80ddd5eb24395d90ab6d3..refs/heads/master:/src/minwii/app.py diff --git a/src/minwii/app.py b/src/minwii/app.py index 0129cec..b9219ae 100755 --- a/src/minwii/app.py +++ b/src/minwii/app.py @@ -34,16 +34,15 @@ SCREEN_PLAY = 2 class MinWii(object): - def __init__(self, wiimoteSupport=True, fullscreen=False) : + def __init__(self, wiimoteSupport=True, fullscreen=False, audioDriver=None) : envLogger.info('winwii log format version : %s', LOG_FORMAT_VERSION) self.wiimoteSupport = wiimoteSupport self.fullscreen = fullscreen LaunchScreen() - themedir = __file__.split(os.path.sep)[:-1] + ['widgets', 'data', 'minwii_theme'] - themedir = os.path.sep.join(themedir) + themedir = os.path.join(os.path.dirname(__file__), 'widgets', 'data', 'minwii_theme') theme = Theme(themedir) self.app = Desktop(theme=theme) - self.synth = Synth() + self.synth = Synth(driver=audioDriver) self.screenResolution = SCREEN_RESOLUTION envLogger.info('résolution écran : %s', self.screenResolution) self.nwiimotes = 0 @@ -99,10 +98,11 @@ class MinWii(object): if self.fullscreen : displayFlags = displayFlags | pygame.FULLSCREEN pygame.display.set_mode(self.screenResolution, displayFlags) - pygame.display.set_caption('MINWii') + pygame.display.set_caption('MINDs') WT = self.WT - songFile, playMode, displayNotes, wiimoteIndex = '', 'NORMAL', True, 0 + # valeurs par défaut des options + songFile, playMode, displayNotes, wiimoteIndex = '', 'NORMAL', False, 0 while True : WT.resume()