# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <assert.h>
} vlc_event_listeners_group_t;
#ifdef DEBUG_EVENT
-static const char * ppsz_event_type_to_name[] =
+static const char ppsz_event_type_to_name[][40] =
{
+ [vlc_InputStateChanged] = "vlc_InputStateChanged",
+ [vlc_InputSelectedStreamChanged] = "vlc_InputSelectedStreamChanged",
+
[vlc_InputItemMetaChanged] = "vlc_InputItemMetaChanged",
[vlc_InputItemSubItemAdded] = "vlc_InputItemSubItemAdded",
+ [vlc_InputItemDurationChanged] = "vlc_InputItemDurationChanged",
+ [vlc_InputItemPreparsedChanged] = "vlc_InputItemPreparsedChanged",
+ [vlc_InputItemNameChanged] = "vlc_InputItemNameChanged",
+ [vlc_InputItemInfoChanged] = "vlc_InputItemInfoChanged",
+ [vlc_InputItemErrorWhenReadingChanged] = "vlc_InputItemErrorWhenReadingChanged",
+
[vlc_ServicesDiscoveryItemAdded] = "vlc_ServicesDiscoveryItemAdded",
- [vlc_ServicesDiscoveryItemRemoved] = "vlc_ServicesDiscoveryItemRemoved"
+ [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
{
p_em->p_obj = p_obj;
p_em->p_parent_object = p_parent_obj;
- vlc_mutex_init( p_parent_obj, &p_em->object_lock );
+ vlc_mutex_init( &p_em->object_lock );
/* We need a recursive lock here, because we need to be able
* to call libvlc_event_detach even if vlc_event_send is in
* 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;
}
}
/**
- * Destroy the event manager
+ * Register the event manager
*/
int vlc_event_manager_register_event_type(
vlc_event_manager_t * p_em,
sizeof(vlc_event_listener_t)*i_cached_listeners );
if( !array_of_cached_listeners )
{
- msg_Err( p_em->p_parent_object, "Not enough memory in vlc_event_send" );
vlc_mutex_unlock( &p_em->object_lock );
return;
}
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;
}