diff options
| author | Max Kellermann <max@duempel.org> | 2015-02-28 22:07:01 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-02-28 23:00:27 +0100 |
| commit | 44b9197354dc1f69c6de6a2f4f3e5a5722d05b62 (patch) | |
| tree | 95bdfddd8c2bb791be738803dcbd8989e9acfdfd /src/PlaylistFile.cxx | |
| parent | 7a8f96b1dd707ef96f8d8fe6821263d6f3cd225b (diff) | |
| download | mpd-44b9197354dc1f69c6de6a2f4f3e5a5722d05b62.tar.gz mpd-44b9197354dc1f69c6de6a2f4f3e5a5722d05b62.tar.xz mpd-44b9197354dc1f69c6de6a2f4f3e5a5722d05b62.zip | |
Mapper: use class Path
Diffstat (limited to '')
| -rw-r--r-- | src/PlaylistFile.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index 4c2f8d22e..804f7d951 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -268,13 +268,15 @@ LoadPlaylistFile(const char *utf8path, Error &error) if (*s == 0 || *s == PLAYLIST_COMMENT) continue; + const Path path = Path::FromFS(s); + std::string uri_utf8; if (!uri_has_scheme(s)) { #ifdef ENABLE_DATABASE - uri_utf8 = map_fs_to_utf8(s); + uri_utf8 = map_fs_to_utf8(path); if (uri_utf8.empty()) { - if (PathTraitsFS::IsAbsolute(s)) { + if (path.IsAbsolute()) { uri_utf8 = PathToUTF8(s); if (uri_utf8.empty()) continue; @@ -287,7 +289,7 @@ LoadPlaylistFile(const char *utf8path, Error &error) continue; #endif } else { - uri_utf8 = PathToUTF8(s); + uri_utf8 = path.ToUTF8(); if (uri_utf8.empty()) continue; } |