diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-17 22:13:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-17 22:29:03 +0200 |
| commit | 080ee87e07f0037e559abbea6f7db73602af5137 (patch) | |
| tree | 66464d51200132175724333164a43d65efb2dfe1 /src/PlaylistFile.cxx | |
| parent | fa60b9ae94a61c71da2b7dd7305eb191612bc6e6 (diff) | |
| download | mpd-080ee87e07f0037e559abbea6f7db73602af5137.tar.gz mpd-080ee87e07f0037e559abbea6f7db73602af5137.tar.xz mpd-080ee87e07f0037e559abbea6f7db73602af5137.zip | |
fs/Path: move configuration code to Config.cxx
Diffstat (limited to 'src/PlaylistFile.cxx')
| -rw-r--r-- | src/PlaylistFile.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index 19085f496..ea6b3c914 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -33,6 +33,7 @@ #include "Idle.hxx" #include "fs/Limits.hxx" #include "fs/Path.hxx" +#include "fs/Charset.hxx" #include "fs/FileSystem.hxx" #include "fs/DirectoryReader.hxx" #include "util/UriUtil.hxx" @@ -158,7 +159,7 @@ LoadPlaylistFileInfo(PlaylistInfo &info, char *name = g_strndup(name_fs_str, name_length + 1 - sizeof(PLAYLIST_FILE_SUFFIX)); - std::string name_utf8 = Path::ToUTF8(name); + std::string name_utf8 = PathToUTF8(name); g_free(name); if (name_utf8.empty()) return false; @@ -248,7 +249,7 @@ LoadPlaylistFile(const char *utf8path, Error &error) uri_utf8 = map_fs_to_utf8(s); if (uri_utf8.empty()) { if (Path::IsAbsoluteFS(s)) { - uri_utf8 = Path::ToUTF8(s); + uri_utf8 = PathToUTF8(s); if (uri_utf8.empty()) continue; @@ -257,7 +258,7 @@ LoadPlaylistFile(const char *utf8path, Error &error) continue; } } else { - uri_utf8 = Path::ToUTF8(s); + uri_utf8 = PathToUTF8(s); if (uri_utf8.empty()) continue; } |