X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/4eea7dea91f195ce0cea6c45187fdb577f033d37..11a91fe04d1d980af4c65414e73b5c3048c72cad:/src/minwii/app.py diff --git a/src/minwii/app.py b/src/minwii/app.py index 55ea722..ad2e382 100755 --- a/src/minwii/app.py +++ b/src/minwii/app.py @@ -9,23 +9,24 @@ $URL$ import pygame from pgu.gui import Desktop from pgu.gui import QUIT -from widgets.launch import LaunchScreen -from widgets.home import Home -from widgets.playingscreen import SongPlayingScreen, PlayingScreen -from widgets.instrumentselector import InstrumentSelector -from synth import Synth -from eventutils import EventDispatcher -from musicxml import musicXml2Song -from config import SONG_FILE_PATH -from globals import PLAYING_MODES_DICT -from log import console, LOG_FORMAT_VERSION, envLogger +from minwii.widgets.launch import LaunchScreen +from minwii.widgets.home import Home +from minwii.widgets.playingscreen import SongPlayingScreen, PlayingScreen +from minwii.widgets.instrumentselector import InstrumentSelector +from minwii.synth import Synth +from minwii.eventutils import EventDispatcher +from minwii.musicxml import musicXml2Song +from minwii.config import SONG_FILE_PATH +from minwii.globals import PLAYING_MODES_DICT +from minwii.log import console, LOG_FORMAT_VERSION, envLogger class MinWii(object): - def __init__(self, wiimoteSupport=True) : + def __init__(self, wiimoteSupport=True, fullscreen=False) : envLogger.info('winwii log format version : %s', LOG_FORMAT_VERSION) self.wiimoteSupport = wiimoteSupport + self.fullscreen = fullscreen LaunchScreen() self.app = Desktop() self.synth = Synth() @@ -38,7 +39,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 @@ -48,9 +50,11 @@ class MinWii(object): def run(self) : "séquençage de l'affichage des écrans" - - pygame.display.set_mode(self.screenResolution) - pygame.display.set_caption('MinWii') + displayFlags = 0 + if self.fullscreen : + displayFlags = displayFlags | pygame.FULLSCREEN + pygame.display.set_mode(self.screenResolution, displayFlags) + pygame.display.set_caption('MINWii') WT = self.WT while True :