X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcontrol%2Fevent.c;h=2ce0a23970d5bf8eb25fba5993bf02efd13835d3;hb=6deae4bd4b3482b755e96a78a1e7b1690865bf9e;hp=2482faf7d6d0596d46faff71fbdff50d4cf404d4;hpb=8cfa47d2bf33da6f1b65a07922be58ae9dfeed9f;p=vlc diff --git a/src/control/event.c b/src/control/event.c index 2482faf7d6..2ce0a23970 100644 --- a/src/control/event.c +++ b/src/control/event.c @@ -1,7 +1,7 @@ /***************************************************************************** * event.c: New libvlc event control API ***************************************************************************** - * Copyright (C) 2007 the VideoLAN team + * Copyright (C) 2007-2010 the VideoLAN team * $Id $ * * Authors: Filippo Carone @@ -17,30 +17,35 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "libvlc_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#define LIBVLC_EVENT_TYPES_KEEP_DEFINE #include -#include +#include "libvlc_internal.h" +#include "event_internal.h" +#include +#include + +typedef struct libvlc_event_listeners_group_t +{ + libvlc_event_type_t event_type; + vlc_array_t listeners; + bool b_sublistener_removed; +} libvlc_event_listeners_group_t; /* * Private functions */ -static vlc_bool_t -listeners_are_equal( libvlc_event_listener_t * listener1, - libvlc_event_listener_t * listener2 ) -{ - return listener1->event_type == listener2->event_type && - listener1->pf_callback == listener2->pf_callback && - listener1->p_user_data == listener2->p_user_data; -} - -static vlc_bool_t +static bool group_contains_listener( libvlc_event_listeners_group_t * group, libvlc_event_listener_t * searched_listener ) { @@ -48,9 +53,9 @@ group_contains_listener( libvlc_event_listeners_group_t * group, 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 VLC_TRUE; + return true; } - return VLC_FALSE; + return false; } /* @@ -58,63 +63,46 @@ group_contains_listener( libvlc_event_listeners_group_t * group, */ /************************************************************************** - * libvlc_event_init (internal) : - * - * initialization function. - **************************************************************************/ -void libvlc_event_init( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) -{ - (void)p_instance;(void)p_e; - /* Will certainly be used to install libvlc_instance event */ -} - -/************************************************************************** - * libvlc_event_fini (internal) : - * - * finalization function. - **************************************************************************/ -void libvlc_event_fini( libvlc_instance_t *p_instance ) -{ - (void)p_instance; -} - -/************************************************************************** - * libvlc_event_manager_init (internal) : + * libvlc_event_manager_new (internal) : * * Init an object's event manager. **************************************************************************/ libvlc_event_manager_t * -libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst, - libvlc_exception_t *p_e ) +libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst ) { libvlc_event_manager_t * p_em; p_em = malloc(sizeof( libvlc_event_manager_t )); if( !p_em ) { - libvlc_exception_raise( p_e, "No Memory left" ); + libvlc_printerr( "Not enough memory" ); return NULL; } p_em->p_obj = p_obj; + p_em->p_obj = p_obj; + p_em->async_event_queue = NULL; p_em->p_libvlc_instance = p_libvlc_inst; + libvlc_retain( p_libvlc_inst ); vlc_array_init( &p_em->listeners_groups ); - vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock ); - vlc_mutex_init_recursive( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock ); + vlc_mutex_init( &p_em->object_lock ); + vlc_mutex_init_recursive( &p_em->event_sending_lock ); return p_em; } /************************************************************************** * libvlc_event_manager_release (internal) : * - * Init an object's event manager. + * Release an object's event manager. **************************************************************************/ void libvlc_event_manager_release( libvlc_event_manager_t * p_em ) { libvlc_event_listeners_group_t * p_lg; int i,j ; + libvlc_event_async_fini(p_em); + vlc_mutex_destroy( &p_em->event_sending_lock ); vlc_mutex_destroy( &p_em->object_lock ); @@ -123,7 +111,7 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em ) 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_em->listeners_groups, i ) ); + free( vlc_array_item_at_index( &p_lg->listeners, j ) ); vlc_array_clear( &p_lg->listeners ); free( p_lg ); @@ -140,17 +128,10 @@ void libvlc_event_manager_release( libvlc_event_manager_t * p_em ) **************************************************************************/ void libvlc_event_manager_register_event_type( libvlc_event_manager_t * p_em, - libvlc_event_type_t event_type, - libvlc_exception_t * p_e ) + libvlc_event_type_t event_type ) { libvlc_event_listeners_group_t * listeners_group; - listeners_group = malloc(sizeof(libvlc_event_listeners_group_t)); - if( !listeners_group ) - { - libvlc_exception_raise( p_e, "No Memory left" ); - return; - } - + listeners_group = xmalloc(sizeof(libvlc_event_listeners_group_t)); listeners_group->event_type = event_type; vlc_array_init( &listeners_group->listeners ); @@ -167,7 +148,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; @@ -187,13 +168,15 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, if( vlc_array_count( &listeners_group->listeners ) <= 0 ) break; - /* Cache a copy of the listener to avoid locking issues */ + /* Cache a copy of the listener to avoid locking issues, + * and allow that edition of listeners during callbacks will garantee immediate effect. */ 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 ) { - printf( "Can't alloc memory in libvlc_event_send" ); - break; + vlc_mutex_unlock( &p_em->object_lock ); + fprintf(stderr, "Can't alloc memory in libvlc_event_send" ); + return; } listener_cached = array_listeners_cached; @@ -210,6 +193,7 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, if( !listeners_group ) { free( array_listeners_cached ); + vlc_mutex_unlock( &p_em->object_lock ); return; } @@ -217,25 +201,35 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, vlc_mutex_lock( &p_em->event_sending_lock ); listener_cached = array_listeners_cached; - listeners_group->b_sublistener_removed = VLC_FALSE; + listeners_group->b_sublistener_removed = false; for( i = 0; i < i_cached_listeners; i++ ) { - if( listeners_group->b_sublistener_removed ) + if(listener_cached->is_asynchronous) + { + /* The listener wants not to block the emitter during event callback */ + libvlc_event_async_dispatch(p_em, listener_cached, p_event); + } + else { - /* If a callback was removed, this gets called */ - vlc_bool_t 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 ) + /* The listener wants to block the emitter during event callback */ + + listener_cached->pf_callback( p_event, listener_cached->p_user_data ); + listener_cached++; + + if( listeners_group->b_sublistener_removed ) { - listener_cached++; - continue; + /* 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++; } vlc_mutex_unlock( &p_em->event_sending_lock ); @@ -246,79 +240,108 @@ 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[] = +#define DEF( a ) { libvlc_##a, #a, }, + +typedef struct { -#define EVENT(a) [a]=#a - EVENT(libvlc_MediaDescriptorMetaChanged), - EVENT(libvlc_MediaDescriptorSubItemAdded), - EVENT(libvlc_MediaDescriptorDurationChanged), - EVENT(libvlc_MediaDescriptorPreparsedChanged), - EVENT(libvlc_MediaDescriptorFreed), - EVENT(libvlc_MediaDescriptorStateChanged), - - EVENT(libvlc_MediaInstancePlayed), - EVENT(libvlc_MediaInstancePaused), - EVENT(libvlc_MediaInstanceReachedEnd), - EVENT(libvlc_MediaInstanceTimeChanged), - EVENT(libvlc_MediaInstancePositionChanged), - - 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 + int type; + const char name[40]; +} event_name_t; + +static const event_name_t event_list[] = { + DEF(MediaMetaChanged) + DEF(MediaSubItemAdded) + DEF(MediaDurationChanged) + DEF(MediaParsedChanged) + DEF(MediaFreed) + DEF(MediaStateChanged) + + DEF(MediaPlayerMediaChanged) + DEF(MediaPlayerNothingSpecial) + DEF(MediaPlayerOpening) + DEF(MediaPlayerBuffering) + DEF(MediaPlayerPlaying) + DEF(MediaPlayerPaused) + DEF(MediaPlayerStopped) + DEF(MediaPlayerForward) + DEF(MediaPlayerBackward) + DEF(MediaPlayerEndReached) + DEF(MediaPlayerEncounteredError) + DEF(MediaPlayerTimeChanged) + DEF(MediaPlayerPositionChanged) + DEF(MediaPlayerSeekableChanged) + DEF(MediaPlayerPausableChanged) + DEF(MediaPlayerTitleChanged) + DEF(MediaPlayerSnapshotTaken) + DEF(MediaPlayerLengthChanged) + + DEF(MediaListItemAdded) + DEF(MediaListWillAddItem) + DEF(MediaListItemDeleted) + DEF(MediaListWillDeleteItem) + + DEF(MediaListViewItemAdded) + DEF(MediaListViewWillAddItem) + DEF(MediaListViewItemDeleted) + DEF(MediaListViewWillDeleteItem) + + DEF(MediaListPlayerPlayed) + DEF(MediaListPlayerNextItemSet) + DEF(MediaListPlayerStopped) + + DEF(MediaDiscovererStarted) + DEF(MediaDiscovererEnded) + + DEF(VlmMediaAdded) + DEF(VlmMediaRemoved) + DEF(VlmMediaChanged) + DEF(VlmMediaInstanceStarted) + DEF(VlmMediaInstanceStopped) + DEF(VlmMediaInstanceStatusInit) + DEF(VlmMediaInstanceStatusOpening) }; -static const char * unkwown_event_name = "Unknown Event"; +#undef DEF -const char * libvlc_event_type_name( libvlc_event_type_t event_type ) +static const char unknown_event_name[] = "Unknown Event"; + +static int evcmp( const void *a, const void *b ) { - 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]; + return (*(const int *)a) - ((event_name_t *)b)->type; +} + +const char * libvlc_event_type_name( int event_type ) +{ + const event_name_t *p; + + p = bsearch( &event_type, event_list, + sizeof(event_list)/sizeof(event_list[0]), sizeof(*p), + evcmp ); + return p ? p->name : unknown_event_name; } /************************************************************************** - * libvlc_event_attach (public) : + * event_attach (internal) : * * Add a callback for an event. **************************************************************************/ -void libvlc_event_attach( 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 ) +static +int event_attach( libvlc_event_manager_t * p_event_manager, + libvlc_event_type_t event_type, + libvlc_callback_t pf_callback, void *p_user_data, + bool is_asynchronous ) { 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; - } - + if( unlikely(listener == NULL) ) + return ENOMEM; + listener->event_type = event_type; listener->p_user_data = p_user_data; listener->pf_callback = pf_callback; + listener->is_asynchronous = is_asynchronous; vlc_mutex_lock( &p_event_manager->object_lock ); for( i = 0; i < vlc_array_count(&p_event_manager->listeners_groups); i++ ) @@ -328,79 +351,100 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager, { vlc_array_append( &listeners_group->listeners, listener ); vlc_mutex_unlock( &p_event_manager->object_lock ); - return; + return 0; } } 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(event_type)); + fprintf( stderr, "This object event manager doesn't know about '%s' events", + libvlc_event_type_name(event_type) ); + assert(0); + return -1; } /************************************************************************** - * libvlc_event_detach (public) : + * libvlc_event_attach (public) : * - * Remove a callback for an event. + * Add 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 ) +int libvlc_event_attach( libvlc_event_manager_t * p_event_manager, + libvlc_event_type_t event_type, + libvlc_callback_t pf_callback, + void *p_user_data ) +{ + return event_attach(p_event_manager, event_type, pf_callback, p_user_data, + false /* synchronous */); +} + +/************************************************************************** + * libvlc_event_attach (public) : + * + * Add a callback for an event. + **************************************************************************/ +void libvlc_event_attach_async( libvlc_event_manager_t * p_event_manager, + libvlc_event_type_t event_type, + libvlc_callback_t pf_callback, + void *p_user_data ) { - libvlc_event_detach_lock_state( p_event_manager, event_type, pf_callback, - p_user_data, libvlc_UnLocked, p_e ); + event_attach(p_event_manager, event_type, pf_callback, p_user_data, + true /* asynchronous */); } /************************************************************************** - * libvlc_event_detach_no_lock (internal) : + * libvlc_event_detach (public) : * * Remove a callback for an event. **************************************************************************/ -void libvlc_event_detach_lock_state( libvlc_event_manager_t *p_event_manager, +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_lock_state_t lockstate, - libvlc_exception_t *p_e ) + void *p_user_data ) { libvlc_event_listeners_group_t * listeners_group; libvlc_event_listener_t * listener; - int i; + int i, j; + bool found = false; - 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 ); 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 ) { - for( i = 0; i < vlc_array_count(&listeners_group->listeners); i++) + for( j = 0; j < vlc_array_count(&listeners_group->listeners); j++) { - listener = vlc_array_item_at_index(&listeners_group->listeners, i); + 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 ); - vlc_array_remove( &listeners_group->listeners, i ); - vlc_mutex_unlock( &p_event_manager->object_lock ); - if( lockstate == libvlc_UnLocked ) - vlc_mutex_unlock( &p_event_manager->event_sending_lock ); - return; + vlc_array_remove( &listeners_group->listeners, j ); + found = true; + break; } } } } 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 ); + + /* Now make sure any pending async event won't get fired after that point */ + libvlc_event_listener_t listener_to_remove; + listener_to_remove.event_type = event_type; + listener_to_remove.pf_callback = pf_callback; + listener_to_remove.p_user_data = p_user_data; + listener_to_remove.is_asynchronous = true; + + libvlc_event_async_ensure_listener_removal(p_event_manager, &listener_to_remove); - libvlc_exception_raise( p_e, - "This object event manager doesn't know about '%s,%p,%p' event observer", - libvlc_event_type_name(event_type), pf_callback, p_user_data ); + assert(found); }