* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/libvlc.h>
#include <vlc/libvlc_media.h>
#include <vlc/libvlc_media_list.h>
libvlc_exception_t * p_e )
{
/* FIXME: we may want to cache that */
- int i, ret, count = libvlc_media_list_count( p_mlv->p_mlist, p_e );
+ int i, ret, count = libvlc_media_list_count( p_mlv->p_mlist );
libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
ret = 0;
{
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, p_e );
if( !p_md ) continue;
- p_submlist = libvlc_media_subitems( p_md, p_e );
+ p_submlist = libvlc_media_subitems( p_md );
if( !p_submlist ) continue;
libvlc_media_release( p_md );
libvlc_media_list_release( p_submlist );
libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
trace("%d\n", index);
- int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist, p_e );
+ int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist );
current_index = -1;
for( i = 0; i < count; i++ )
{
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, p_e );
if( !p_md ) continue;
- p_submlist = libvlc_media_subitems( p_md, p_e );
+ p_submlist = libvlc_media_subitems( p_md );
if( !p_submlist ) continue;
libvlc_media_list_release( p_submlist );
current_index++;
libvlc_media_release( p_md );
}
- libvlc_exception_raise( p_e, "Index out of bound in Media List View" );
+ libvlc_exception_raise( p_e );
+ libvlc_printerr( "Index out of bound in Media List View" );
return NULL;
}
libvlc_media_list_view_t * p_ret;
p_md = hierarch_node_media_list_view_item_at_index( p_mlv, index, p_e );
if( !p_md ) return NULL;
- p_submlist = libvlc_media_subitems( p_md, p_e );
+ p_submlist = libvlc_media_subitems( p_md );
libvlc_media_release( p_md );
if( !p_submlist ) return NULL;
- p_ret = libvlc_media_list_hierarchical_node_view( p_submlist, p_e );
+ p_ret = libvlc_media_list_hierarchical_node_view( p_submlist );
libvlc_media_list_release( p_submlist );
return p_ret;
libvlc_media_t * p_iter_md;
libvlc_media_list_t * p_submlist;
- int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
+ int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist );
current_index = -1;
for( i = 0; i < count; i++ )
{
p_iter_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, NULL );
if( !p_iter_md ) continue;
- p_submlist = libvlc_media_subitems( p_iter_md, NULL );
+ p_submlist = libvlc_media_subitems( p_iter_md );
if( !p_submlist ) continue;
libvlc_media_list_release( p_submlist );
libvlc_media_release( p_iter_md );
{
libvlc_media_list_t * p_submlist;
- p_submlist = libvlc_media_subitems( p_md, NULL );
+ p_submlist = libvlc_media_subitems( p_md );
if( !p_submlist ) return false;
- int count = libvlc_media_list_count( p_submlist, NULL );
+ int count = libvlc_media_list_count( p_submlist );
libvlc_media_list_release( p_submlist );
return count > 1;
}
if( index >= 0)
libvlc_media_list_view_item_added( p_mlv, p_md, index );
libvlc_event_attach( p_md->p_event_manager, libvlc_MediaSubItemAdded,
- items_subitems_added, p_mlv, NULL );
+ items_subitems_added, p_mlv );
}
static void
if( index >= 0)
libvlc_media_list_view_item_deleted( p_mlv, p_md, index );
libvlc_event_detach( p_md->p_event_manager, libvlc_MediaSubItemAdded,
- items_subitems_added, p_mlv, NULL );
+ items_subitems_added, p_mlv );
}
static void
media_list_will_delete_item( const libvlc_event_t * p_event, void * user_data )
trace("\n");
libvlc_event_detach( p_mlv->p_mlist->p_event_manager,
libvlc_MediaListItemAdded,
- media_list_item_added, p_mlv, NULL );
+ 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, NULL );
+ 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, NULL );
+ 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, NULL );
+ media_list_will_delete_item, p_mlv );
}
/**************************************************************************
* libvlc_media_list_flat_view (Public)
**************************************************************************/
libvlc_media_list_view_t *
-libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_mlist,
- libvlc_exception_t * p_e )
+libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_mlist )
{
trace("\n");
libvlc_media_list_view_t * p_mlv;
hierarch_node_media_list_view_children_at_index,
libvlc_media_list_hierarchical_node_view,
hierarch_node_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, NULL );
+ 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, NULL );
+ 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, NULL );
+ 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, NULL );
+ media_list_will_delete_item, p_mlv );
libvlc_media_list_unlock( p_mlist );
return p_mlv;
}