X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Floadsave.c;h=44a8257a15e17cd40a123a155c112ce282a874a8;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=357592b6e7fc0bc5a7f15a2bdb654eb4141d7741;hpb=89e0f5225631ceb9051b0ec9879f4b1ff324af94;p=vlc diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 357592b6e7..44a8257a15 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -29,8 +29,9 @@ #include #include "playlist_internal.h" #include "config/configuration.h" -#include +#include #include +#include #include #include @@ -56,7 +57,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename, /* Prepare the playlist_export_t structure */ p_export->p_root = p_export_root; p_export->psz_filename = psz_filename; - p_export->p_file = utf8_fopen( psz_filename, "wt" ); + p_export->p_file = vlc_fopen( psz_filename, "wt" ); if( p_export->p_file == NULL ) msg_Err( p_export, "could not create playlist file %s (%m)", psz_filename ); @@ -86,7 +87,7 @@ int playlist_Import( playlist_t *p_playlist, const char *psz_file ) { input_item_t *p_input; const char *const psz_option = "meta-file"; - char *psz_uri = make_URI( psz_file ); + char *psz_uri = make_URI( psz_file, NULL ); if( psz_uri == NULL ) return VLC_EGENERIC; @@ -103,60 +104,52 @@ int playlist_Import( playlist_t *p_playlist, const char *psz_file ) /***************************************************************************** * A subitem has been added to the Media Library (Event Callback) *****************************************************************************/ -static void input_item_subitem_added( const vlc_event_t * p_event, +static void input_item_subitem_tree_added( const vlc_event_t * p_event, void * user_data ) { playlist_t *p_playlist = user_data; - input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child; + input_item_node_t *p_root = + p_event->u.input_item_subitem_tree_added.p_root; - /* playlist_AddInput() can fail, but we have no way to report that .. - * Any way when it has failed, either the playlist is dying, either OOM */ - playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END, - false, pl_Unlocked ); + PL_LOCK; + playlist_InsertInputItemTree ( p_playlist, p_playlist->p_media_library, + p_root, 0, false ); + PL_UNLOCK; } int playlist_MLLoad( playlist_t *p_playlist ) { - char *psz_datadir; - char *psz_uri = NULL; input_item_t *p_input; - psz_datadir = config_GetUserDir( VLC_DATA_DIR ); - + char *psz_datadir = config_GetUserDir( VLC_DATA_DIR ); if( !psz_datadir ) /* XXX: This should never happen */ { msg_Err( p_playlist, "no data directory, cannot load media library") ; return VLC_EGENERIC; } - if( asprintf( &psz_uri, "%s" DIR_SEP "ml.xspf", psz_datadir ) != -1 ) - { /* loosy check for media library file */ - struct stat st; - int ret = utf8_stat( psz_uri , &st ); - free( psz_uri ); - if( ret ) - { - free( psz_datadir ); - return VLC_EGENERIC; - } - } - - psz_uri = make_URI( psz_datadir ); + char *psz_file; + if( asprintf( &psz_file, "%s" DIR_SEP "ml.xspf", psz_datadir ) == -1 ) + psz_file = NULL; free( psz_datadir ); - psz_datadir = psz_uri; - if( psz_datadir == NULL ) + if( psz_file == NULL ) + return VLC_ENOMEM; + + /* loosy check for media library file */ + struct stat st; + if( vlc_stat( psz_file, &st ) ) + { + free( psz_file ); return VLC_EGENERIC; + } - /* Force XSPF demux (psz_datadir was a path, now it is a file URI) */ - if( asprintf( &psz_uri, "file/xspf-open%s/ml.xspf", psz_datadir+4 ) == -1 ) - psz_uri = NULL; - free( psz_datadir ); - psz_datadir = NULL; + char *psz_uri = make_URI( psz_file, "file/xspf-open" ); + free( psz_file ); if( psz_uri == NULL ) return VLC_ENOMEM; const char *const options[1] = { "meta-file", }; - /* that option has to be cleaned in input_item_subitem_added() */ + /* that option has to be cleaned in input_item_subitem_tree_added() */ /* vlc_gc_decref() in the same function */ p_input = input_item_NewExt( p_playlist, psz_uri, _("Media Library"), 1, options, VLC_INPUT_OPTION_TRUSTED, -1 ); @@ -165,19 +158,13 @@ int playlist_MLLoad( playlist_t *p_playlist ) return VLC_EGENERIC; PL_LOCK; - if( p_playlist->p_ml_onelevel->p_input ) - vlc_gc_decref( p_playlist->p_ml_onelevel->p_input ); - if( p_playlist->p_ml_category->p_input ) - vlc_gc_decref( p_playlist->p_ml_category->p_input ); + if( p_playlist->p_media_library->p_input ) + vlc_gc_decref( p_playlist->p_media_library->p_input ); - p_playlist->p_ml_onelevel->p_input = - p_playlist->p_ml_category->p_input = p_input; - /* We save the input at two different place, incref */ - vlc_gc_incref( p_input ); - vlc_gc_incref( p_input ); + p_playlist->p_media_library->p_input = p_input; - vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, - input_item_subitem_added, p_playlist ); + vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_added, p_playlist ); pl_priv(p_playlist)->b_doing_ml = true; PL_UNLOCK; @@ -190,10 +177,9 @@ int playlist_MLLoad( playlist_t *p_playlist ) pl_priv(p_playlist)->b_doing_ml = false; PL_UNLOCK; - vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded, - input_item_subitem_added, p_playlist ); + vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemTreeAdded, + input_item_subitem_tree_added, p_playlist ); - vlc_gc_decref( p_input ); return VLC_SUCCESS; } @@ -220,7 +206,7 @@ int playlist_MLDump( playlist_t *p_playlist ) strcat( psz_dirname, DIR_SEP "ml.xspf" ); stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP ); - playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category, + playlist_Export( p_playlist, psz_dirname, p_playlist->p_media_library, "export-xspf" ); stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP );