* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "libvlc_internal.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/libvlc.h>
-#include <assert.h>
-#include "vlc_arrays.h"
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_list.h>
+#include <vlc/libvlc_media_list_view.h>
+
+#include "media_list_internal.h"
+#include "media_list_view_internal.h"
//#define DEBUG_HIERARCHICAL_VIEW
# define trace( ... )
#endif
-struct libvlc_media_list_view_private_t
-{
- vlc_array_t array;
-};
-
/*
* Private functions
*/
hierarch_media_list_view_count( libvlc_media_list_view_t * p_mlv,
libvlc_exception_t * p_e )
{
- return libvlc_media_list_count( p_mlv->p_mlist, p_e );
+ VLC_UNUSED(p_e);
+ return libvlc_media_list_count( p_mlv->p_mlist );
}
/**************************************************************************
* flat_media_list_view_item_at_index (private)
* (called by flat_media_list_view_item_at_index)
**************************************************************************/
-static libvlc_media_descriptor_t *
+static libvlc_media_t *
hierarch_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
int index,
libvlc_exception_t * p_e )
int index,
libvlc_exception_t * p_e )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
+ libvlc_media_list_view_t * p_ret;
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, index, p_e );
if( !p_md ) return NULL;
- p_submlist = libvlc_media_descriptor_subitems( p_md, p_e );
+ p_submlist = libvlc_media_subitems( p_md );
+ libvlc_media_release( p_md );
if( !p_submlist ) return NULL;
- return libvlc_media_list_hierarchical_view( p_submlist, p_e );
+ p_ret = libvlc_media_list_hierarchical_view( p_submlist );
+ libvlc_media_list_release( p_submlist );
+
+ return p_ret;
}
/**************************************************************************
- * flat_media_list_view_release (private)
- * (called by media_list_view_release)
+ * media_list_(item|will)_* (private) (Event callback)
**************************************************************************/
static void
-hierarch_media_list_view_release( libvlc_media_list_view_t * p_mlv )
+media_list_item_added( const libvlc_event_t * p_event, void * user_data )
+{
+ libvlc_media_t * p_md;
+ libvlc_media_list_view_t * p_mlv = user_data;
+ int index = p_event->u.media_list_item_added.index;
+ p_md = p_event->u.media_list_item_added.item;
+ libvlc_media_list_view_item_added( p_mlv, p_md, index );
+}
+static void
+media_list_will_add_item( const libvlc_event_t * p_event, void * user_data )
+{
+ libvlc_media_t * p_md;
+ libvlc_media_list_view_t * p_mlv = user_data;
+ int index = p_event->u.media_list_will_add_item.index;
+ p_md = p_event->u.media_list_will_add_item.item;
+ libvlc_media_list_view_will_add_item( p_mlv, p_md, index );
+}
+static void
+media_list_item_deleted( const libvlc_event_t * p_event, void * user_data )
{
+ libvlc_media_t * p_md;
+ libvlc_media_list_view_t * p_mlv = user_data;
+ int index = p_event->u.media_list_item_deleted.index;
+ p_md = p_event->u.media_list_item_deleted.item;
+ libvlc_media_list_view_item_deleted( p_mlv, p_md, index );
+}
+static void
+media_list_will_delete_item( const libvlc_event_t * p_event, void * user_data )
+{
+ libvlc_media_t * p_md;
+ libvlc_media_list_view_t * p_mlv = user_data;
+ int index = p_event->u.media_list_will_delete_item.index;
+ p_md = p_event->u.media_list_will_delete_item.item;
+ libvlc_media_list_view_will_delete_item( p_mlv, p_md, index );
}
/*
* Public libvlc functions
*/
+
+/**************************************************************************
+ * flat_media_list_view_release (private)
+ * (called by media_list_view_release)
+ **************************************************************************/
+static void
+hierarch_media_list_view_release( libvlc_media_list_view_t * p_mlv )
+{
+ libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListItemAdded,
+ media_list_item_added, p_mlv );
+ libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListWillAddItem,
+ media_list_will_add_item, p_mlv );
+ libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListItemDeleted,
+ media_list_item_deleted, p_mlv );
+ libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListWillDeleteItem,
+ media_list_will_delete_item, p_mlv );
+}
+
/**************************************************************************
* libvlc_media_list_flat_view (Public)
**************************************************************************/
libvlc_media_list_view_t *
-libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist,
- libvlc_exception_t * p_e )
+libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist )
{
trace("\n");
libvlc_media_list_view_t * p_mlv;
- libvlc_media_list_lock( p_mlist );
p_mlv = libvlc_media_list_view_new( p_mlist,
hierarch_media_list_view_count,
hierarch_media_list_view_item_at_index,
hierarch_media_list_view_children_at_index,
+ libvlc_media_list_hierarchical_view,
hierarch_media_list_view_release,
- NULL,
- p_e );
+ NULL );
+ libvlc_media_list_lock( p_mlist );
+ libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListItemAdded,
+ media_list_item_added, p_mlv );
+ libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListWillAddItem,
+ media_list_will_add_item, p_mlv );
+ libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListItemDeleted,
+ media_list_item_deleted, p_mlv );
+ libvlc_event_attach( p_mlv->p_mlist->p_event_manager,
+ libvlc_MediaListWillDeleteItem,
+ media_list_will_delete_item, p_mlv );
libvlc_media_list_unlock( p_mlist );
return p_mlv;
}
projects / vlc / blobdiff