events: Add wrappers around vlc_event_manager_init for object casting.

diff --git a/include/vlc_events.h b/include/vlc_events.h
index 50c4105c32484c53ce84385d6df334edfbc71dc5..01baa940bc5968a9e23a8d7a20a69f4ab310495d 100644 (file)
--- a/include/vlc_events.h
+++ b/include/vlc_events.h
@@ -184,7 +184,12 @@ typedef void ( *vlc_event_callback_t )( const vlc_event_t *, void * );
  * which events are sent
  * p_obj is here to give us a libvlc instance
  */
-VLC_EXPORT(int, vlc_event_manager_init, ( vlc_event_manager_t * p_em,
+#define vlc_event_manager_init_with_vlc_object(a,b) \
+            vlc_event_manager_init( a, b, b )
+
+#define vlc_event_manager_init(a,b,c) \
+            __vlc_event_manager_init(a, b, VLC_OBJECT(c))
+VLC_EXPORT(int, __vlc_event_manager_init, ( vlc_event_manager_t * p_em,
                                           void * p_obj, vlc_object_t * ));
 
 /*

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index f0b8828979e85fc4a377e06f75e088798e9d3bdc..f5cfcd5216bc72d429170ec03b4d73686dde721f 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -406,7 +406,7 @@ vlc_error
 __vlc_event_attach
 vlc_event_detach
 vlc_event_manager_fini
-vlc_event_manager_init
+__vlc_event_manager_init
 vlc_event_manager_register_event_type
 vlc_event_send
 __vlc_execve

diff --git a/src/misc/events.c b/src/misc/events.c
index 60bc130c84afd4b29bf8e78c96a2162507d5bdc3..3b539ccce0d889b11b94215fb1630ff9897aa3ab 100644 (file)
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -110,8 +110,8 @@ group_contains_listener( vlc_event_listeners_group_t * group,
  * for instance).
  * p_parent_obj gives a libvlc instance
  */
-int vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
-                            vlc_object_t * p_parent_obj )
+int __vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
+                              vlc_object_t * p_parent_obj )
 {
     p_em->p_obj = p_obj;
     p_em->p_parent_object = p_parent_obj;