X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/36542520a974d97265a405a50d37c065f7c8db29..c9bd8f475f8fb2bce0e96a300d50c3c7e3ffd23b:/src/app/widgets/playingscreen.py?ds=inline

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 09b9550..248f0bb 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -10,6 +10,7 @@ import pygame
 from colorsys import hls_to_rgb
 from gradients import gradients
 from cursors import WarpingCursor
+from eventutils import event_handler, EventDispatcher, EventHandlerMixin
 from math import floor
 import types
 # TODO : positionner cette constance en fonction de la résolution d'affichage
@@ -24,33 +25,14 @@ ON_SATURATION = 1
 ON_COLUMN_OVERSIZING = 1.5
 
 
-def event_handler(eventType) :
-    def doRename(m) :
-        m.__name__ = 'eventHandler%s' % eventType
-        return m
-    return doRename
-
-
-class MetaRenamer(type):
-    def __new__(mcs, name, bases, dict) :
-        for k, v in dict.items() :
-            if isinstance(v, types.FunctionType) :
-                if k != v.__name__ :
-                    print 'renommage de %s en %s' % (k, v.__name__)
-                    dict[v.__name__] = v
-                    del dict[k]
-        return type.__new__(mcs, name, bases, dict)
-
-
-class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
-
-    __metaclass__ = MetaRenamer
+class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
 
     def __init__(self, distinctNotes=[]) :
         """
         distinctNotes : notes disctinctes présentes dans la chanson
         triées du plus grave au plus aigu.
         """
+        print '__init__ _PlayingScreenBase'
         super(_PlayingScreenBase, self).__init__()
         self.distinctNotes = distinctNotes
         self.keyboardLength = 0
@@ -95,7 +77,6 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
         hueStep = FIRST_HUE / (self.keyboardLength - 1)
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
-            print hue
             c = Column(hue, rect)
             self.add(c)
     
@@ -111,15 +92,11 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates) :
     
     def run(self):
         self._running = True
+        clock = pygame.time.Clock()
         while self._running :
             pygame.display.flip()
-            events = pygame.event.get()
-            for event in events:
-                self.input(event)
-
-    def input(self, event) :
-        handler = getattr(self, 'eventHandler%s' % event.type, lambda e:None)
-        handler(event)
+            EventDispatcher.dispatchEvents()
+            clock.tick(50)
     
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
@@ -145,6 +122,7 @@ class SongPlayingScreen(_PlayingScreenBase) :
 
 class SongPlayingScreenTest(_PlayingScreenBase) :
     def __init__(self) :
+        print '__init__ SongPlayingScreenTest'
         class C:pass
         o = C()
         o.midi=1