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!

PlaylistMapper: use map_spl_utf8_to_fs()
fc1664d9 · Max Kellermann · 12768bab · fc1664d9
Commit fc1664d9 authored May 10, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

PlaylistMapper.cxx src/playlist/PlaylistMapper.cxx +2 -10

No files found.
--- 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);
 }