tag/Tag: add Merge() which takes Tag pointers

2021-08-05 17:34:05 +02:00
parent 7d69cbbda7
commit a74b07728e
3 changed files with 26 additions and 11 deletions
--- a/src/input/IcyInputStream.cxx
+++ b/src/input/IcyInputStream.cxx
@@ -82,17 +82,7 @@ IcyInputStream::ReadTag() noexcept
 		/* no change */
 		return nullptr;

-	if (input_tag == nullptr && icy_tag == nullptr)
-		/* no tag */
-		return nullptr;
-
-	if (input_tag == nullptr)
-		return std::make_unique<Tag>(*icy_tag);
-
-	if (icy_tag == nullptr)
-		return std::make_unique<Tag>(*input_tag);
-
-	return Tag::MergePtr(*input_tag, *icy_tag);
+	return Tag::Merge(input_tag.get(), icy_tag.get());
 }

 size_t