From 1ddc7962970b99d8e6b3f760f99f1fdd76687987 Mon Sep 17 00:00:00 2001
From: pin <pin@fe552daf-6dbe-4428-90eb-1537e0879342>
Date: Fri, 9 Apr 2010 09:51:01 +0000
Subject: [PATCH] =?utf8?q?Ajout=20d'une=20option=20pour=20d=C3=A9sactiver?=
=?utf8?q?=20le=20support=20des=20wiimotes=20au=20lancement=20de=20l'appli?=
=?utf8?q?cation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@131 fe552daf-6dbe-4428-90eb-1537e0879342
---
src/app/minwii.py | 32 ++++++++++++++++++++------------
src/app/start.py | 20 +++++++++++++++++---
2 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/src/app/minwii.py b/src/app/minwii.py
index fc45bdf..1cf7daf 100755
--- a/src/app/minwii.py
+++ b/src/app/minwii.py
@@ -18,27 +18,35 @@ from eventutils import EventDispatcher
from musicxml import musicXml2Song
from config import SONG_FILE_PATH
from globals import PLAYING_MODES_DICT
-from pywiiuse import pygame_wiimouse
-from pywiiuse.PyWiiUse import IR_BELOW
class MinWii(object):
- def __init__(self) :
+ def __init__(self, wimoteSupport=True) :
LaunchScreen()
app = Desktop()
synth = Synth()
modeResolution = (1024,768)
-
- pygame_wiimouse.init(1, 5) # look for 1, wait 5 seconds
- n = pygame_wiimouse.get_count()
- print '%d wiimotes' % n
- WT = pygame_wiimouse.WT
- WT.pause()
- wm = pygame_wiimouse.Wiimote(0) # access the wiimote object
- wm.enable_accels(0) # turn on acceleration reporting
- wm.enable_ir(1, vres = modeResolution, position=IR_BELOW)
+
+ if wimoteSupport :
+ from pywiiuse import pygame_wiimouse
+ from pywiiuse.PyWiiUse import IR_BELOW
+ pygame_wiimouse.init(1, 5) # look for 1, wait 5 seconds
+ n = pygame_wiimouse.get_count()
+ print '%d wiimotes' % n
+ WT = pygame_wiimouse.WT
+ WT.pause()
+ wm = pygame_wiimouse.Wiimote(0) # access the wiimote object
+ wm.enable_accels(0) # turn on acceleration reporting
+ wm.enable_ir(1, vres = modeResolution, position=IR_BELOW)
+ else :
+ class _WTFacade :
+ def pause(self):
+ pass
+ def resume(self):
+ pass
+ WT = _WTFacade()
pygame.display.set_mode(modeResolution)
pygame.display.set_caption('MinWii')
diff --git a/src/app/start.py b/src/app/start.py
index c71bc45..d1dc009 100755
--- a/src/app/start.py
+++ b/src/app/start.py
@@ -8,7 +8,8 @@ $URL$
"""
-def main() :
+
+def main(wimoteSupport) :
import pygame
from minwii import MinWii
@@ -16,7 +17,7 @@ def main() :
#modeResolution = (1024,768)
#modeResolution = (600,480)
#pygame.display.set_mode(modeResolution, pygame.NOFRAME)#, pygame.FULLSCREEN)
- MinWii()
+ MinWii(wimoteSupport=wimoteSupport)
# from gui.PGUConfiguration import PGUConfiguration
# pygame.init()
# modeResolution = (1024,768)
@@ -27,9 +28,22 @@ def main() :
if __name__ == "__main__" :
from os.path import realpath, sep
import sys
+ from optparse import OptionParser
+
+ usage = "%prog instance_home products_conf_file [options]"
+ op = OptionParser(usage)
+
+ op.add_option("--no-wii", dest="wimoteSupport"
+ , action="store_false"
+ , default=True
+ , help = u"désactivation du support des wiimotes"
+ u" [%default]")
+
+ options, args = op.parse_args()
+ wimoteSupport = options.wimoteSupport
minwiipath = realpath(__file__).split(sep)
minwiipath = minwiipath[:-2]
minwiipath = sep.join(minwiipath)
sys.path.insert(1, minwiipath)
- main()
\ No newline at end of file
+ main(wimoteSupport)
\ No newline at end of file
--
2.20.1