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

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

Browse Source
This commit is contained in:
Max Kellermann
2021-08-05 17:31:31 +02:00
parent 955502f881
commit 7d69cbbda7
4 changed files with 19 additions and 8 deletions

6
src/decoder/Bridge.cxx

@@ -474,8 +474,8 @@ DecoderBridge::SubmitData(InputStream *is,
if (UpdateStreamTag(is)) {
if (decoder_tag != nullptr)
/* merge with tag from decoder plugin */
cmd = DoSendTag(*Tag::Merge(*decoder_tag,
*stream_tag));
cmd = DoSendTag(Tag::Merge(*decoder_tag,
*stream_tag));
else
/* send only the stream tag */
cmd = DoSendTag(*stream_tag);
@@ -598,7 +598,7 @@ DecoderBridge::SubmitTag(InputStream *is, Tag &&tag) noexcept
if (stream_tag != nullptr)
/* merge with tag from input stream */
cmd = DoSendTag(*Tag::Merge(*stream_tag, *decoder_tag));
cmd = DoSendTag(Tag::Merge(*stream_tag, *decoder_tag));
else
/* send only the decoder tag */
cmd = DoSendTag(*decoder_tag);