changeset 2381:d49913587458 trunk

[svn] - changes to the nature of URI handling in the VFS subsystem, will be chased momentarily in plugins.
author nenolod
date Sun, 21 Jan 2007 20:45:17 -0800
parents 825c3715b90f
children d41965d1806a
files ChangeLog src/audacious/vfs.c
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jan 21 07:11:08 2007 -0800
+++ b/ChangeLog	Sun Jan 21 20:45:17 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-21 15:11:08 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [3770]
+  - handle empty playlists gracefully
+  
+  trunk/src/audacious/playlist.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-01-21 12:28:28 +0000  Michael Hanselmann <hansmi@forkbomb.ch>
   revision [3768]
   Check for sz == 0 in vfs_buffered_file_new_from_uri(), return NULL if it's the case.
--- a/src/audacious/vfs.c	Sun Jan 21 07:11:08 2007 -0800
+++ b/src/audacious/vfs.c	Sun Jan 21 20:45:17 2007 -0800
@@ -71,7 +71,7 @@
     if (!path || !mode)
 	return NULL;
 
-    decpath = xmms_urldecode_plain(path);
+    decpath = g_strdup(path);
 
     for (node = vfs_transports; node != NULL; node = g_list_next(node))
     {
@@ -85,10 +85,7 @@
     if (vtable == NULL)
         return NULL;
 
-    if (strlen(vtable->uri_id) > 1)
-        file = vtable->vfs_fopen_impl(decpath + strlen(vtable->uri_id), mode);
-    else
-        file = vtable->vfs_fopen_impl(decpath, mode);
+    file = vtable->vfs_fopen_impl(decpath, mode);
 
     if (file == NULL)
         return NULL;