src/control/media_descriptor.c: Title meta.

[vlc] / src / control / event.c

diff --git a/src/control/event.c b/src/control/event.c
index d410a1cb79bd74879d69efd41c1dcfcc3414b313..e7d3dbde00bb239338dab12a1c78cef4f0d0bea2 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -61,7 +61,7 @@ void libvlc_event_fini( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
  * Init an object's event manager.
  **************************************************************************/
 libvlc_event_manager_t *
-libvlc_event_manager_init( void * p_obj, libvlc_instance_t * p_libvlc_inst,
+libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst,
                            libvlc_exception_t *p_e )
 {
     libvlc_event_manager_t * p_em;
@@ -141,7 +141,7 @@ void libvlc_event_send( libvlc_event_manager_t * p_em,
         {
             /* We found the group, now send every one the event */
             FOREACH_ARRAY( listener, listeners_group->listeners )
-                listener->pf_callback( p_event );
+                listener->pf_callback( p_event, listener->p_user_data );
             FOREACH_END()
             break;
         }
@@ -221,7 +221,7 @@ void libvlc_event_detach( libvlc_event_manager_t *p_event_manager,
             FOREACH_END()
         }
     FOREACH_END()
-    
+
     libvlc_exception_raise( p_e,
             "This object event manager doesn't know about '%i,%p,%p' event observer",
             event_type, pf_callback, p_user_data );