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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/decoder/Bridge.cxx
View File

@ -450,13 +450,11 @@ DecoderBridge::SubmitData(InputStream *is,
/* send stream tags */
if (UpdateStreamTag(is)) {
if (decoder_tag != nullptr) {
if (decoder_tag != nullptr)
/* merge with tag from decoder plugin */
Tag *tag = Tag::Merge(*decoder_tag,
*stream_tag);
cmd = DoSendTag(*tag);
delete tag;
} else
cmd = DoSendTag(*Tag::Merge(*decoder_tag,
*stream_tag));
else
/* send only the stream tag */
cmd = DoSendTag(*stream_tag);
@ -559,14 +557,10 @@ DecoderBridge::SubmitTag(InputStream *is, Tag &&tag)
/* send tag to music pipe */
if (stream_tag != nullptr) {
if (stream_tag != nullptr)
/* merge with tag from input stream */
Tag *merged;
merged = Tag::Merge(*stream_tag, *decoder_tag);
cmd = DoSendTag(*merged);
delete merged;
} else
cmd = DoSendTag(*Tag::Merge(*stream_tag, *decoder_tag));
else
/* send only the decoder tag */
cmd = DoSendTag(*decoder_tag);

2
src/input/IcyInputStream.cxx
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

8
src/tag/Tag.cxx
View File

@ -55,12 +55,12 @@ Tag::Tag(const Tag &other)
}
}
Tag *
Tag::Merge(const Tag &base, const Tag &add)
std::unique_ptr<Tag>
Tag::Merge(const Tag &base, const Tag &add) noexcept
{
TagBuilder builder(add);
builder.Complement(base);
return builder.CommitNew().release();
return builder.CommitNew();
}
Tag *
@ -72,7 +72,7 @@ Tag::MergeReplace(Tag *base, Tag *add)
if (base == nullptr)
return add;
Tag *tag = Merge(*base, *add);
Tag *tag = Merge(*base, *add).release();
delete base;
delete add;

5
src/tag/Tag.hxx
View File

@ -26,6 +26,7 @@
#include "Compiler.h"
#include <algorithm>
#include <memory>
/**
* The meta information about a song file. It is a MPD specific
@ -116,8 +117,8 @@ struct Tag {
*
* @return a newly allocated tag
*/
gcc_malloc gcc_returns_nonnull
static Tag *Merge(const Tag &base, const Tag &add);
static std::unique_ptr<Tag> Merge(const Tag &base,
const Tag &add) noexcept;
/**
* Merges the data from two tags. Any of the two may be nullptr. Both