Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / control / media_list.c

diff --git a/src/control/media_list.c b/src/control/media_list.c
index 2c83b455d81a7a8e9d8f06bc87d991d44142c6bd..08271247a3ceca66c8f9a946777741ae7bcbf5a6 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -183,6 +183,7 @@ libvlc_media_list_new( libvlc_instance_t * p_inst )
     vlc_mutex_init( &p_mlist->refcount_lock ); // FIXME: spinlock?
 
     vlc_array_init( &p_mlist->items );
+    assert( p_mlist->items.i_count == 0 );
     p_mlist->i_refcount = 1;
     p_mlist->p_md = NULL;
 
@@ -242,10 +243,9 @@ void libvlc_media_list_retain( libvlc_media_list_t * p_mlist )
 /**************************************************************************
  *       add_file_content (Public)
  **************************************************************************/
-void
+int
 libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist,
-                                    const char * psz_uri,
-                                    libvlc_exception_t * p_e )
+                                    const char * psz_uri )
 {
     input_item_t * p_input_item;
     libvlc_media_t * p_md;
@@ -256,9 +256,8 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist,
 
     if( !p_input_item )
     {
-        libvlc_exception_raise( p_e );
         libvlc_printerr( "Not enough memory" );
-        return;
+        return -1;
     }
 
     p_md = libvlc_media_new_from_input_item( p_mlist->p_libvlc_instance,
@@ -266,18 +265,18 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist,
     if( !p_md )
     {
         vlc_gc_decref( p_input_item );
-        return;
+        return -1;
     }
 
     if( libvlc_media_list_add_media( p_mlist, p_md ) )
     {
-        libvlc_exception_raise( p_e );
-        return;
+#warning Missing error handling!
+        /* printerr and leaks */
+        return -1;
     }
 
     input_Read( p_mlist->p_libvlc_instance->p_libvlc_int, p_input_item );
-
-    return;
+    return 0;
 }
 
 /**************************************************************************