oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Path: move configuration code to Config.cxx

Browse Source
This commit is contained in:
Max Kellermann
2013-10-17 22:13:54 +02:00
parent fa60b9ae94
commit 080ee87e07
11 changed files with 284 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/PlaylistFile.cxx
View File

@@ -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;
}