X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fevent.c;h=af7f9aa654e948d7c26a8e40ed235ab664cfaec5;hb=848c006a787a468ebc8bc68960e01cfd812d8d6f;hp=57cfc6697f54abd52c5f42eb2642144700c0385c;hpb=6da90a1716250d282f16dc6bc9dacec5b9514caf;p=vlc diff --git a/src/control/event.c b/src/control/event.c index 57cfc6697f..af7f9aa654 100644 --- a/src/control/event.c +++ b/src/control/event.c @@ -17,29 +17,33 @@ * 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 + +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 bool -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 bool group_contains_listener( libvlc_event_listeners_group_t * group, libvlc_event_listener_t * searched_listener ) @@ -58,28 +62,7 @@ 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. **************************************************************************/ @@ -92,29 +75,35 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst, p_em = malloc(sizeof( libvlc_event_manager_t )); if( !p_em ) { - libvlc_exception_raise( p_e, "No Memory left" ); + libvlc_exception_raise( p_e ); + 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_em->object_lock ); - vlc_mutex_init_recursive( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_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 +112,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 ); @@ -147,7 +136,8 @@ void libvlc_event_manager_register_event_type( listeners_group = malloc(sizeof(libvlc_event_listeners_group_t)); if( !listeners_group ) { - libvlc_exception_raise( p_e, "No Memory left" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Not enough memory" ); return; } @@ -187,13 +177,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 +202,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; } @@ -220,22 +213,32 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, 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) { - /* 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 ) + /* The listener wants not to block the emitter during event callback */ + libvlc_event_async_dispatch(p_em, listener_cached, p_event); + } + else + { + /* 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 ); @@ -251,76 +254,52 @@ void libvlc_event_send( libvlc_event_manager_t * p_em, * * Get the char * name of an event type. **************************************************************************/ -static const char * event_type_to_name[] = +static const char event_type_to_name[][libvlc_num_event_types] = { -#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_MediaPlayerPlayed), - EVENT(libvlc_MediaPlayerPaused), - EVENT(libvlc_MediaPlayerEndReached), - EVENT(libvlc_MediaPlayerStopped), - EVENT(libvlc_MediaPlayerTimeChanged), - EVENT(libvlc_MediaPlayerPositionChanged), - - 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 +#define DEF(a) [libvlc_##a]=#a + DEFINE_LIBVLC_EVENT_TYPES +#undef DEF }; -static const char * unkwown_event_name = "Unknown Event"; + +static const char unknown_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; + if( event_type >= libvlc_num_event_types ) + return unknown_event_name; return event_type_to_name[event_type]; } /************************************************************************** - * 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 +void 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_exception_t *p_e ) { 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" ); + libvlc_exception_raise( p_e ); + libvlc_printerr( "Not enough memory" ); return; } - + 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++ ) { @@ -333,11 +312,39 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager, } } 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); +} + +/************************************************************************** + * libvlc_event_attach (public) : + * + * 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 ) +{ + event_attach(p_event_manager, event_type, pf_callback, p_user_data, false /* synchronous */, p_e); +} + +/************************************************************************** + * 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_exception_t *p_e ) +{ + event_attach(p_event_manager, event_type, pf_callback, p_user_data, true /* asynchronous */, p_e); } /************************************************************************** @@ -354,7 +361,8 @@ void libvlc_event_detach( libvlc_event_manager_t *p_event_manager, libvlc_event_listeners_group_t * listeners_group; libvlc_event_listener_t * listener; int i, j; - + bool found = false; + 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++) @@ -370,16 +378,15 @@ void libvlc_event_detach( libvlc_event_manager_t *p_event_manager, 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, j ); - vlc_mutex_unlock( &p_event_manager->object_lock ); - vlc_mutex_unlock( &p_event_manager->event_sending_lock ); - return; + found = true; + break; } } } @@ -387,7 +394,14 @@ void libvlc_event_detach( libvlc_event_manager_t *p_event_manager, vlc_mutex_unlock( &p_event_manager->object_lock ); vlc_mutex_unlock( &p_event_manager->event_sending_lock ); - 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 ); + /* 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); + + assert(found); }