#include <assert.h>
#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
*/
static void
notify_item_addition( libvlc_media_list_t * p_mlist,
libvlc_media_descriptor_t * p_md,
- int index )
+ 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 );
static void
notify_item_deletion( libvlc_media_list_t * p_mlist,
libvlc_media_descriptor_t * p_md,
- int index )
+ 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 );
/* Code for that one should be handled in flat_media_list.c */
p_mlist->p_flat_mlist = NULL;
+ p_mlist->b_read_only = VLC_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 ) )
{
/* 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 )
for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
{
- p_md = vlc_array_object_at_index( &p_mlist->items, i );
+ p_md = vlc_array_item_at_index( &p_mlist->items, i );
libvlc_media_descriptor_release( p_md );
}
+ vlc_mutex_destroy( &p_mlist->object_lock );
vlc_array_clear( &p_mlist->items );
free( p_mlist );
libvlc_media_list_t * p_mlist,
libvlc_media_descriptor_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_descriptor( p_mlist, p_md, p_e );
+}
+
+/* LibVLC internal version */
+void _libvlc_media_list_add_media_descriptor(
+ libvlc_media_list_t * p_mlist,
+ libvlc_media_descriptor_t * p_md,
+ libvlc_exception_t * p_e )
{
(void)p_e;
libvlc_media_descriptor_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 );
+ notify_item_addition( p_mlist, p_md, vlc_array_count( &p_mlist->items )-1, EventDidHappen );
}
/**************************************************************************
libvlc_media_descriptor_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_descriptor( p_mlist, p_md, index, p_e );
+}
+
+/* LibVLC internal version */
+void _libvlc_media_list_insert_media_descriptor(
+ libvlc_media_list_t * p_mlist,
+ libvlc_media_descriptor_t * p_md,
+ int index,
+ libvlc_exception_t * p_e )
{
(void)p_e;
libvlc_media_descriptor_retain( p_md );
+ 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 );
+ notify_item_addition( p_mlist, p_md, index, EventDidHappen );
}
/**************************************************************************
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_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_descriptor_t * p_md;
- p_md = vlc_array_object_at_index( &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 );
+ notify_item_deletion( p_mlist, p_md, index, EventWillHappen );
vlc_array_remove( &p_mlist->items, index );
- notify_item_deletion( p_mlist, p_md, index );
+ notify_item_deletion( p_mlist, p_md, index, EventDidHappen );
libvlc_media_descriptor_release( p_md );
}
int index,
libvlc_exception_t * p_e )
{
+ VLC_UNUSED(p_e);
+
libvlc_media_descriptor_t * p_md;
- p_md = vlc_array_object_at_index( &p_mlist->items, index );
+ p_md = vlc_array_item_at_index( &p_mlist->items, index );
libvlc_media_descriptor_retain( p_md );
return p_md;
}
libvlc_media_descriptor_t * p_searched_md,
libvlc_exception_t * p_e )
{
+ VLC_UNUSED(p_e);
+
libvlc_media_descriptor_t * p_md;
int i;
for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
{
- p_md = vlc_array_object_at_index( &p_mlist->items, i );
+ p_md = vlc_array_item_at_index( &p_mlist->items, i );
if( p_searched_md == p_md )
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)
*
}
-
/**************************************************************************
* libvlc_media_list_p_event_manager (Public)
*