* Private functions
*/
-
/*
* Internal libvlc functions
*/
*
* finalization function.
**************************************************************************/
-void libvlc_event_fini( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
+void libvlc_event_fini( libvlc_instance_t *p_instance )
{
}
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;
}
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 );
}
/* Fill event with the sending object now */
p_event->p_obj = p_em->p_obj;
+ /* Here a read/write lock would be nice */
+
vlc_mutex_lock( &p_em->object_lock );
FOREACH_ARRAY( listeners_group, p_em->listeners_groups )
if( listeners_group->event_type == p_event->type )
listener_cached = array_listeners_cached;
FOREACH_ARRAY( listener, listeners_group->listeners )
memcpy( listener_cached, listener, sizeof(libvlc_event_listener_t));
- listener_cached += 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 += sizeof(libvlc_event_listener_t) ;
+ listener_cached++;
}
+ vlc_mutex_unlock( &p_em->event_sending_lock );
+
free( array_listeners_cached );
}
* Public libvlc functions
*/
+/**************************************************************************
+ * libvlc_event_type_name (public) :
+ *
+ * Get the char * name of an event type.
+ **************************************************************************/
+static const char * event_type_to_name[] =
+{
+#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]);
+}
+
/**************************************************************************
* libvlc_event_attach (public) :
*
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;
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));
}
/**************************************************************************
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;
+ 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 )
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()
}
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 '%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 );
}
projects / vlc / blobdiff