* Private functions
*/
-static int handle_event( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval,
- void *p_data )
-{
- /* This is thread safe, as the var_*Callback already provide the locking
- * facility for p_data */
- struct libvlc_callback_entry_t *entry = p_data;
- libvlc_event_t event;
-
- event.type = entry->i_event_type;
-
- if (event.type == libvlc_VolumeChanged)
- {
- if(!strcmp(psz_cmd, "intf-change"))
- {
- input_thread_t * p_input = (input_thread_t *)p_this;
- vlc_value_t val;
- var_Get( p_input, "time", &val );
-
- /* Only send event at a reasonable time precision (500ms) */
- /* (FIXME: this should be configurable) */
- if ((val.i_time % I64C(500000)) != 0)
- {
- /* Don't send this event */
- return VLC_SUCCESS;
- }
-
- event.u.input_position_changed.new_position = val.i_time;
- }
- else
- event.u.input_position_changed.new_position = newval.i_time;
-
- event.u.input_position_changed.new_position *= 1000LL;
- }
- else if (event.type == libvlc_InputPositionChanged)
- {
- event.u.volume_changed.new_volume = newval.i_int;
- }
-
- /* Call the client entry */
- entry->f_callback( entry->p_instance, &event, entry->p_user_data );
+/*
+ * Internal libvlc functions
+ */
- return VLC_SUCCESS;
+/**************************************************************************
+ * libvlc_event_init (internal) :
+ *
+ * initialization function.
+ **************************************************************************/
+void libvlc_event_init( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+{
+ /* Will certainly be used to install libvlc_instance event */
}
-/* Utility function: Object should be released by vlc_object_release afterwards */
-static input_thread_t * get_input(libvlc_instance_t * p_instance)
+/**************************************************************************
+ * libvlc_event_fini (internal) :
+ *
+ * finalization function.
+ **************************************************************************/
+void libvlc_event_fini( libvlc_instance_t *p_instance )
{
- libvlc_exception_t p_e_unused; /* FIXME: error checking here */
- libvlc_input_t * p_libvlc_input = libvlc_playlist_get_input( p_instance, &p_e_unused );
- input_thread_t * p_input;
-
- if( !p_libvlc_input )
- return NULL;
-
- p_input = libvlc_get_input_thread( p_libvlc_input, &p_e_unused );
-
- libvlc_input_free(p_libvlc_input);
-
- return p_input;
}
-static int install_input_event( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval,
- void *p_data )
+/**************************************************************************
+ * libvlc_event_manager_init (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_instance_t * p_instance = p_data;
- struct libvlc_callback_entry_list_t *p_listitem;
- input_thread_t * p_input = get_input( p_instance );
+ libvlc_event_manager_t * p_em;
- vlc_mutex_lock( &p_instance->instance_lock );
-
- p_listitem = p_instance->p_callback_list;
-
- for( ; p_listitem ; p_listitem = p_listitem->next )
+ p_em = malloc(sizeof( libvlc_event_manager_t ));
+ if( !p_em )
{
- if (p_listitem->elmt->i_event_type == libvlc_InputPositionChanged)
- {
- /* FIXME: here we shouldn't listen on intf-change, we have to provide
- * in vlc core a more accurate callback */
- var_AddCallback( p_input, "intf-change", handle_event, p_listitem->elmt );
- var_AddCallback( p_input, "time", handle_event, p_listitem->elmt );
- }
+ libvlc_exception_raise( p_e, "No Memory left" );
+ return NULL;
}
- vlc_mutex_unlock( &p_instance->instance_lock );
- vlc_object_release( p_input );
- return VLC_SUCCESS;
+ 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 );
+ return p_em;
}
-static inline void add_callback_to_list( struct libvlc_callback_entry_t *entry,
- struct libvlc_callback_entry_list_t **list )
+/**************************************************************************
+ * libvlc_event_manager_release (internal) :
+ *
+ * Init an object's event manager.
+ **************************************************************************/
+void libvlc_event_manager_release( libvlc_event_manager_t * p_em )
{
- struct libvlc_callback_entry_list_t *new_listitem;
-
- /* malloc/free strategy:
- * - alloc-ded in add_callback_entry
- * - free-ed by libvlc_event_remove_callback
- * - free-ed in libvlc_destroy threw libvlc_event_remove_callback
- * when entry is destroyed
- */
- new_listitem = malloc( sizeof( struct libvlc_callback_entry_list_t ) );
- new_listitem->elmt = entry;
- new_listitem->next = *list;
- new_listitem->prev = NULL;
-
- if(*list)
- (*list)->prev = new_listitem;
-
- *list = new_listitem;
+ libvlc_event_listeners_group_t * listeners_group;
+ libvlc_event_listener_t * listener;
+
+ 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 );
+
+ libvlc_release( p_em->p_libvlc_instance, NULL );
+ free( p_em );
}
-static int remove_variable_callback( libvlc_instance_t *p_instance,
- struct libvlc_callback_entry_t * p_entry )
+/**************************************************************************
+ * libvlc_event_manager_register_event_type (internal) :
+ *
+ * Init an object's event manager.
+ **************************************************************************/
+void libvlc_event_manager_register_event_type(
+ libvlc_event_manager_t * p_em,
+ libvlc_event_type_t event_type,
+ libvlc_exception_t * p_e )
{
- input_thread_t * p_input = get_input( p_instance );
- int res = VLC_SUCCESS;
-
- /* Note: Appropriate lock should be held by the caller */
-
- switch ( p_entry->i_event_type )
+ libvlc_event_listeners_group_t * listeners_group;
+ listeners_group = malloc(sizeof(libvlc_event_listeners_group_t));
+ if( !listeners_group )
{
- case libvlc_VolumeChanged:
- res = var_DelCallback( p_instance->p_libvlc_int, "volume-change",
- handle_event, p_entry );
- break;
- case libvlc_InputPositionChanged:
- /* We may not be deleting the right p_input callback, in this case this
- * will be a no-op */
- var_DelCallback( p_input, "intf-change", handle_event, p_entry );
- var_DelCallback( p_input, "position", handle_event, p_entry );
- break;
+ libvlc_exception_raise( p_e, "No Memory left" );
+ return;
}
-
- if (p_input)
- vlc_object_release( p_input );
- return res;
+ listeners_group->event_type = event_type;
+ ARRAY_INIT( listeners_group->listeners );
+
+ vlc_mutex_lock( &p_em->object_lock );
+ ARRAY_APPEND( p_em->listeners_groups, listeners_group );
+ vlc_mutex_unlock( &p_em->object_lock );
}
-/*
- * Internal libvlc functions
- */
-void libvlc_event_init( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+/**************************************************************************
+ * libvlc_event_send (internal) :
+ *
+ * Send a callback.
+ **************************************************************************/
+void libvlc_event_send( libvlc_event_manager_t * p_em,
+ libvlc_event_t * p_event )
{
- playlist_t *p_playlist = p_instance->p_libvlc_int->p_playlist;
+ libvlc_event_listeners_group_t * listeners_group;
+ libvlc_event_listener_t * listener_cached;
+ libvlc_event_listener_t * listener;
+ libvlc_event_listener_t * array_listeners_cached = NULL;
+ int i, i_cached_listeners = 0;
- if( !p_playlist )
- RAISEVOID ("Can't listen to input event");
+ /* Fill event with the sending object now */
+ p_event->p_obj = p_em->p_obj;
- /* Install a Callback for input changes, so
- * so we can track input event */
- var_AddCallback( p_playlist, "playlist-current",
- install_input_event, p_instance );
-}
+ /* Here a read/write lock would be nice */
-void libvlc_event_fini( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
-{
- playlist_t *p_playlist = p_instance->p_libvlc_int->p_playlist;
- libvlc_exception_t p_e_unused;
+ vlc_mutex_lock( &p_em->object_lock );
+ FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
+ if( listeners_group->event_type == p_event->type )
+ {
+ if( listeners_group->listeners.i_size <= 0 )
+ break;
- libvlc_event_remove_all_callbacks( p_instance, &p_e_unused );
+ /* Cache a copy of the listener to avoid locking issues */
+ i_cached_listeners = listeners_group->listeners.i_size;
+ 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;
+ }
- if( !p_playlist )
- RAISEVOID ("Can't unregister input events");
+ listener_cached = array_listeners_cached;
+ FOREACH_ARRAY( listener, listeners_group->listeners )
+ memcpy( listener_cached, listener, sizeof(libvlc_event_listener_t));
+ listener_cached++;
+ FOREACH_END()
+ break;
+ }
+ FOREACH_END()
+
+ 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;
+ for( i = 0; i < i_cached_listeners; i++ )
+ {
+ listener_cached->pf_callback( p_event, listener_cached->p_user_data );
+ listener_cached++;
+ }
+ vlc_mutex_unlock( &p_em->event_sending_lock );
- var_DelCallback( p_playlist, "playlist-current",
- install_input_event, p_instance );
+ free( array_listeners_cached );
}
/*
* Public libvlc functions
*/
-void libvlc_event_add_callback( libvlc_instance_t *p_instance,
- libvlc_event_type_t i_event_type,
- libvlc_callback_t f_callback,
- void *user_data,
- libvlc_exception_t *p_e )
+/**************************************************************************
+ * libvlc_event_type_name (public) :
+ *
+ * Get the char * name of an event type.
+ **************************************************************************/
+static const char * event_type_to_name[] =
{
- struct libvlc_callback_entry_t *entry;
- vlc_value_t unused1, unused2;
- int res = VLC_SUCCESS;
-
- if ( !f_callback )
- RAISEVOID (" Callback function is null ");
-
- /* malloc/free strategy:
- * - alloc-ded in libvlc_event_add_callback
- * - free-ed by libvlc_event_add_callback on error
- * - free-ed by libvlc_event_remove_callback
- * - free-ed in libvlc_destroy threw libvlc_event_remove_callback
- * when entry is destroyed
- */
- entry = malloc( sizeof( struct libvlc_callback_entry_t ) );
- entry->f_callback = f_callback;
- entry->i_event_type = i_event_type;
- entry->p_user_data = user_data;
-
- switch ( i_event_type )
- {
- case libvlc_VolumeChanged:
- res = var_AddCallback( p_instance->p_libvlc_int, "volume-change",
- handle_event, entry );
- break;
- case libvlc_InputPositionChanged:
- install_input_event( NULL, NULL, unused1, unused2, p_instance);
- break;
- default:
- free( entry );
- RAISEVOID( "Unsupported event." );
- }
-
- if (res != VLC_SUCCESS)
- {
- free ( entry );
- RAISEVOID("Internal callback registration was not successful. Callback not registered.");
- }
-
- vlc_mutex_lock( &p_instance->instance_lock );
- add_callback_to_list( entry, &p_instance->p_callback_list );
- vlc_mutex_unlock( &p_instance->instance_lock );
-
- return;
+#define EVENT(a) [a]=#a
+ EVENT(libvlc_MediaDescriptorMetaChanged),
+ EVENT(libvlc_MediaDescriptorSubItemAdded),
+ EVENT(libvlc_MediaDescriptorDurationChanged),
+ EVENT(libvlc_MediaDescriptorPreparsedChanged),
+ EVENT(libvlc_MediaDescriptorFreed),
+
+ EVENT(libvlc_MediaInstancePlayed),
+ EVENT(libvlc_MediaInstancePaused),
+ EVENT(libvlc_MediaInstanceReachedEnd),
+ 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)
+#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 strdup(event_type_to_name[event_type]);
}
-void libvlc_event_remove_all_callbacks( libvlc_instance_t *p_instance,
- libvlc_exception_t *p_e )
+/**************************************************************************
+ * 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 )
{
- struct libvlc_callback_entry_list_t *p_listitem;
-
- vlc_mutex_lock( &p_instance->instance_lock );
-
- p_listitem = p_instance->p_callback_list;
-
- while( p_listitem )
+ libvlc_event_listeners_group_t * listeners_group;
+ libvlc_event_listener_t * listener;
+ listener = malloc(sizeof(libvlc_event_listener_t));
+ if( !listener )
{
- remove_variable_callback( p_instance, p_listitem->elmt ); /* FIXME: We could warn on error */
- p_listitem = p_listitem->next;
-
+ libvlc_exception_raise( p_e, "No Memory left" );
+ return;
}
- p_instance->p_callback_list = NULL;
+
+ 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 )
+ if( listeners_group->event_type == listener->event_type )
+ {
+ 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 );
- vlc_mutex_unlock( &p_instance->instance_lock );
+ free(listener);
+ libvlc_exception_raise( p_e,
+ "This object event manager doesn't know about '%s' events",
+ libvlc_event_type_name(event_type));
}
-void libvlc_event_remove_callback( libvlc_instance_t *p_instance,
- libvlc_event_type_t i_event_type,
- libvlc_callback_t f_callback,
- void *p_user_data,
- libvlc_exception_t *p_e )
+/**************************************************************************
+ * libvlc_event_detach (public) :
+ *
+ * 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 )
{
- struct libvlc_callback_entry_list_t *p_listitem;
-
- vlc_mutex_lock( &p_instance->instance_lock );
-
- p_listitem = p_instance->p_callback_list;
+ libvlc_event_detach_lock_state( p_event_manager, event_type, pf_callback,
+ p_user_data, libvlc_UnLocked, p_e );
+}
- while( p_listitem )
- {
- if( p_listitem->elmt->f_callback == f_callback
- && ( p_listitem->elmt->i_event_type == i_event_type )
- && ( p_listitem->elmt->p_user_data == p_user_data )
-
- )
+/**************************************************************************
+ * 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;
+
+ if( lockstate == libvlc_UnLocked )
+ 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 )
+ if( listeners_group->event_type == event_type )
{
- remove_variable_callback( p_instance, p_listitem->elmt ); /* FIXME: We should warn on error */
-
- if( p_listitem->prev )
- p_listitem->prev->next = p_listitem->next;
- else
- p_instance->p_callback_list = p_listitem->next;
-
-
- p_listitem->next->prev = p_listitem->prev;
-
- free( p_listitem->elmt );
-
- free( p_listitem );
- break;
+ FOREACH_ARRAY( listener, listeners_group->listeners )
+ if( listener->event_type == event_type &&
+ listener->pf_callback == pf_callback &&
+ listener->p_user_data == p_user_data )
+ {
+ /* that's our listener */
+ free( listener );
+ ARRAY_REMOVE( listeners_group->listeners,
+ fe_idx /* This comes from the macro (and that's why
+ I hate macro) */ );
+ vlc_mutex_unlock( &p_event_manager->object_lock );
+ if( lockstate == libvlc_UnLocked )
+ vlc_mutex_unlock( &p_event_manager->event_sending_lock );
+ return;
+ }
+ FOREACH_END()
}
-
- p_listitem = p_listitem->next;
- }
- vlc_mutex_unlock( &p_instance->instance_lock );
+ FOREACH_END()
+ vlc_mutex_unlock( &p_event_manager->object_lock );
+ if( lockstate == libvlc_UnLocked )
+ 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 );
}