} vlc_event_listeners_group_t;
#ifdef DEBUG_EVENT
-static const char ppsz_event_type_to_name[][33] =
+static const char ppsz_event_type_to_name[][40] =
{
[vlc_InputStateChanged] = "vlc_InputStateChanged",
[vlc_InputSelectedStreamChanged] = "vlc_InputSelectedStreamChanged",
[vlc_InputItemErrorWhenReadingChanged] = "vlc_InputItemErrorWhenReadingChanged",
[vlc_ServicesDiscoveryItemAdded] = "vlc_ServicesDiscoveryItemAdded",
- [vlc_ServicesDiscoveryItemRemoved] = "vlc_ServicesDiscoveryItemRemoved"
- [vlc_ServicesDiscoveryStarted] = "vlc_ServicesDiscoveryStarted"
+ [vlc_ServicesDiscoveryItemRemoved] = "vlc_ServicesDiscoveryItemRemoved",
+ [vlc_ServicesDiscoveryStarted] = "vlc_ServicesDiscoveryStarted",
[vlc_ServicesDiscoveryEnded] = "vlc_ServicesDiscoveryEnded"
};
#endif
*
*****************************************************************************/
+#undef vlc_event_manager_init
/**
* Initialize event manager object
* p_obj is the object that contains the event manager. But not
* 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;
}
/**
- * Destroy the event manager
+ * Register the event manager
*/
int vlc_event_manager_register_event_type(
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;
FOREACH_END()
vlc_mutex_unlock( &p_em->object_lock );
- msg_Err( p_em->p_parent_object, "Can't attach to an object event manager event" );
+ msg_Err( p_em->p_parent_object, "cannot attach to an object event" );
free(listener);
return VLC_EGENERIC;
}
vlc_mutex_unlock( &p_em->event_sending_lock );
vlc_mutex_unlock( &p_em->object_lock );
- msg_Warn( p_em->p_parent_object, "Can't detach to an object event manager event" );
+ msg_Warn( p_em->p_parent_object, "cannot detach from an object event" );
return VLC_EGENERIC;
}