libvlc_event_manager: remove exceptions

[vlc] / src / control / hierarchical_node_media_list_view.c

diff --git a/src/control/hierarchical_node_media_list_view.c b/src/control/hierarchical_node_media_list_view.c
index 873eb9bf0b8691705e3019c51f704c2afc3e4495..03b8fa75dd590982eb53fe369c57e621251e6fcb 100644 (file)
--- a/src/control/hierarchical_node_media_list_view.c
+++ b/src/control/hierarchical_node_media_list_view.c
@@ -59,7 +59,7 @@ hierarch_node_media_list_view_count( libvlc_media_list_view_t * p_mlv,
                                 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;
@@ -90,7 +90,7 @@ hierarch_node_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
     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++ )
     {
@@ -140,7 +140,7 @@ index_of_item( libvlc_media_list_view_t * p_mlv, libvlc_media_t * p_md )
     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++ )
     {
@@ -164,7 +164,7 @@ item_is_already_added( libvlc_media_t * p_md )
 
     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;
 }
@@ -208,7 +208,7 @@ media_list_item_added( const libvlc_event_t * p_event, void * user_data )
     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
@@ -235,7 +235,7 @@ media_list_item_deleted( const libvlc_event_t * p_event, void * user_data )
     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 )
@@ -266,16 +266,16 @@ hierarch_node_media_list_view_release( libvlc_media_list_view_t * p_mlv )
     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 );
 }
 
 /**************************************************************************
@@ -298,16 +298,16 @@ libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_mlist,
     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;
 }