[vlc-devel] commit: Do not inherit xspf-open demux from media library ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 23 23:08:28 2009 +0300| [af287865be67dcaf404246c430ddf1b7125e66fb] | committer: Rémi Denis-Courmont 

Do not inherit xspf-open demux from media library
(cherry picked from commit d704062a95b8769dfb27bbd16700da69498cedef)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=af287865be67dcaf404246c430ddf1b7125e66fb
---

 src/playlist/loadsave.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 80abaad..3437873 100644
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -148,18 +148,19 @@ int playlist_MLLoad( playlist_t *p_playlist )
     if( psz_datadir == NULL )
         return VLC_EGENERIC;
 
-    if( asprintf( &psz_uri, "%s/ml.xspf", psz_datadir ) == -1 )
+    /* 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;
     if( psz_uri == NULL )
         return VLC_ENOMEM;
 
-    const char *const options[] = { "meta-file", "demux=xspf-open" };
+    const char *const options[1] = { "meta-file", };
     /* that option has to be cleaned in input_item_subitem_added() */
     /* vlc_gc_decref() in the same function */
     p_input = input_item_NewExt( p_playlist, psz_uri, _("Media Library"),
-                                 2, options, VLC_INPUT_OPTION_TRUSTED, -1 );
+                                 1, options, VLC_INPUT_OPTION_TRUSTED, -1 );
     free( psz_uri );
     if( p_input == NULL )
         return VLC_EGENERIC;