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

events: remove leading underscores

parent 3a29031f
......@@ -221,10 +221,10 @@ typedef void ( *vlc_event_callback_t )( const vlc_event_t *, void * );
#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,
VLC_EXPORT(int, vlc_event_manager_init, ( vlc_event_manager_t * p_em,
void * p_obj, vlc_object_t * ));
#define vlc_event_manager_init(a,b,c) \
vlc_event_manager_init(a, b, VLC_OBJECT(c))
/*
* Destroy
......@@ -246,12 +246,12 @@ VLC_EXPORT(void, vlc_event_send, ( vlc_event_manager_t * p_em,
/*
* Add a callback for an event.
*/
#define vlc_event_attach(a, b, c, d) __vlc_event_attach(a, b, c, d, #c)
VLC_EXPORT(int, __vlc_event_attach, ( vlc_event_manager_t * p_event_manager,
vlc_event_type_t event_type,
vlc_event_callback_t pf_callback,
void *p_user_data,
const char * psz_debug_name ));
VLC_EXPORT(int, vlc_event_attach, ( vlc_event_manager_t * p_event_manager,
vlc_event_type_t event_type,
vlc_event_callback_t pf_callback,
void *p_user_data,
const char * psz_debug_name ));
#define vlc_event_attach(a, b, c, d) vlc_event_attach(a, b, c, d, #c)
/*
* Remove a callback for an event.
......
......@@ -485,10 +485,10 @@ vlc_sem_wait
vlc_control_cancel
vlc_CPU
vlc_error
__vlc_event_attach
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
......
......@@ -114,6 +114,7 @@ group_contains_listener( vlc_event_listeners_group_t * group,
*
*****************************************************************************/
#undef vlc_event_manager_init
/**
* Initialize event manager object
* p_obj is the object that contains the event manager. But not
......@@ -121,8 +122,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;
......@@ -278,14 +279,15 @@ void vlc_event_send( vlc_event_manager_t * p_em,
free( array_of_cached_listeners );
}
#undef vlc_event_attach
/**
* Add a callback for an event.
*/
int __vlc_event_attach( vlc_event_manager_t * p_em,
vlc_event_type_t event_type,
vlc_event_callback_t pf_callback,
void *p_user_data,
const char * psz_debug_name )
int vlc_event_attach( vlc_event_manager_t * p_em,
vlc_event_type_t event_type,
vlc_event_callback_t pf_callback,
void *p_user_data,
const char * psz_debug_name )
{
vlc_event_listeners_group_t * listeners_group;
vlc_event_listener_t * listener;
......
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