diff options
| author | Denis Krjuchkov <denis@crazydev.net> | 2013-12-05 03:53:43 +0600 |
|---|---|---|
| committer | Denis Krjuchkov <denis@crazydev.net> | 2013-12-05 03:53:43 +0600 |
| commit | 0a6c4c31b2a9e79c9c0119202f9e50e123f98ac6 (patch) | |
| tree | eeea8005badbf5b9c8ccea8b961ea498d2da3d47 /src/PlaylistSong.cxx | |
| parent | 02fcf184b5620c9ccbbc26024f9b0f341061a39a (diff) | |
| download | mpd-0a6c4c31b2a9e79c9c0119202f9e50e123f98ac6.tar.gz mpd-0a6c4c31b2a9e79c9c0119202f9e50e123f98ac6.tar.xz mpd-0a6c4c31b2a9e79c9c0119202f9e50e123f98ac6.zip | |
fs/Traits: split PathTraits type into PathTraitsFS and PathTraitsUTF8
Diffstat (limited to 'src/PlaylistSong.cxx')
| -rw-r--r-- | src/PlaylistSong.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PlaylistSong.cxx b/src/PlaylistSong.cxx index 60774dc36..f6f602a3c 100644 --- a/src/PlaylistSong.cxx +++ b/src/PlaylistSong.cxx @@ -99,7 +99,7 @@ playlist_check_load_song(const Song *song, const char *uri, bool secure) if (uri_has_scheme(uri)) { dest = Song::NewRemote(uri); - } else if (PathTraits::IsAbsoluteUTF8(uri) && secure) { + } else if (PathTraitsUTF8::IsAbsolute(uri) && secure) { dest = Song::LoadFile(uri, nullptr); if (dest == nullptr) return nullptr; @@ -142,13 +142,13 @@ playlist_check_translate_song(Song *song, const char *base_uri, } if (base_uri != nullptr && strcmp(base_uri, ".") == 0) - /* PathTraits::GetParentUTF8() returns "." when there + /* PathTraitsUTF8::GetParent() returns "." when there is no directory name in the given path; clear that now, because it would break the database lookup functions */ base_uri = nullptr; - if (PathTraits::IsAbsoluteUTF8(uri)) { + if (PathTraitsUTF8::IsAbsolute(uri)) { /* XXX fs_charset vs utf8? */ const char *suffix = map_to_relative_path(uri); assert(suffix != nullptr); |