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 40f48ce149d787ff9c916126ffc131e3bd6926b2..03b8fa75dd590982eb53fe369c57e621251e6fcb 100644 (file)
--- a/src/control/hierarchical_node_media_list_view.c
+++ b/src/control/hierarchical_node_media_list_view.c
@@ -22,10 +22,18 @@
  * 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_internal.h" // Abuse, could ans should be removed
+#include "media_list_internal.h" // Abuse, could ans should be removed
+#include "media_list_view_internal.h"
 
 /* FIXME: This version is probably a bit overheaded, and we may want to store
  * the items in a vlc_array_t to speed everything up */
@@ -38,11 +46,6 @@
 # define trace( ... ) {}
 #endif
 
-struct libvlc_media_list_view_private_t
-{
-    vlc_array_t array;
-};
-
 /*
  * Private functions
  */
@@ -56,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;
@@ -65,7 +68,7 @@ hierarch_node_media_list_view_count( libvlc_media_list_view_t * p_mlv,
     {
         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 );
@@ -87,13 +90,13 @@ 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++ )
     {
         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++;
@@ -102,7 +105,8 @@ hierarch_node_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
         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;
 }
 
@@ -120,7 +124,7 @@ hierarch_node_media_list_view_children_at_index( libvlc_media_list_view_t * p_ml
     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 );
@@ -136,13 +140,13 @@ 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++ )
     {
         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 );
@@ -153,14 +157,14 @@ index_of_item( libvlc_media_list_view_t * p_mlv, libvlc_media_t * p_md )
     return -1;
 }
 
-static vlc_bool_t
+static bool
 item_is_already_added( libvlc_media_t * p_md )
 {
     libvlc_media_list_t * p_submlist;
 
-    p_submlist = libvlc_media_subitems( p_md, NULL );
-    if( !p_submlist ) return VLC_FALSE;
-    int count = libvlc_media_list_count( p_submlist, NULL );
+    p_submlist = libvlc_media_subitems( p_md );
+    if( !p_submlist ) return false;
+    int count = libvlc_media_list_count( p_submlist );
     libvlc_media_list_release( p_submlist );
     return count > 1;
 }
@@ -203,8 +207,8 @@ media_list_item_added( const libvlc_event_t * p_event, void * user_data )
     trace("%d\n", index);
     if( index >= 0)
         libvlc_media_list_view_item_added( p_mlv, p_md, index );
-    libvlc_event_attach( p_md->p_event_manager, libvlc_MediaDescriptorSubItemAdded,
-                         items_subitems_added, p_mlv, NULL );
+    libvlc_event_attach( p_md->p_event_manager, libvlc_MediaSubItemAdded,
+                         items_subitems_added, p_mlv );
                          
 }
 static void
@@ -230,8 +234,8 @@ media_list_item_deleted( const libvlc_event_t * p_event, void * user_data )
     trace("%d\n", index);
     if( index >= 0)
         libvlc_media_list_view_item_deleted( p_mlv, p_md, index );
-    libvlc_event_detach( p_md->p_event_manager, libvlc_MediaDescriptorSubItemAdded,
-                         items_subitems_added, p_mlv, NULL );
+    libvlc_event_detach( p_md->p_event_manager, libvlc_MediaSubItemAdded,
+                         items_subitems_added, p_mlv );
 }
 static void
 media_list_will_delete_item( const libvlc_event_t * p_event, void * user_data )
@@ -262,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 );
 }
 
 /**************************************************************************
@@ -294,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;
 }