From: Rémi Denis-Courmont Date: Sun, 4 May 2008 11:12:33 +0000 (+0300) Subject: vlc_mutex_init_recursive: remove useless parameter X-Git-Tag: 0.9.0-test0~1202 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e038c5268f243761f3d3b63def32fda573ce1e4d;p=vlc vlc_mutex_init_recursive: remove useless parameter --- diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h index 7cad20c698..dc632e9449 100644 --- a/include/vlc_threads_funcs.h +++ b/include/vlc_threads_funcs.h @@ -59,7 +59,7 @@ VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) ); /***************************************************************************** * vlc_mutex_init: initialize a recursive mutex (Don't use it) *****************************************************************************/ -#define vlc_mutex_init_recursive( P_THIS, P_MUTEX ) \ +#define vlc_mutex_init_recursive( P_MUTEX ) \ __vlc_mutex_init_recursive( P_MUTEX ) /***************************************************************************** diff --git a/src/control/event.c b/src/control/event.c index 57cfc6697f..b7840100d1 100644 --- a/src/control/event.c +++ b/src/control/event.c @@ -101,7 +101,7 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst, libvlc_retain( p_libvlc_inst ); vlc_array_init( &p_em->listeners_groups ); vlc_mutex_init( &p_em->object_lock ); - vlc_mutex_init_recursive( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock ); + vlc_mutex_init_recursive( &p_em->event_sending_lock ); return p_em; } diff --git a/src/misc/events.c b/src/misc/events.c index 251f0370ae..a8b54ec4da 100644 --- a/src/misc/events.c +++ b/src/misc/events.c @@ -123,7 +123,7 @@ int vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj, * This ensures that after libvlc_event_detach, the callback * will never gets triggered. * */ - vlc_mutex_init_recursive( p_parent_obj, &p_em->event_sending_lock ); + vlc_mutex_init_recursive( &p_em->event_sending_lock ); ARRAY_INIT( p_em->listeners_groups ); return VLC_SUCCESS; }