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

fs/Path: move definitions to struct PathTraits

Browse Source
This commit is contained in:
Max Kellermann
2013-10-17 23:23:25 +02:00
parent a63613dba0
commit b3611524f4
18 changed files with 155 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mapper.cxx
View File

@@ -26,6 +26,7 @@
#include "Directory.hxx"
#include "Song.hxx"
#include "fs/Path.hxx"
#include "fs/Traits.hxx"
#include "fs/Charset.hxx"
#include "fs/FileSystem.hxx"
#include "fs/DirectoryReader.hxx"
@@ -147,7 +148,7 @@ map_to_relative_path(const char *path_utf8)
return !music_dir_utf8.empty() &&
memcmp(path_utf8, music_dir_utf8.c_str(),
music_dir_utf8_length) == 0 &&
Path::IsSeparatorUTF8(path_utf8[music_dir_utf8_length])
PathTraits::IsSeparatorUTF8(path_utf8[music_dir_utf8_length])
? path_utf8 + music_dir_utf8_length + 1
: path_utf8;
}
@@ -231,7 +232,7 @@ map_song_fs(const Song *song)
std::string
map_fs_to_utf8(const char *path_fs)
{
if (Path::IsSeparatorFS(path_fs[0])) {
if (PathTraits::IsSeparatorFS(path_fs[0])) {
path_fs = music_dir_fs.RelativeFS(path_fs);
if (path_fs == nullptr || *path_fs == 0)
return std::string();