LibVLC audio: take a player object for most functions, remove exceptions

[vlc] / src / control / hierarchical_media_list_view.c

diff --git a/src/control/hierarchical_media_list_view.c b/src/control/hierarchical_media_list_view.c
index 08e906030229c83d6947020fc6d2f8b743cf79f6..1283fad0646ef26b91c3e7ab7c74394f1a09f75f 100644 (file)
--- a/src/control/hierarchical_media_list_view.c
+++ b/src/control/hierarchical_media_list_view.c
@@ -53,7 +53,8 @@ static int
 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 );
 }
 
 /**************************************************************************
@@ -85,7 +86,7 @@ hierarch_media_list_view_children_at_index( libvlc_media_list_view_t * p_mlv,
     p_submlist = libvlc_media_subitems( p_md );
     libvlc_media_release( p_md );
     if( !p_submlist ) return NULL;
-    p_ret = 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;
@@ -145,24 +146,23 @@ 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, 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_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;
@@ -172,21 +172,20 @@ libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist,
                                         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, 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;
 }