X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_list.c;h=8dc7e0c6ae6a585cb7d24d265e1d1888f4556d26;hb=fd3ef9055df9088e6c1fd544a9d26a71f465d0cb;hp=2c83b455d81a7a8e9d8f06bc87d991d44142c6bd;hpb=6c2286c22b6074320338c085d78d4a795478c1c3;p=vlc diff --git a/src/control/media_list.c b/src/control/media_list.c index 2c83b455d8..8dc7e0c6ae 100644 --- a/src/control/media_list.c +++ b/src/control/media_list.c @@ -242,10 +242,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 +255,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 +264,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; } /**************************************************************************