diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-17 23:23:25 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-17 23:23:25 +0200 |
| commit | b3611524f45c2a478f9decd6d22ecd1dbbbb64b9 (patch) | |
| tree | d15d0c161e24e5db7d77b768458aa11cb6650878 /src/Mapper.cxx | |
| parent | a63613dba0374367907180be5e244db450ff234b (diff) | |
fs/Path: move definitions to struct PathTraits
Diffstat (limited to 'src/Mapper.cxx')
| -rw-r--r-- | src/Mapper.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx index b89f83cd7..8a6bd2201 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -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(); |