X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_list.c;h=c379db9497d8e4241f8d5ae284585266a05f18ef;hb=f9e4aada6337d7c419c8a7d36e359626a39a4390;hp=db69555dc0a5b395e6f4605c0f391c89b4d1894e;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/src/control/media_list.c b/src/control/media_list.c index db69555dc0..c379db9497 100644 --- a/src/control/media_list.c +++ b/src/control/media_list.c @@ -26,6 +26,19 @@ #include #include "vlc_arrays.h" +typedef enum EventPlaceInTime { + EventWillHappen, + EventDidHappen +} EventPlaceInTime; + +//#define DEBUG_MEDIA_LIST + +#ifdef DEBUG_MEDIA_LIST +# define trace( fmt, ... ) printf( "%s(): " fmt, __FUNCTION__, ##__VA_ARGS__ ) +#else +# define trace( ... ) +#endif + /* * Private functions */ @@ -39,15 +52,26 @@ **************************************************************************/ static void notify_item_addition( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_md, - int index ) + libvlc_media_t * p_md, + int index, + EventPlaceInTime event_status ) { libvlc_event_t event; /* Construct the event */ - event.type = libvlc_MediaListItemAdded; - event.u.media_list_item_added.item = p_md; - event.u.media_list_item_added.index = index; + if( event_status == EventDidHappen ) + { + trace("item was added at index %d\n", index); + event.type = libvlc_MediaListItemAdded; + event.u.media_list_item_added.item = p_md; + event.u.media_list_item_added.index = index; + } + else /* if( event_status == EventWillHappen ) */ + { + event.type = libvlc_MediaListWillAddItem; + event.u.media_list_will_add_item.item = p_md; + event.u.media_list_will_add_item.index = index; + } /* Send the event */ libvlc_event_send( p_mlist->p_event_manager, &event ); @@ -60,15 +84,26 @@ notify_item_addition( libvlc_media_list_t * p_mlist, **************************************************************************/ static void notify_item_deletion( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_md, - int index ) + libvlc_media_t * p_md, + int index, + EventPlaceInTime event_status ) { libvlc_event_t event; /* Construct the event */ - event.type = libvlc_MediaListItemDeleted; - event.u.media_list_item_deleted.item = p_md; - event.u.media_list_item_deleted.index = index; + if( event_status == EventDidHappen ) + { + trace("item at index %d was deleted\n", index); + event.type = libvlc_MediaListItemDeleted; + event.u.media_list_item_deleted.item = p_md; + event.u.media_list_item_deleted.index = index; + } + else /* if( event_status == EventWillHappen ) */ + { + event.type = libvlc_MediaListWillDeleteItem; + event.u.media_list_will_delete_item.item = p_md; + event.u.media_list_will_delete_item.index = index; + } /* Send the event */ libvlc_event_send( p_mlist->p_event_manager, &event ); @@ -99,11 +134,16 @@ libvlc_media_list_new( libvlc_instance_t * p_inst, /* Code for that one should be handled in flat_media_list.c */ p_mlist->p_flat_mlist = NULL; + p_mlist->b_read_only = false; libvlc_event_manager_register_event_type( p_mlist->p_event_manager, libvlc_MediaListItemAdded, p_e ); + libvlc_event_manager_register_event_type( p_mlist->p_event_manager, + libvlc_MediaListWillAddItem, p_e ); libvlc_event_manager_register_event_type( p_mlist->p_event_manager, libvlc_MediaListItemDeleted, p_e ); + libvlc_event_manager_register_event_type( p_mlist->p_event_manager, + libvlc_MediaListWillDeleteItem, p_e ); if( libvlc_exception_raised( p_e ) ) { @@ -112,9 +152,9 @@ libvlc_media_list_new( libvlc_instance_t * p_inst, return NULL; } - vlc_mutex_init( p_inst->p_libvlc_int, &p_mlist->object_lock ); + vlc_mutex_init( &p_mlist->object_lock ); - ARRAY_INIT(p_mlist->items); + vlc_array_init( &p_mlist->items ); p_mlist->i_refcount = 1; p_mlist->p_md = NULL; @@ -128,7 +168,8 @@ libvlc_media_list_new( libvlc_instance_t * p_inst, **************************************************************************/ void libvlc_media_list_release( libvlc_media_list_t * p_mlist ) { - libvlc_media_descriptor_t * p_md; + libvlc_media_t * p_md; + int i; vlc_mutex_lock( &p_mlist->object_lock ); p_mlist->i_refcount--; @@ -141,18 +182,20 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist ) /* Refcount null, time to free */ - /* Handled in flat_media_list.c */ - libvlc_media_list_flat_media_list_release( p_mlist ); - libvlc_event_manager_release( p_mlist->p_event_manager ); if( p_mlist->p_md ) - libvlc_media_descriptor_release( p_mlist->p_md ); + libvlc_media_release( p_mlist->p_md ); + + for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ ) + { + p_md = vlc_array_item_at_index( &p_mlist->items, i ); + libvlc_media_release( p_md ); + } + + vlc_mutex_destroy( &p_mlist->object_lock ); + vlc_array_clear( &p_mlist->items ); - FOREACH_ARRAY( p_md, p_mlist->items ) - libvlc_media_descriptor_release( p_md ); - FOREACH_END() - free( p_mlist ); } @@ -178,7 +221,7 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e ) { input_item_t * p_input_item; - libvlc_media_descriptor_t * p_md; + libvlc_media_t * p_md; p_input_item = input_ItemNewExt( p_mlist->p_libvlc_instance->p_libvlc_int, psz_uri, _("Media Library"), 0, NULL, -1 ); @@ -189,7 +232,7 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist, return; } - p_md = libvlc_media_descriptor_new_from_input_item( + p_md = libvlc_media_new_from_input_item( p_mlist->p_libvlc_instance, p_input_item, p_e ); @@ -199,52 +242,52 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist, return; } - libvlc_media_list_add_media_descriptor( p_mlist, p_md, p_e ); + libvlc_media_list_add_media( p_mlist, p_md, p_e ); if( libvlc_exception_raised( p_e ) ) return; - input_Read( p_mlist->p_libvlc_instance->p_libvlc_int, p_input_item, VLC_TRUE ); + input_Read( p_mlist->p_libvlc_instance->p_libvlc_int, p_input_item, true ); return; } /************************************************************************** - * set_media_descriptor (Public) + * set_media (Public) **************************************************************************/ -void libvlc_media_list_set_media_descriptor( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_md, +void libvlc_media_list_set_media( libvlc_media_list_t * p_mlist, + libvlc_media_t * p_md, libvlc_exception_t * p_e) { (void)p_e; vlc_mutex_lock( &p_mlist->object_lock ); if( p_mlist->p_md ) - libvlc_media_descriptor_release( p_mlist->p_md ); - libvlc_media_descriptor_retain( p_md ); + libvlc_media_release( p_mlist->p_md ); + libvlc_media_retain( p_md ); p_mlist->p_md = p_md; vlc_mutex_unlock( &p_mlist->object_lock ); } /************************************************************************** - * media_descriptor (Public) + * media (Public) * - * If this media_list comes is a media_descriptor's subitems, - * This holds the corresponding media_descriptor. + * If this media_list comes is a media's subitems, + * This holds the corresponding media. * This md is also seen as the information holder for the media_list. * Indeed a media_list can have meta information through this - * media_descriptor. + * media. **************************************************************************/ -libvlc_media_descriptor_t * -libvlc_media_list_media_descriptor( libvlc_media_list_t * p_mlist, +libvlc_media_t * +libvlc_media_list_media( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e) { - libvlc_media_descriptor_t *p_md; + libvlc_media_t *p_md; (void)p_e; vlc_mutex_lock( &p_mlist->object_lock ); p_md = p_mlist->p_md; if( p_md ) - libvlc_media_descriptor_retain( p_md ); + libvlc_media_retain( p_md ); vlc_mutex_unlock( &p_mlist->object_lock ); return p_md; @@ -259,41 +302,76 @@ int libvlc_media_list_count( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e ) { (void)p_e; - return p_mlist->items.i_size; + return vlc_array_count( &p_mlist->items ); } /************************************************************************** - * libvlc_media_list_add_media_descriptor (Public) + * libvlc_media_list_add_media (Public) * * Lock should be hold when entering. **************************************************************************/ -void libvlc_media_list_add_media_descriptor( +void libvlc_media_list_add_media( + libvlc_media_list_t * p_mlist, + libvlc_media_t * p_md, + libvlc_exception_t * p_e ) +{ + if( p_mlist->b_read_only ) + { + /* We are read only from user side */ + libvlc_exception_raise( p_e, "Trying to write into a read-only media list." ); + return; + } + + _libvlc_media_list_add_media( p_mlist, p_md, p_e ); +} + +/* LibVLC internal version */ +void _libvlc_media_list_add_media( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_md, + libvlc_media_t * p_md, libvlc_exception_t * p_e ) { (void)p_e; - libvlc_media_descriptor_retain( p_md ); - ARRAY_INSERT( p_mlist->items, p_md, p_mlist->items.i_size ); - notify_item_addition( p_mlist, p_md, p_mlist->items.i_size-1 ); + libvlc_media_retain( p_md ); + + notify_item_addition( p_mlist, p_md, vlc_array_count( &p_mlist->items ), EventWillHappen ); + vlc_array_append( &p_mlist->items, p_md ); + notify_item_addition( p_mlist, p_md, vlc_array_count( &p_mlist->items )-1, EventDidHappen ); } /************************************************************************** - * libvlc_media_list_insert_media_descriptor (Public) + * libvlc_media_list_insert_media (Public) * * Lock should be hold when entering. **************************************************************************/ -void libvlc_media_list_insert_media_descriptor( +void libvlc_media_list_insert_media( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_md, + libvlc_media_t * p_md, + int index, + libvlc_exception_t * p_e ) +{ + if( p_mlist->b_read_only ) + { + /* We are read only from user side */ + libvlc_exception_raise( p_e, "Trying to write into a read-only media list." ); + return; + } + _libvlc_media_list_insert_media( p_mlist, p_md, index, p_e ); +} + +/* LibVLC internal version */ +void _libvlc_media_list_insert_media( + libvlc_media_list_t * p_mlist, + libvlc_media_t * p_md, int index, libvlc_exception_t * p_e ) { (void)p_e; - libvlc_media_descriptor_retain( p_md ); + libvlc_media_retain( p_md ); - ARRAY_INSERT( p_mlist->items, p_md, index); - notify_item_addition( p_mlist, p_md, index ); + notify_item_addition( p_mlist, p_md, index, EventWillHappen ); + vlc_array_insert( &p_mlist->items, p_md, index ); + notify_item_addition( p_mlist, p_md, index, EventDidHappen ); } /************************************************************************** @@ -305,14 +383,36 @@ void libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist, int index, libvlc_exception_t * p_e ) { - libvlc_media_descriptor_t * p_md; + if( p_mlist->b_read_only ) + { + /* We are read only from user side */ + libvlc_exception_raise( p_e, "Trying to write into a read-only media list." ); + return; + } + _libvlc_media_list_remove_index( p_mlist, index, p_e ); +} + +/* LibVLC internal version */ +void _libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist, + int index, + libvlc_exception_t * p_e ) +{ + + libvlc_media_t * p_md; - p_md = ARRAY_VAL( p_mlist->items, index ); + if( index < 0 || index >= vlc_array_count( &p_mlist->items )) + { + libvlc_exception_raise( p_e, "Index out of bounds exception"); + return; + } + + p_md = vlc_array_item_at_index( &p_mlist->items, index ); - ARRAY_REMOVE( p_mlist->items, index ) - notify_item_deletion( p_mlist, p_md, index ); + notify_item_deletion( p_mlist, p_md, index, EventWillHappen ); + vlc_array_remove( &p_mlist->items, index ); + notify_item_deletion( p_mlist, p_md, index, EventDidHappen ); - libvlc_media_descriptor_release( p_md ); + libvlc_media_release( p_md ); } /************************************************************************** @@ -320,13 +420,22 @@ void libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist, * * Lock should be hold when entering. **************************************************************************/ -libvlc_media_descriptor_t * +libvlc_media_t * libvlc_media_list_item_at_index( libvlc_media_list_t * p_mlist, int index, libvlc_exception_t * p_e ) { - libvlc_media_descriptor_t * p_md = ARRAY_VAL( p_mlist->items, index ); - libvlc_media_descriptor_retain( p_md ); + VLC_UNUSED(p_e); + + if( index < 0 || index >= vlc_array_count( &p_mlist->items )) + { + libvlc_exception_raise( p_e, "Index out of bounds exception"); + return NULL; + } + + libvlc_media_t * p_md; + p_md = vlc_array_item_at_index( &p_mlist->items, index ); + libvlc_media_retain( p_md ); return p_md; } @@ -337,17 +446,32 @@ libvlc_media_list_item_at_index( libvlc_media_list_t * p_mlist, * Warning: this function would return the first matching item **************************************************************************/ int libvlc_media_list_index_of_item( libvlc_media_list_t * p_mlist, - libvlc_media_descriptor_t * p_searched_md, + libvlc_media_t * p_searched_md, libvlc_exception_t * p_e ) { - libvlc_media_descriptor_t * p_md; - FOREACH_ARRAY( p_md, p_mlist->items ) + VLC_UNUSED(p_e); + + libvlc_media_t * p_md; + int i; + for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ ) + { + p_md = vlc_array_item_at_index( &p_mlist->items, i ); if( p_searched_md == p_md ) - return fe_idx; /* Once more, we hate macro for that */ - FOREACH_END() + return i; + } return -1; } +/************************************************************************** + * libvlc_media_list_is_readonly (Public) + * + * This indicates if this media list is read-only from a user point of view + **************************************************************************/ +int libvlc_media_list_is_readonly( libvlc_media_list_t * p_mlist ) +{ + return p_mlist->b_read_only; +} + /************************************************************************** * libvlc_media_list_lock (Public) * @@ -371,7 +495,6 @@ void libvlc_media_list_unlock( libvlc_media_list_t * p_mlist ) } - /************************************************************************** * libvlc_media_list_p_event_manager (Public) *