From adcd2c8eacd74aeb072b806a3c36922ca2ad753d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 14 Aug 2012 02:12:36 +0200
Subject: playlist_song: use map_to_relative_path()
---
src/playlist_song.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/playlist_song.c b/src/playlist_song.c
index 019ea8c55..88ef1059d 100644
--- a/src/playlist_song.c
+++ b/src/playlist_song.c
@@ -134,11 +134,11 @@ playlist_check_translate_song(struct song *song, const char *base_uri,
if (g_path_is_absolute(uri)) {
/* XXX fs_charset vs utf8? */
- const char *prefix = mapper_get_music_directory();
+ const char *suffix = map_to_relative_path(uri);
+ assert(suffix != NULL);
- if (prefix != NULL && g_str_has_prefix(uri, prefix) &&
- uri[strlen(prefix)] == '/')
- uri += strlen(prefix) + 1;
+ if (suffix != uri)
+ uri = suffix;
else if (!secure) {
/* local files must be relative to the music
directory when "secure" is enabled */
--
cgit v1.2.3