Skip to content

V
vlc-2-2
Commit 48586f51 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

media_list.c: Handle item addition and removal in the flat list. Also Get the... 

media_list.c: Handle item addition and removal in the flat list. Also Get the media_list to init and release the flat media list.
parent 9bd5dd03
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 36 deletions
src/control/flat_media_list.c
View file @ 48586f51
...@@ -30,13 +30,85 @@ ...@@ -30,13 +30,85 @@
/* /*
* Private functions * Private functions
*/ */
static void add_media_list( libvlc_media_list_t * p_mlist, libvlc_media_list_t * p_submlist );
static void remove_media_list( libvlc_media_list_t * p_fmlist, libvlc_media_list_t * p_mlist );
static void add_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md ); static void add_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md );
static void remove_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md ); static void remove_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md );
static void subitems_created( const libvlc_event_t * p_event , void * p_user_data); static void subitems_created( const libvlc_event_t * p_event , void * p_user_data);
static void sublist_item_added( const libvlc_event_t * p_event, void * p_user_data ); static void sublist_item_added( const libvlc_event_t * p_event, void * p_user_data );
static void sublist_item_removed( const libvlc_event_t * p_event, void * p_user_data ); static void sublist_item_removed( const libvlc_event_t * p_event, void * p_user_data );
static void add_media_list( libvlc_media_list_t * p_mlist, libvlc_media_list_t * p_submlist ); static void install_flat_mlist_observer( libvlc_media_list_t * p_mlist );
static void remove_media_list( libvlc_media_list_t * p_fmlist, libvlc_media_list_t * p_mlist ); static void uninstall_flat_mlist_observer( libvlc_media_list_t * p_mlist );
/**************************************************************************
* uninstall_media_list_observer (Private)
**************************************************************************/
static void
uninstall_media_list_observer( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
libvlc_event_detach( p_submlist->p_event_manager,
libvlc_MediaListItemAdded,
sublist_item_added, p_mlist, NULL );
libvlc_event_detach( p_submlist->p_event_manager,
libvlc_MediaListItemDeleted,
sublist_item_removed, p_mlist, NULL );
}
/**************************************************************************
* install_media_list_observer (Private)
**************************************************************************/
static void
install_media_list_observer( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
libvlc_event_attach( p_submlist->p_event_manager,
libvlc_MediaListItemAdded,
sublist_item_added, p_mlist, NULL );
libvlc_event_attach( p_submlist->p_event_manager,
libvlc_MediaListItemDeleted,
sublist_item_removed, p_mlist, NULL );
}
/**************************************************************************
* add_media_list (Private)
**************************************************************************/
static void
add_media_list( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
int count = libvlc_media_list_count( p_submlist, NULL );
int i;
for( i = 0; i < count; i++ )
{
libvlc_media_descriptor_t * p_md;
p_md = libvlc_media_list_item_at_index( p_submlist, i, NULL );
add_item( p_mlist->p_flat_mlist, p_md );
}
install_media_list_observer( p_mlist, p_submlist );
}
/**************************************************************************
* remove_media_list (Private)
**************************************************************************/
static void
remove_media_list( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
int count = libvlc_media_list_count( p_submlist, NULL );
int i;
uninstall_media_list_observer( p_mlist, p_submlist );
for( i = 0; i < count; i++ )
{
libvlc_media_descriptor_t * p_md;
p_md = libvlc_media_list_item_at_index( p_submlist, i, NULL );
remove_item( p_mlist, p_md );
}
}
/************************************************************************** /**************************************************************************
* add_item (private) * add_item (private)
...@@ -56,8 +128,10 @@ add_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md ) ...@@ -56,8 +128,10 @@ add_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md )
libvlc_event_attach( p_md->p_event_manager, libvlc_event_attach( p_md->p_event_manager,
libvlc_MediaDescriptorSubItemAdded, libvlc_MediaDescriptorSubItemAdded,
subitems_created, p_mlist, NULL ); subitems_created, p_mlist, NULL );
uninstall_flat_mlist_observer( p_mlist );
libvlc_media_list_add_media_descriptor( p_mlist->p_flat_mlist, libvlc_media_list_add_media_descriptor( p_mlist->p_flat_mlist,
p_md, NULL ); p_md, NULL );
install_flat_mlist_observer( p_mlist );
} }
} }
} }
...@@ -74,7 +148,9 @@ remove_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md ) ...@@ -74,7 +148,9 @@ remove_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md )
libvlc_MediaDescriptorSubItemAdded, libvlc_MediaDescriptorSubItemAdded,
subitems_created, p_mlist, NULL ); subitems_created, p_mlist, NULL );
int i = libvlc_media_list_index_of_item( p_mlist->p_flat_mlist, p_md, NULL ); int i = libvlc_media_list_index_of_item( p_mlist->p_flat_mlist, p_md, NULL );
uninstall_flat_mlist_observer( p_mlist );
libvlc_media_list_remove_index( p_mlist->p_flat_mlist, i, NULL ); libvlc_media_list_remove_index( p_mlist->p_flat_mlist, i, NULL );
install_flat_mlist_observer( p_mlist );
} }
/************************************************************************** /**************************************************************************
...@@ -117,53 +193,103 @@ sublist_item_removed( const libvlc_event_t * p_event, void * p_user_data ) ...@@ -117,53 +193,103 @@ sublist_item_removed( const libvlc_event_t * p_event, void * p_user_data )
} }
/************************************************************************** /**************************************************************************
* add_media_list (Private) * remove_item_in_submlist_rec (private)
**************************************************************************/ **************************************************************************/
void static void
add_media_list( libvlc_media_list_t * p_mlist, remove_item_in_submlist_rec( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist ) libvlc_media_list_t * p_submlist,
libvlc_media_descriptor_t * p_md )
{ {
int count = libvlc_media_list_count( p_submlist, NULL ); libvlc_media_descriptor_t * p_md_insub;
int count = libvlc_media_list_count( p_submlist, NULL );
int i; int i;
libvlc_event_attach( p_submlist->p_event_manager,
libvlc_MediaListItemAdded,
sublist_item_added, p_mlist, NULL );
libvlc_event_attach( p_submlist->p_event_manager,
libvlc_MediaListItemDeleted,
sublist_item_removed, p_mlist, NULL );
for( i = 0; i < count; i++ ) for( i = 0; i < count; i++ )
{ {
libvlc_media_descriptor_t * p_md; p_md_insub = libvlc_media_list_item_at_index( p_submlist,
p_md = libvlc_media_list_item_at_index( p_submlist, i, NULL ); i, NULL );
add_item( p_mlist->p_flat_mlist, p_md ); if( p_md_insub->p_subitems )
remove_item_in_submlist_rec( p_mlist, p_submlist, p_md );
if( p_md == p_md_insub )
{
uninstall_media_list_observer( p_mlist, p_submlist );
libvlc_media_list_remove_index( p_submlist, i, NULL );
install_media_list_observer( p_mlist, p_submlist );
}
} }
} }
/************************************************************************** /**************************************************************************
* remove_media_list (Private) * flat_mlist_item_removed (private) (Event Callback)
**************************************************************************/ **************************************************************************/
void static void
remove_media_list( libvlc_media_list_t * p_mlist, flat_mlist_item_removed( const libvlc_event_t * p_event, void * p_user_data )
libvlc_media_list_t * p_submlist )
{ {
int count = libvlc_media_list_count( p_submlist, NULL ); /* Remove all occurences of that one in sublist */
int i; libvlc_media_list_t * p_mlist = p_user_data;
for( i = 0; i < count; i++ ) libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_deleted.item;
{ remove_item( p_mlist, p_md ); /* Just to detach the event */
libvlc_media_descriptor_t * p_md; remove_item_in_submlist_rec( p_mlist, p_mlist, p_md );
p_md = libvlc_media_list_item_at_index( p_submlist, i, NULL ); }
remove_item( p_mlist, p_md );
} /**************************************************************************
* flat_mlist_item_added (private) (Event Callback)
libvlc_event_detach( p_mlist->p_event_manager, **************************************************************************/
static void
flat_mlist_item_added( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_media_list_t * p_mlist = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
/* Add in our root */
uninstall_media_list_observer( p_mlist, p_mlist );
libvlc_media_list_add_media_descriptor( p_mlist, p_md, NULL );
install_media_list_observer( p_mlist, p_mlist );
}
/**************************************************************************
* install_flat_mlist_observer (Private)
**************************************************************************/
static void
install_flat_mlist_observer( libvlc_media_list_t * p_mlist )
{
libvlc_event_attach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemAdded, libvlc_MediaListItemAdded,
sublist_item_added, p_mlist, NULL ); flat_mlist_item_added, p_mlist, NULL );
libvlc_event_detach( p_mlist->p_event_manager, libvlc_event_attach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemDeleted, libvlc_MediaListItemDeleted,
sublist_item_removed, p_mlist, NULL ); flat_mlist_item_removed, p_mlist, NULL );
}
/**************************************************************************
* uninstall_flat_mlist_observer (Private)
**************************************************************************/
static void
uninstall_flat_mlist_observer( libvlc_media_list_t * p_mlist )
{
libvlc_event_detach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemAdded,
flat_mlist_item_added, p_mlist, NULL );
libvlc_event_attach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemDeleted,
flat_mlist_item_removed, p_mlist, NULL );
} }
/*
* libvlc Internal functions
*/
/**************************************************************************
* flat_media_list_release (Internal)
**************************************************************************/
void
libvlc_media_list_flat_media_list_release( libvlc_media_list_t * p_mlist )
{
if( !p_mlist->p_flat_mlist )
return;
uninstall_flat_mlist_observer( p_mlist );
libvlc_media_list_release( p_mlist->p_flat_mlist );
}
/* /*
* Public libvlc functions * Public libvlc functions
...@@ -182,6 +308,7 @@ libvlc_media_list_flat_media_list( libvlc_media_list_t * p_mlist, ...@@ -182,6 +308,7 @@ libvlc_media_list_flat_media_list( libvlc_media_list_t * p_mlist,
p_mlist->p_libvlc_instance, p_mlist->p_libvlc_instance,
p_e ); p_e );
add_media_list( p_mlist->p_flat_mlist, p_mlist ); add_media_list( p_mlist->p_flat_mlist, p_mlist );
install_flat_mlist_observer( p_mlist );
} }
libvlc_media_list_retain( p_mlist->p_flat_mlist ); libvlc_media_list_retain( p_mlist->p_flat_mlist );
return p_mlist->p_flat_mlist; return p_mlist->p_flat_mlist;
......
src/control/libvlc_internal.h
View file @ 48586f51
...@@ -246,6 +246,10 @@ VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_ ...@@ -246,6 +246,10 @@ VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_
VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate, VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate,
( libvlc_media_descriptor_t * ) ); ( libvlc_media_descriptor_t * ) );
/* Media List */
VLC_EXPORT ( void, libvlc_media_list_flat_media_list_release,
( libvlc_media_list_t * ) );
/* Events */ /* Events */
VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) ); VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) );
......
src/control/media_list.c
View file @ 48586f51
...@@ -217,8 +217,7 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist ) ...@@ -217,8 +217,7 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
/* Refcount null, time to free */ /* Refcount null, time to free */
/* Handled in flat_media_list.c */ /* Handled in flat_media_list.c */
if( p_mlist->p_flat_mlist ) libvlc_media_list_flat_media_list_release( p_mlist );
libvlc_media_list_release( p_mlist->p_flat_mlist );
libvlc_event_manager_release( p_mlist->p_event_manager ); libvlc_event_manager_release( p_mlist->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