From 44b9197354dc1f69c6de6a2f4f3e5a5722d05b62 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 28 Feb 2015 22:07:01 +0100
Subject: Mapper: use class Path

---
 src/PlaylistFile.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/PlaylistFile.cxx')

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;
 		}
-- 
cgit v1.2.3