Commit 466c9690 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Event manager yields libvlc (and all the media_* stuff yields the event manager already)

parent 7d478fff
...@@ -75,6 +75,7 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst, ...@@ -75,6 +75,7 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst,
p_em->p_obj = p_obj; p_em->p_obj = p_obj;
p_em->p_libvlc_instance = p_libvlc_inst; p_em->p_libvlc_instance = p_libvlc_inst;
libvlc_retain( p_libvlc_inst );
ARRAY_INIT( p_em->listeners_groups ); ARRAY_INIT( p_em->listeners_groups );
vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock ); vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock );
vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock ); vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock );
...@@ -102,6 +103,8 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em ) ...@@ -102,6 +103,8 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em )
free( listeners_group ); free( listeners_group );
FOREACH_END() FOREACH_END()
ARRAY_RESET( p_em->listeners_groups ); ARRAY_RESET( p_em->listeners_groups );
libvlc_release( p_em->p_livclc_instance );
free( p_em ); free( p_em );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment