From fc1664d9fc432c509c236a5889a0a7ead159e3ba Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 10 May 2014 19:00:46 +0200 Subject: PlaylistMapper: use map_spl_utf8_to_fs() Eliminates some overhead and some duplicate code, and fixes a serious bug: the old code did not append the ".m3u" suffix, and thus the "load" command was completely broken for stored playlists. D'oh! --- src/playlist/PlaylistMapper.cxx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/playlist/PlaylistMapper.cxx b/src/playlist/PlaylistMapper.cxx index bbcbaf1fe..c50254309 100644 --- a/src/playlist/PlaylistMapper.cxx +++ b/src/playlist/PlaylistMapper.cxx @@ -37,18 +37,10 @@ playlist_open_in_playlist_dir(const char *uri, Mutex &mutex, Cond &cond) { assert(spl_valid_name(uri)); - const auto &playlist_directory_fs = map_spl_path(); - if (playlist_directory_fs.IsNull()) + const auto path_fs = map_spl_utf8_to_fs(uri); + if (path_fs.IsNull()) return nullptr; - const auto uri_fs = AllocatedPath::FromUTF8(uri); - if (uri_fs.IsNull()) - return nullptr; - - const auto path_fs = - AllocatedPath::Build(playlist_directory_fs, uri_fs); - assert(!path_fs.IsNull()); - return playlist_open_path(path_fs.c_str(), mutex, cond); } -- cgit v1.2.3