Merge branch 'v0.22.x'

This commit is contained in:
Max Kellermann
2021-05-19 08:09:05 +02:00
11 changed files with 167 additions and 8 deletions

View File

@@ -44,13 +44,13 @@ playlist::TagModified(DetachedSong &&song) noexcept
}
void
playlist::TagModified(const char *uri, const Tag &tag) noexcept
playlist::TagModified(const char *real_uri, const Tag &tag) noexcept
{
bool modified = false;
for (unsigned i = 0; i < queue.length; ++i) {
auto &song = *queue.items[i].song;
if (song.IsURI(uri)) {
if (song.IsRealURI(real_uri)) {
song.SetTag(tag);
queue.ModifyAtPosition(i);
modified = true;

View File

@@ -197,7 +197,12 @@ public:
* the song matches.
*/
void TagModified(DetachedSong &&song) noexcept;
void TagModified(const char *uri, const Tag &tag) noexcept;
/**
* @param real_uri the song's "real uri" (see
* DetachedSong::GetRealURI(), DetachedSong::IsRealURI())
*/
void TagModified(const char *real_uri, const Tag &tag) noexcept;
#ifdef ENABLE_DATABASE
/**