X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fevent.c;h=a98f23c7ab0e2266220625c601e93c5efce09521;hb=166dc5d2b4e0856b8a0a8b54821561117f4fb42b;hp=178e984859adec2d957c1e52958450a9481da769;hpb=ec99b9d9de88aaa99181840c74028b3871cecd62;p=vlc diff --git a/src/control/event.c b/src/control/event.c index 178e984859..a98f23c7ab 100644 --- a/src/control/event.c +++ b/src/control/event.c @@ -26,35 +26,36 @@ #include #include - /* * Private functions */ - -/* - * Internal libvlc functions - */ - -/************************************************************************** - * libvlc_event_init (internal) : - * - * initialization function. - **************************************************************************/ -void libvlc_event_init( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) +static bool +listeners_are_equal( libvlc_event_listener_t * listener1, + libvlc_event_listener_t * listener2 ) { - /* Will certainly be used to install libvlc_instance event */ + return listener1->event_type == listener2->event_type && + listener1->pf_callback == listener2->pf_callback && + listener1->p_user_data == listener2->p_user_data; } -/************************************************************************** - * libvlc_event_fini (internal) : - * - * finalization function. - **************************************************************************/ -void libvlc_event_fini( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) +static bool +group_contains_listener( libvlc_event_listeners_group_t * group, + libvlc_event_listener_t * searched_listener ) { + int i; + for( i = 0; i < vlc_array_count(&group->listeners); i++ ) + { + if( listeners_are_equal(searched_listener, vlc_array_item_at_index(&group->listeners, i)) ) + return true; + } + return false; } +/* + * Internal libvlc functions + */ + /************************************************************************** * libvlc_event_manager_init (internal) : * @@ -76,9 +77,9 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst, p_em->p_obj = p_obj; p_em->p_libvlc_instance = p_libvlc_inst; libvlc_retain( p_libvlc_inst ); - ARRAY_INIT( p_em->listeners_groups ); - vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock ); - vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock ); + vlc_array_init( &p_em->listeners_groups ); + vlc_mutex_init( &p_em->object_lock ); + vlc_mutex_init_recursive( &p_em->event_sending_lock ); return p_em; } @@ -89,22 +90,24 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst, **************************************************************************/ void libvlc_event_manager_release( libvlc_event_manager_t * p_em ) { - libvlc_event_listeners_group_t * listeners_group; - libvlc_event_listener_t * listener; + libvlc_event_listeners_group_t * p_lg; + int i,j ; vlc_mutex_destroy( &p_em->event_sending_lock ); vlc_mutex_destroy( &p_em->object_lock ); - FOREACH_ARRAY( listeners_group, p_em->listeners_groups ) - FOREACH_ARRAY( listener, listeners_group->listeners ) - free( listener ); - FOREACH_END() - ARRAY_RESET( listeners_group->listeners ); - free( listeners_group ); - FOREACH_END() - ARRAY_RESET( p_em->listeners_groups ); + for( i = 0; i < vlc_array_count(&p_em->listeners_groups); i++) + { + p_lg = vlc_array_item_at_index( &p_em->listeners_groups, i ); + + for( j = 0; j < vlc_array_count(&p_lg->listeners); j++) + free( vlc_array_item_at_index( &p_lg->listeners, j ) ); - libvlc_release( p_em->p_libvlc_instance, NULL ); + vlc_array_clear( &p_lg->listeners ); + free( p_lg ); + } + vlc_array_clear( &p_em->listeners_groups ); + libvlc_release( p_em->p_libvlc_instance ); free( p_em ); } @@ -127,10 +130,10 @@ void libvlc_event_manager_register_event_type( } listeners_group->event_type = event_type; - ARRAY_INIT( listeners_group->listeners ); + vlc_array_init( &listeners_group->listeners ); vlc_mutex_lock( &p_em->object_lock ); - ARRAY_APPEND( p_em->listeners_groups, listeners_group ); + vlc_array_append( &p_em->listeners_groups, listeners_group ); vlc_mutex_unlock( &p_em->object_lock ); } @@ -142,7 +145,7 @@ void libvlc_event_manager_register_event_type( void libvlc_event_send( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) { - libvlc_event_listeners_group_t * listeners_group; + libvlc_event_listeners_group_t * listeners_group = NULL; libvlc_event_listener_t * listener_cached; libvlc_event_listener_t * listener; libvlc_event_listener_t * array_listeners_cached = NULL; @@ -154,14 +157,16 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, /* Here a read/write lock would be nice */ vlc_mutex_lock( &p_em->object_lock ); - FOREACH_ARRAY( listeners_group, p_em->listeners_groups ) + for( i = 0; i < vlc_array_count(&p_em->listeners_groups); i++) + { + listeners_group = vlc_array_item_at_index(&p_em->listeners_groups, i); if( listeners_group->event_type == p_event->type ) { - if( listeners_group->listeners.i_size <= 0 ) + if( vlc_array_count( &listeners_group->listeners ) <= 0 ) break; /* Cache a copy of the listener to avoid locking issues */ - i_cached_listeners = listeners_group->listeners.i_size; + i_cached_listeners = vlc_array_count(&listeners_group->listeners); array_listeners_cached = malloc(sizeof(libvlc_event_listener_t)*(i_cached_listeners)); if( !array_listeners_cached ) { @@ -170,25 +175,43 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, } listener_cached = array_listeners_cached; - FOREACH_ARRAY( listener, listeners_group->listeners ) - memcpy( listener_cached, listener, sizeof(libvlc_event_listener_t)); + for( i = 0; i < vlc_array_count(&listeners_group->listeners); i++) + { + listener = vlc_array_item_at_index(&listeners_group->listeners, i); + memcpy( listener_cached, listener, sizeof(libvlc_event_listener_t) ); listener_cached++; - FOREACH_END() + } break; } - FOREACH_END() + } + + if( !listeners_group ) + { + free( array_listeners_cached ); + return; + } vlc_mutex_unlock( &p_em->object_lock ); - /* Here a read/write lock would be *especially* nice, - * We would be able to send event without blocking */ - /* The only reason for this lock is to be able to wait the - * End of events sending with libvlc_event_manager_lock_event_sending. - * This can be useful to make sure a callback is completely detached. */ vlc_mutex_lock( &p_em->event_sending_lock ); listener_cached = array_listeners_cached; + listeners_group->b_sublistener_removed = false; for( i = 0; i < i_cached_listeners; i++ ) { + if( listeners_group->b_sublistener_removed ) + { + /* If a callback was removed, this gets called */ + bool valid_listener; + vlc_mutex_lock( &p_em->object_lock ); + valid_listener = group_contains_listener( listeners_group, listener_cached ); + vlc_mutex_unlock( &p_em->object_lock ); + if( !valid_listener ) + { + listener_cached++; + continue; + } + } + listener_cached->pf_callback( p_event, listener_cached->p_user_data ); listener_cached++; } @@ -201,6 +224,63 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, * Public libvlc functions */ +/************************************************************************** + * libvlc_event_type_name (public) : + * + * Get the char * name of an event type. + **************************************************************************/ +static const char event_type_to_name[][35] = +{ +#define EVENT(a) [a]=#a + EVENT(libvlc_MediaMetaChanged), + EVENT(libvlc_MediaSubItemAdded), + EVENT(libvlc_MediaDurationChanged), + EVENT(libvlc_MediaPreparsedChanged), + EVENT(libvlc_MediaFreed), + EVENT(libvlc_MediaStateChanged), + + EVENT(libvlc_MediaPlayerNothingSpecial), + EVENT(libvlc_MediaPlayerOpening), + EVENT(libvlc_MediaPlayerBuffering), + EVENT(libvlc_MediaPlayerPlaying), + EVENT(libvlc_MediaPlayerPaused), + EVENT(libvlc_MediaPlayerStopped), + EVENT(libvlc_MediaPlayerForward), + EVENT(libvlc_MediaPlayerBackward), + EVENT(libvlc_MediaPlayerEndReached), + EVENT(libvlc_MediaPlayerTimeChanged), + EVENT(libvlc_MediaPlayerPositionChanged), + EVENT(libvlc_MediaPlayerSeekableChanged), + EVENT(libvlc_MediaPlayerPausableChanged), + + EVENT(libvlc_MediaListItemAdded), + EVENT(libvlc_MediaListWillAddItem), + EVENT(libvlc_MediaListItemDeleted), + EVENT(libvlc_MediaListWillDeleteItem), + + EVENT(libvlc_MediaListViewItemAdded), + EVENT(libvlc_MediaListViewWillAddItem), + EVENT(libvlc_MediaListViewItemDeleted), + EVENT(libvlc_MediaListViewWillDeleteItem), + + EVENT(libvlc_MediaListPlayerPlayed), + EVENT(libvlc_MediaListPlayerNextItemSet), + EVENT(libvlc_MediaListPlayerStopped), + + EVENT(libvlc_MediaDiscovererStarted), + EVENT(libvlc_MediaDiscovererEnded) +#undef EVENT +}; + +static const char unkwown_event_name[] = "Unknown Event"; + +const char * libvlc_event_type_name( libvlc_event_type_t event_type ) +{ + if( event_type >= sizeof(event_type_to_name)/sizeof(event_type_to_name[0])) + return unkwown_event_name; + return event_type_to_name[event_type]; +} + /************************************************************************** * libvlc_event_attach (public) : * @@ -214,32 +294,36 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager, { libvlc_event_listeners_group_t * listeners_group; libvlc_event_listener_t * listener; + int i; + listener = malloc(sizeof(libvlc_event_listener_t)); if( !listener ) { libvlc_exception_raise( p_e, "No Memory left" ); return; } - + listener->event_type = event_type; listener->p_user_data = p_user_data; listener->pf_callback = pf_callback; vlc_mutex_lock( &p_event_manager->object_lock ); - FOREACH_ARRAY( listeners_group, p_event_manager->listeners_groups ) + for( i = 0; i < vlc_array_count(&p_event_manager->listeners_groups); i++ ) + { + listeners_group = vlc_array_item_at_index(&p_event_manager->listeners_groups, i); if( listeners_group->event_type == listener->event_type ) { - ARRAY_APPEND( listeners_group->listeners, listener ); + vlc_array_append( &listeners_group->listeners, listener ); vlc_mutex_unlock( &p_event_manager->object_lock ); return; } - FOREACH_END() + } vlc_mutex_unlock( &p_event_manager->object_lock ); free(listener); libvlc_exception_raise( p_e, "This object event manager doesn't know about '%s' events", - libvlc_event_type_name(a)); + libvlc_event_type_name(event_type)); } /************************************************************************** @@ -248,59 +332,48 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager, * Remove a callback for an event. **************************************************************************/ void libvlc_event_detach( libvlc_event_manager_t *p_event_manager, - libvlc_event_type_t event_type, - libvlc_callback_t pf_callback, - void *p_user_data, - libvlc_exception_t *p_e ) -{ - libvlc_event_detach_lock_state( p_event_manager, event_type, pf_callback, - p_user_data, libvlc_UnLocked, p_e ); -} - -/************************************************************************** - * libvlc_event_detach_no_lock (internal) : - * - * Remove a callback for an event. - **************************************************************************/ -void libvlc_event_detach_lock_state( libvlc_event_manager_t *p_event_manager, libvlc_event_type_t event_type, libvlc_callback_t pf_callback, void *p_user_data, - libvlc_lock_state_t lockstate, libvlc_exception_t *p_e ) { libvlc_event_listeners_group_t * listeners_group; libvlc_event_listener_t * listener; + int i, j; - if( lockstate == libvlc_UnLocked ) - vlc_mutex_lock( &p_event_manager->event_sending_lock ); + vlc_mutex_lock( &p_event_manager->event_sending_lock ); vlc_mutex_lock( &p_event_manager->object_lock ); - FOREACH_ARRAY( listeners_group, p_event_manager->listeners_groups ) + for( i = 0; i < vlc_array_count(&p_event_manager->listeners_groups); i++) + { + listeners_group = vlc_array_item_at_index(&p_event_manager->listeners_groups, i); if( listeners_group->event_type == event_type ) { - FOREACH_ARRAY( listener, listeners_group->listeners ) + for( j = 0; j < vlc_array_count(&listeners_group->listeners); j++) + { + listener = vlc_array_item_at_index(&listeners_group->listeners, j); if( listener->event_type == event_type && listener->pf_callback == pf_callback && listener->p_user_data == p_user_data ) { /* that's our listener */ + + /* Mark this group as edited so that libvlc_event_send + * will recheck what listener to call */ + listeners_group->b_sublistener_removed = false; + free( listener ); - ARRAY_REMOVE( listeners_group->listeners, - fe_idx /* This comes from the macro (and that's why - I hate macro) */ ); + vlc_array_remove( &listeners_group->listeners, j ); vlc_mutex_unlock( &p_event_manager->object_lock ); - if( lockstate == libvlc_UnLocked ) - vlc_mutex_unlock( &p_event_manager->event_sending_lock ); + vlc_mutex_unlock( &p_event_manager->event_sending_lock ); return; } - FOREACH_END() + } } - FOREACH_END() + } vlc_mutex_unlock( &p_event_manager->object_lock ); - if( lockstate == libvlc_UnLocked ) - vlc_mutex_unlock( &p_event_manager->event_sending_lock ); + vlc_mutex_unlock( &p_event_manager->event_sending_lock ); libvlc_exception_raise( p_e, - "This object event manager doesn't know about '%i,%p,%p' event observer", - event_type, pf_callback, p_user_data ); + "This object event manager doesn't know about '%s,%p,%p' event observer", + libvlc_event_type_name(event_type), pf_callback, p_user_data ); }