tag/Tag: Merge() returns std::unique_ptr<Tag>

This commit is contained in:
Max Kellermann
2017-12-20 14:59:51 +01:00
parent cb3042ffb2
commit c6a95395b5
4 changed files with 15 additions and 20 deletions

View File

@@ -75,7 +75,7 @@ IcyInputStream::ReadTag()
if (icy_tag == nullptr)
return new Tag(*input_tag);
return Tag::Merge(*input_tag, *icy_tag);
return Tag::Merge(*input_tag, *icy_tag).release();
}
size_t