diff options
| -rw-r--r-- | src/Mapper.cxx | 4 | ||||
| -rw-r--r-- | src/Mapper.hxx | 3 | ||||
| -rw-r--r-- | src/PlaylistFile.cxx | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx index 1dff3949c..14718ca09 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -86,8 +86,10 @@ map_uri_fs(const char *uri) } std::string -map_fs_to_utf8(const char *path_fs) +map_fs_to_utf8(Path _path_fs) { + auto path_fs = _path_fs.c_str(); + if (PathTraitsFS::IsSeparator(path_fs[0])) { if (instance->storage == nullptr) return std::string(); diff --git a/src/Mapper.hxx b/src/Mapper.hxx index 95bd81a49..ac07079f0 100644 --- a/src/Mapper.hxx +++ b/src/Mapper.hxx @@ -30,6 +30,7 @@ #define PLAYLIST_FILE_SUFFIX ".m3u" +class Path; class AllocatedPath; void @@ -58,7 +59,7 @@ map_uri_fs(const char *uri); */ gcc_pure std::string -map_fs_to_utf8(const char *path_fs); +map_fs_to_utf8(Path path_fs); #endif 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; } |