Gestion explicite de KeyboardInterrupt pour être sûr de quitter le jeu sur un ^C.

[minwii.git] / src / minwii / widgets / playingscreen.py

diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index f6038fd..90a6d2a 100755 (executable)
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -20,6 +20,7 @@ from minwii.config import FIRST_HUE
 from minwii.config import MIDI_VELOCITY_RANGE
 from minwii.config import MIDI_PAN_RANGE
 from minwii.config import MIDI_VELOCITY_WRONG_NOTE_ATTN
+from minwii.config import SCREEN_RESOLUTION
 from minwii.globals import BACKGROUND_LAYER
 from minwii.globals import CURSOR_LAYER
 from minwii.globals import PLAYING_MODES_DICT
@@ -45,10 +46,9 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         self.columns = {}
         self._initColumns()
         self._running = False
-        self.kinectRgb = kinect.RGBSprite(alpha=128)
+        self.kinectRgb = kinect.RGBSprite(alpha=128, size=SCREEN_RESOLUTION)
         self.add(self.kinectRgb, layer=CURSOR_LAYER)
         self._initCursor()
-        self.draw(pygame.display.get_surface())
         
     
     def _initRects(self) :
@@ -98,11 +98,15 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         pygame.display.flip()
         pygame.mouse.set_visible(False)
         while self._running :
-            EventDispatcher.dispatchEvents()
-            self.kinectRgb.update()
-            dirty = self.draw(pygame.display.get_surface())
-            pygame.display.update(dirty)
-            clock.tick(FRAMERATE)
+            try :
+                EventDispatcher.dispatchEvents()
+                self.kinectRgb.update()
+                dirty = self.draw(pygame.display.get_surface())
+                pygame.display.update(dirty)
+                clock.tick(FRAMERATE)
+            except KeyboardInterrupt :
+                self.stop()
+                raise
     
     def stop(self) :
         self._running = False