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

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!
This commit is contained in:
Max Kellermann 2014-05-10 19:00:46 +02:00
parent 12768babdf
commit fc1664d9fc
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/playlist/PlaylistMapper.cxx
View File

@ -37,18 +37,10 @@ playlist_open_in_playlist_dir(const char *uri, Mutex &mutex, Cond &cond)
{ {
assert(spl_valid_name(uri)); assert(spl_valid_name(uri));
const auto &playlist_directory_fs = map_spl_path(); const auto path_fs = map_spl_utf8_to_fs(uri);
if (playlist_directory_fs.IsNull()) if (path_fs.IsNull())
return nullptr; 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); return playlist_open_path(path_fs.c_str(), mutex, cond);
} }