[vlc-commits] commit: python-vlc: dereference event. contents in EventManager callback wrapper. (Olivier Aubert )

[git at videolan.org]

vlc/python | branch: master | Olivier Aubert <olivier.aubert at liris.cnrs.fr> | Tue Nov 16 11:03:08 2010 +0100| [48408481cce5210896f81fbb3439b3a3cd497e8a] | committer: Olivier Aubert 

python-vlc: dereference event.contents in EventManager callback wrapper.

This allows callback method to simply access the Event class.

> http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=48408481cce5210896f81fbb3439b3a3cd497e8a
---

 footer.py   |    6 +++---
 override.py |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/footer.py b/footer.py
index c6e4580..5c9cd44 100644
--- a/footer.py
+++ b/footer.py
@@ -9,7 +9,7 @@ def callbackmethod(f):
 
 # Example callback, useful for debugging
 def debug_callback(event, *args, **kwds):
-    l = ["event %s" % (event.contents.type,)]
+    l = ["event %s" % (event.type,)]
     if args:
        l.extend(map(str, args))
     if kwds:
@@ -39,8 +39,8 @@ if __name__ == '__main__':
     echo_position = False
     def pos_callback(event, player):
         if echo_position:
-            print "%s to %.2f%% (%.2f%%)" % (event.contents.type,
-                   event.contents.u.new_position * 100,
+            print "%s to %.2f%% (%.2f%%)\r" % (event.type,
+                   event.u.new_position * 100,
                    player.get_position() * 100)
 
     if sys.argv[1:]:
diff --git a/override.py b/override.py
index aeabb91..10a7fd9 100644
--- a/override.py
+++ b/override.py
@@ -262,9 +262,8 @@ class EventManager:
                 """
                 try: # retrieve Python callback and arguments
                     call, args, kwds = self._callbacks_[event.contents.type.value]
-                    # FIXME: event could be dereferenced here to event.contents,
-                    # this would simplify the callback code.
-                    call(event, *args, **kwds)
+                    # We dereference event.contents here to simplify callback code.
+                    call(event.contents, *args, **kwds)
                 except KeyError:  # detached?
                     pass
             self._callback_handler = _callback_handler