playlist/PlaylistSong: pass std::string_view

This commit is contained in:
Max Kellermann
2020-03-13 19:58:36 +01:00
parent a885bdba4c
commit cefc773992
4 changed files with 14 additions and 12 deletions

View File

@@ -65,15 +65,15 @@ try {
}
bool
playlist_check_translate_song(DetachedSong &song, const char *base_uri,
playlist_check_translate_song(DetachedSong &song, std::string_view base_uri,
const SongLoader &loader) noexcept
{
if (base_uri != nullptr && strcmp(base_uri, ".") == 0)
if (base_uri.compare(".") == 0)
/* 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;
base_uri = {};
const char *uri = song.GetURI();
@@ -92,7 +92,7 @@ playlist_check_translate_song(DetachedSong &song, const char *base_uri,
}
#endif
if (base_uri != nullptr && !uri_has_scheme(uri) &&
if (base_uri.data() != nullptr && !uri_has_scheme(uri) &&
!PathTraitsUTF8::IsAbsolute(uri))
song.SetURI(PathTraitsUTF8::Build(base_uri, uri));

View File

@@ -20,6 +20,8 @@
#ifndef MPD_PLAYLIST_SONG_HXX
#define MPD_PLAYLIST_SONG_HXX
#include <string_view>
class SongLoader;
class DetachedSong;
@@ -30,7 +32,7 @@ class DetachedSong;
* @return true on success, false if the song should not be used
*/
bool
playlist_check_translate_song(DetachedSong &song, const char *base_uri,
playlist_check_translate_song(DetachedSong &song, std::string_view base_uri,
const SongLoader &loader) noexcept;
#endif

View File

@@ -112,7 +112,7 @@ queue_load_song(TextFile &file, const SongLoader &loader,
auto song = LoadQueueSong(file, line);
if (!playlist_check_translate_song(song, nullptr, loader))
if (!playlist_check_translate_song(song, {}, loader))
return;
queue.Append(std::move(song), priority);