Commit ec8b3b2e authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

control/media_list_view.c: Properly forward item added event to subclasses,...

control/media_list_view.c: Properly forward item added event to subclasses, and  properly unregister events.
parent 3c69a107
...@@ -39,44 +39,90 @@ ...@@ -39,44 +39,90 @@
* Private functions * Private functions
*/ */
static void static void
media_list_item_added( const libvlc_event_t * p_event, void * p_user_data );
static void
media_list_item_removed( const libvlc_event_t * p_event, void * p_user_data ); media_list_item_removed( const libvlc_event_t * p_event, void * p_user_data );
static void
media_list_subitem_added( const libvlc_event_t * p_event, void * p_user_data );
static void static void
media_list_item_added( const libvlc_event_t * p_event, void * p_user_data ) install_md_listener( libvlc_media_list_view_t * p_mlv,
libvlc_media_descriptor_t * p_md)
{ {
libvlc_media_list_view_t * p_mlv = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
libvlc_media_list_t * p_mlist; libvlc_media_list_t * p_mlist;
if((p_mlist = libvlc_media_descriptor_subitems( p_md, NULL ))) if((p_mlist = libvlc_media_descriptor_subitems( p_md, NULL )))
{ {
libvlc_event_attach( p_mlist->p_event_manager, libvlc_media_list_lock( p_mlist );
libvlc_MediaListItemAdded, int i, count = libvlc_media_list_count( p_mlist, NULL );
media_list_item_added, p_mlv, NULL ); for( i = 0; i < count; i++)
libvlc_event_attach( p_mlist->p_event_manager, {
libvlc_MediaListItemDeleted, libvlc_media_descriptor_t * p_submd;
media_list_item_removed, p_mlv, NULL ); p_submd = libvlc_media_list_item_at_index( p_mlist, i, NULL );
install_md_listener( p_mlv, p_submd );
libvlc_media_descriptor_release( p_submd );
}
libvlc_media_list_unlock( p_mlist );
libvlc_media_list_release( p_mlist );
} }
if( p_mlv->pf_ml_item_added ) p_mlv->pf_ml_item_added( p_event, p_mlv ); libvlc_event_attach( p_md->p_event_manager,
libvlc_MediaDescriptorSubItemAdded,
media_list_subitem_added, p_mlv, NULL );
} }
static void static void
media_list_item_removed( const libvlc_event_t * p_event, void * p_user_data ) uninstall_md_listener( libvlc_media_list_view_t * p_mlv,
libvlc_media_descriptor_t * p_md)
{ {
libvlc_media_list_view_t * p_mlv = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
libvlc_media_list_t * p_mlist; libvlc_media_list_t * p_mlist;
libvlc_event_detach( p_md->p_event_manager,
libvlc_MediaDescriptorSubItemAdded,
media_list_subitem_added, p_mlv, NULL );
if((p_mlist = libvlc_media_descriptor_subitems( p_md, NULL ))) if((p_mlist = libvlc_media_descriptor_subitems( p_md, NULL )))
{ {
libvlc_event_attach( p_mlist->p_event_manager, libvlc_media_list_lock( p_mlist );
libvlc_MediaListItemAdded, int i, count = libvlc_media_list_count( p_mlist, NULL );
media_list_item_added, p_mlv, NULL ); for( i = 0; i < count; i++)
libvlc_event_attach( p_mlist->p_event_manager, {
libvlc_MediaListItemDeleted, libvlc_media_descriptor_t * p_submd;
media_list_item_removed, p_mlv, NULL ); p_submd = libvlc_media_list_item_at_index( p_mlist,i, NULL );
uninstall_md_listener( p_mlv, p_submd );
libvlc_media_descriptor_release( p_submd );
}
libvlc_media_list_unlock( p_mlist );
libvlc_media_list_release( p_mlist );
} }
}
static void
media_list_item_added( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_media_list_view_t * p_mlv = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
install_md_listener( p_mlv, p_md );
if( p_mlv->pf_ml_item_added ) p_mlv->pf_ml_item_added( p_event, p_mlv );
}
static void
media_list_item_removed( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_media_list_view_t * p_mlv = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
uninstall_md_listener( p_mlv, p_md );
if( p_mlv->pf_ml_item_removed ) p_mlv->pf_ml_item_removed( p_event, p_mlv ); if( p_mlv->pf_ml_item_removed ) p_mlv->pf_ml_item_removed( p_event, p_mlv );
} }
static void
media_list_subitem_added( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_event_t added_event;
libvlc_media_list_view_t * p_mlv = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_descriptor_subitem_added.new_child;
install_md_listener( p_mlv, p_md );
added_event.u.media_list_item_added.item = p_md;
added_event.u.media_list_item_added.index = 0;
if( p_mlv->pf_ml_item_added ) p_mlv->pf_ml_item_added( &added_event, p_mlv );
}
/* /*
* LibVLC Internal functions * LibVLC Internal functions
...@@ -92,12 +138,22 @@ libvlc_media_list_view_set_ml_notification_callback( ...@@ -92,12 +138,22 @@ libvlc_media_list_view_set_ml_notification_callback(
{ {
p_mlv->pf_ml_item_added = item_added; p_mlv->pf_ml_item_added = item_added;
p_mlv->pf_ml_item_removed = item_removed; p_mlv->pf_ml_item_removed = item_removed;
libvlc_media_list_lock( p_mlv->p_mlist );
libvlc_event_attach( p_mlv->p_mlist->p_event_manager, libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
libvlc_MediaListItemAdded, libvlc_MediaListItemAdded,
media_list_item_added, p_mlv, NULL ); media_list_item_added, p_mlv, NULL );
libvlc_event_attach( p_mlv->p_mlist->p_event_manager, libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
libvlc_MediaListItemDeleted, libvlc_MediaListItemDeleted,
media_list_item_removed, p_mlv, NULL ); media_list_item_removed, p_mlv, NULL );
int i, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
for( i = 0; i < count; i++)
{
libvlc_media_descriptor_t * p_md;
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, NULL );
install_md_listener( p_mlv, p_md );
libvlc_media_descriptor_release( p_md );
}
libvlc_media_list_unlock( p_mlv->p_mlist );
} }
/************************************************************************** /**************************************************************************
...@@ -258,21 +314,29 @@ libvlc_media_list_view_release( libvlc_media_list_view_t * p_mlv ) ...@@ -258,21 +314,29 @@ libvlc_media_list_view_release( libvlc_media_list_view_t * p_mlv )
vlc_mutex_unlock( &p_mlv->object_lock ); vlc_mutex_unlock( &p_mlv->object_lock );
/* Refcount null, time to free */ /* Refcount null, time to free */
libvlc_media_list_lock( p_mlv->p_mlist );
if( p_mlv->pf_ml_item_added ) if( p_mlv->pf_ml_item_added )
{ {
libvlc_event_detach( p_mlv->p_mlist->p_event_manager, libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
libvlc_MediaListItemAdded, libvlc_MediaListItemAdded,
(void (*)(const libvlc_event_t *, void*))p_mlv->pf_ml_item_added, p_mlv, NULL ); media_list_item_added, p_mlv, NULL );
/* XXX: descend the whole tree and remove observer */
} }
if( p_mlv->pf_ml_item_removed ) if( p_mlv->pf_ml_item_removed )
{ {
libvlc_event_detach( p_mlv->p_mlist->p_event_manager, libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
libvlc_MediaListItemDeleted, libvlc_MediaListItemDeleted,
(void (*)(const libvlc_event_t *, void*))p_mlv->pf_ml_item_removed, p_mlv, NULL ); media_list_item_removed, p_mlv, NULL );
/* XXX: descend the whole tree and remove observer */ }
int i, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
for( i = 0; i < count; i++)
{
libvlc_media_descriptor_t * p_md;
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, NULL );
uninstall_md_listener( p_mlv, p_md );
libvlc_media_descriptor_release( p_md );
} }
libvlc_media_list_unlock( p_mlv->p_mlist );
libvlc_event_manager_release( p_mlv->p_event_manager ); libvlc_event_manager_release( p_mlv->p_event_manager );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment