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

fs/Traits: GetParent() returns std::string_view

Browse Source
This commit is contained in:
Max Kellermann
2020-03-13 19:37:59 +01:00
parent cefc773992
commit 45b60b3d38
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/playlist/PlaylistQueue.cxx
View File

@@ -41,9 +41,9 @@ playlist_load_into_queue(const char *uri, SongEnumerator &e,
playlist &dest, PlayerControl &pc,
const SongLoader &loader)
{
const std::string base_uri = uri != nullptr
const auto base_uri = uri != nullptr
? PathTraitsUTF8::GetParent(uri)
: std::string(".");
: ".";
std::unique_ptr<DetachedSong> song;
for (unsigned i = 0;
@@ -54,7 +54,7 @@ playlist_load_into_queue(const char *uri, SongEnumerator &e,
continue;
}
if (!playlist_check_translate_song(*song, base_uri.c_str(),
if (!playlist_check_translate_song(*song, base_uri,
loader)) {
continue;
}

6
src/playlist/Print.cxx
View File

@@ -36,13 +36,13 @@ playlist_provider_print(Response &r,
const char *uri,
SongEnumerator &e, bool detail) noexcept
{
const std::string base_uri = uri != nullptr
const auto base_uri = uri != nullptr
? PathTraitsUTF8::GetParent(uri)
: std::string(".");
: ".";
std::unique_ptr<DetachedSong> song;
while ((song = e.NextSong()) != nullptr) {
if (playlist_check_translate_song(*song, base_uri.c_str(),
if (playlist_check_translate_song(*song, base_uri,
loader) &&
detail)
song_print_info(r, *song);