Optionally support Windows-style relative paths in playlists.

audacious-media-player · Aug 30, 2012 · c4f2b61 · c4f2b61
1 parent ddc7d84
commit c4f2b61
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/audacious/config.c b/src/audacious/config.c
@@ -80,6 +80,11 @@ static const char * const core_defaults[] = {
  "stop_after_current_song", "FALSE",
 
  /* playlist */
+#ifdef _WIN32
+ "convert_backslash", "TRUE",
+#else
+ "convert_backslash", "FALSE",
+#endif
  "generic_title_format", "${?artist:${artist} - }${?album:${album} - }${title}",
  "leading_zero", "FALSE",
  "metadata_on_play", "FALSE",

diff --git a/src/audacious/ui_preferences.c b/src/audacious/ui_preferences.c
@@ -195,10 +195,12 @@ static PreferencesWidget playlist_page_widgets[] = {
      .cfg_type = VALUE_BOOLEAN, .cname = "clear_playlist"},
     {WIDGET_CHK_BTN, N_("Open files in a temporary playlist"),
      .cfg_type = VALUE_BOOLEAN, .cname = "open_to_temporary"},
-    {WIDGET_LABEL, N_("<b>Metadata</b>"), NULL, NULL, NULL, FALSE},
     {WIDGET_CHK_BTN, N_("Do not load metadata for songs until played"),
      .cfg_type = VALUE_BOOLEAN, .cname = "metadata_on_play",
      .callback = playlist_trigger_scan},
+    {WIDGET_LABEL, N_("<b>Compatibility</b>"), NULL, NULL, NULL, FALSE},
+    {WIDGET_CHK_BTN, N_("Interpret \\ (backward slash) as a folder delimiter"),
+     .cfg_type = VALUE_BOOLEAN, .cname = "convert_backslash"},
     {WIDGET_TABLE, .data = {.table = {chardet_elements,
      G_N_ELEMENTS (chardet_elements)}}}
 };

diff --git a/src/audacious/util.c b/src/audacious/util.c
@@ -89,9 +89,21 @@ char * construct_uri (const char * string, const char * playlist_name)
         return NULL;
 
     int pathlen = slash + 1 - playlist_name;
-    char buf[pathlen + 3 * strlen (string) + 1];
+    int rellen = strlen (string);
+
+    char buf[pathlen + 3 * rellen + 1];
     memcpy (buf, playlist_name, pathlen);
-    str_encode_percent (string, -1, buf + pathlen);
+
+    if (get_bool (NULL, "convert_backslash"))
+    {
+        char tmp[rellen + 1];
+        strcpy (tmp, string);
+        string_replace_char (tmp, '\\', '/');
+        str_encode_percent (tmp, -1, buf + pathlen);
+    }
+    else
+        str_encode_percent (string, -1, buf + pathlen);
+
     return strdup (buf);
 }