* Documentation : Read vlc_events.h
*****************************************************************************/
-//#define DEBUG_EVENT
-
/*****************************************************************************
* Private types.
*****************************************************************************/
{
void * p_user_data;
vlc_event_callback_t pf_callback;
-#ifdef DEBUG_EVENT
- char * psz_debug_name;
-#endif
} vlc_event_listener_t;
typedef struct vlc_event_listeners_group_t
} vlc_event_listeners_group_t;
-#ifdef DEBUG_EVENT
-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_ServicesDiscoveryStarted] = "vlc_ServicesDiscoveryStarted",
- [vlc_ServicesDiscoveryEnded] = "vlc_ServicesDiscoveryEnded"
-};
-#endif
-
static bool
listeners_are_equal( vlc_event_listener_t * listener1,
vlc_event_listener_t * listener2 )
*
*****************************************************************************/
+#undef vlc_event_manager_init
/**
* Initialize event manager object
* p_obj is the object that contains the event manager. But not
* necessarily a vlc_object_t (an input_item_t is not a vlc_object_t
* 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 )
{
p_em->p_obj = p_obj;
- p_em->p_parent_object = p_parent_obj;
vlc_mutex_init( &p_em->object_lock );
/* We need a recursive lock here, because we need to be able
}
/**
- * Destroy the event manager
+ * Register the event manager
*/
int vlc_event_manager_register_event_type(
vlc_event_manager_t * p_em,
cached_listener = array_of_cached_listeners;
FOREACH_ARRAY( listener, listeners_group->listeners )
memcpy( cached_listener, listener, sizeof(vlc_event_listener_t));
-#ifdef DEBUG_EVENT
- cached_listener->psz_debug_name = strdup(cached_listener->psz_debug_name);
-#endif
cached_listener++;
FOREACH_END()
for( i = 0; i < i_cached_listeners; i++ )
{
-#ifdef DEBUG_EVENT
- msg_Dbg( p_em->p_parent_object,
- "Calling '%s' with a '%s' event (data %p)",
- cached_listener->psz_debug_name,
- ppsz_event_type_to_name[p_event->type],
- cached_listener->p_user_data );
- free(cached_listener->psz_debug_name);
-#endif
/* No need to lock on listeners_group, a listener group can't be removed */
if( listeners_group->b_sublistener_removed )
{
vlc_mutex_unlock( &p_em->object_lock );
if( !valid_listener )
{
-#ifdef DEBUG_EVENT
- msg_Dbg( p_em->p_parent_object, "Callback was removed during execution" );
-#endif
cached_listener++;
continue;
}
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 )
{
vlc_event_listeners_group_t * listeners_group;
vlc_event_listener_t * listener;
listener->p_user_data = p_user_data;
listener->pf_callback = pf_callback;
-#ifdef DEBUG_EVENT
- listener->psz_debug_name = strdup( psz_debug_name );
-#else
- (void)psz_debug_name;
-#endif
vlc_mutex_lock( &p_em->object_lock );
FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
if( listeners_group->event_type == event_type )
{
ARRAY_APPEND( listeners_group->listeners, listener );
-#ifdef DEBUG_EVENT
- msg_Dbg( p_em->p_parent_object,
- "Listening to '%s' event with '%s' (data %p)",
- ppsz_event_type_to_name[event_type],
- listener->psz_debug_name,
- listener->p_user_data );
-#endif
vlc_mutex_unlock( &p_em->object_lock );
return VLC_SUCCESS;
}
FOREACH_END()
- vlc_mutex_unlock( &p_em->object_lock );
-
- msg_Err( p_em->p_parent_object, "cannot attach to an object event" );
- free(listener);
- return VLC_EGENERIC;
+ /* Unknown event = BUG */
+ assert( 0 );
}
/**
* Remove a callback for an event.
*/
-int vlc_event_detach( vlc_event_manager_t *p_em,
- vlc_event_type_t event_type,
- vlc_event_callback_t pf_callback,
- void *p_user_data )
+void vlc_event_detach( vlc_event_manager_t *p_em,
+ vlc_event_type_t event_type,
+ vlc_event_callback_t pf_callback,
+ void *p_user_data )
{
vlc_event_listeners_group_t * listeners_group;
struct vlc_event_listener_t * listener;
- vlc_mutex_lock( &p_em->object_lock );
vlc_mutex_lock( &p_em->event_sending_lock );
+ vlc_mutex_lock( &p_em->object_lock );
FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
if( listeners_group->event_type == event_type )
{
ARRAY_REMOVE( listeners_group->listeners,
fe_idx /* This comes from the macro (and that's why
I hate macro) */ );
-#ifdef DEBUG_EVENT
- msg_Dbg( p_em->p_parent_object,
- "Detaching '%s' from '%s' event (data %p)",
- listener->psz_debug_name,
- ppsz_event_type_to_name[event_type],
- listener->p_user_data );
-
- free( listener->psz_debug_name );
-#endif
free( listener );
vlc_mutex_unlock( &p_em->event_sending_lock );
vlc_mutex_unlock( &p_em->object_lock );
- return VLC_SUCCESS;
+ return;
}
FOREACH_END()
}
FOREACH_END()
- vlc_mutex_unlock( &p_em->event_sending_lock );
- vlc_mutex_unlock( &p_em->object_lock );
-
- msg_Warn( p_em->p_parent_object, "cannot detach from an object event" );
- return VLC_EGENERIC;
+ assert( 0 );
}
-
projects / vlc / blobdiff