Add option to export playlists with relative paths (part 2).

Currently only supported for .m3u and .pls playlists.

src/m3u/m3u.cc

@@ -55,7 +55,7 @@ static char * split_line (char * line)
     return feed + 1;
 }
 
-bool M3ULoader::load (const char * path, VFSFile & file, String & title,
+bool M3ULoader::load (const char * filename, VFSFile & file, String & title,
  Index<PlaylistAddItem> & items)
 {
     Index<char> text = file.read_all ();
@@ -77,7 +77,7 @@ bool M3ULoader::load (const char * path, VFSFile & file, String & title,
 
         if (* parse && * parse != '#')
         {
-            StringBuf s = uri_construct (parse, path);
+            StringBuf s = uri_construct (parse, filename);
             if (s)
                 items.append (String (s));
         }
@@ -88,12 +88,13 @@ bool M3ULoader::load (const char * path, VFSFile & file, String & title,
     return true;
 }
 
-bool M3ULoader::save (const char * path, VFSFile & file, const char * title,
+bool M3ULoader::save (const char * filename, VFSFile & file, const char * title,
  const Index<PlaylistAddItem> & items)
 {
     for (auto & item : items)
     {
-        StringBuf line = str_concat ({item.filename, "\n"});
+        StringBuf path = uri_deconstruct (item.filename, filename);
+        StringBuf line = str_concat ({path, "\n"});
         if (file.fwrite (line, 1, line.len ()) != line.len ())
             return false;
     }

src/pls/pls.cc

@@ -89,9 +89,8 @@ bool PLSLoader::save (const char * filename, VFSFile & file, const char * title,
 
     for (int count = 0; count < entries; count ++)
     {
-        const char * uri = items[count].filename;
-        StringBuf local = uri_to_filename (uri);
-        StringBuf line = str_printf ("File%d=%s\n", 1 + count, local ? local : uri);
+        StringBuf path = uri_deconstruct (items[count].filename, filename);
+        StringBuf line = str_printf ("File%d=%s\n", 1 + count, (const char *) path);
         if (file.fwrite (line, 1, line.len ()) != line.len ())
             return false;
     }