vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jun 4 10:45:36 2017 +0300| [0fcdfb7a622e885e9fb01078922a91265d40b282] | committer: Rémi Denis-Courmont
xspf: fix opening media library > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0fcdfb7a622e885e9fb01078922a91265d40b282 --- lib/media_library.c | 2 +- modules/demux/playlist/xspf.c | 2 +- src/playlist/loadsave.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/media_library.c b/lib/media_library.c index 75be6d5c10..f2bf77a77f 100644 --- a/lib/media_library.c +++ b/lib/media_library.c @@ -108,7 +108,7 @@ int libvlc_media_library_load( libvlc_media_library_t * p_mlib ) char * psz_uri; if( psz_datadir == NULL - || asprintf( &psz_uri, "file/xspf-open://%s" DIR_SEP "ml.xsp", + || asprintf( &psz_uri, "file/directory://%s" DIR_SEP "ml.xsp", psz_datadir ) == -1 ) psz_uri = NULL; free( psz_datadir ); diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index 13746acff4..0904937573 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -128,7 +128,7 @@ static int ReadDir(stream_t *p_demux, input_item_node_t *p_subitems) sys->pp_tracklist = NULL; sys->i_tracklist_entries = 0; sys->i_track_id = -1; - sys->psz_base = strdup(p_demux->psz_filepath); + sys->psz_base = strdup(p_demux->psz_url); /* create new xml parser from stream */ p_xml_reader = xml_ReaderCreate(p_demux, p_demux->p_source); diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 5b1ae883e3..05d6b9038e 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -151,7 +151,7 @@ int playlist_MLLoad( playlist_t *p_playlist ) return VLC_EGENERIC; } - char *psz_uri = vlc_path2uri( psz_file, "file/xspf-open" ); + char *psz_uri = vlc_path2uri( psz_file, "file/directory" ); free( psz_file ); if( psz_uri == NULL ) return VLC_ENOMEM; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
