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

tag/Id3Scan: return std::unique_ptr<Tag>

Browse Source
This commit is contained in:
Max Kellermann 2017-12-20 15:09:20 +01:00
parent 99f4bce112
commit 71f1ec0bc8
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@ -351,10 +351,10 @@ MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
} }
if (mpd_tag) { if (mpd_tag) {
Tag *tmp_tag = tag_id3_import(id3_tag); auto tmp_tag = tag_id3_import(id3_tag);
if (tmp_tag != nullptr) { if (tmp_tag != nullptr) {
delete *mpd_tag; delete *mpd_tag;
*mpd_tag = tmp_tag; *mpd_tag = tmp_tag.release();
} }
} }

4
src/tag/Id3Scan.cxx
View File

@ -330,14 +330,14 @@ scan_id3_tag(struct id3_tag *tag,
tag_id3_import_ufid(tag, handler, handler_ctx); tag_id3_import_ufid(tag, handler, handler_ctx);
} }
Tag * std::unique_ptr<Tag>
tag_id3_import(struct id3_tag *tag) tag_id3_import(struct id3_tag *tag)
{ {
TagBuilder tag_builder; TagBuilder tag_builder;
scan_id3_tag(tag, add_tag_handler, &tag_builder); scan_id3_tag(tag, add_tag_handler, &tag_builder);
return tag_builder.empty() return tag_builder.empty()
? nullptr ? nullptr
: tag_builder.CommitNew().release(); : tag_builder.CommitNew();
} }
bool bool

4
src/tag/Id3Scan.hxx
View File

@ -22,6 +22,8 @@
#include "check.h" #include "check.h"
#include <memory>
class InputStream; class InputStream;
struct TagHandler; struct TagHandler;
struct Tag; struct Tag;
@ -31,7 +33,7 @@ bool
tag_id3_scan(InputStream &is, tag_id3_scan(InputStream &is,
const TagHandler &handler, void *handler_ctx); const TagHandler &handler, void *handler_ctx);
Tag * std::unique_ptr<Tag>
tag_id3_import(id3_tag *); tag_id3_import(id3_tag *);
/** /**