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

decoder/mad: use class UniqueId3Tag

Browse Source
This commit is contained in:
Max Kellermann 2018-10-21 19:32:45 +02:00
parent 3cd5dd15f8
commit a491d8ae24
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include <mad.h> #include <mad.h>
#ifdef ENABLE_ID3TAG #ifdef ENABLE_ID3TAG
#include "tag/Id3Unique.hxx"
#include <id3tag.h> #include <id3tag.h>
#endif #endif
@ -310,12 +311,12 @@ MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
id3_data = allocated.get(); id3_data = allocated.get();
} }
struct id3_tag *const id3_tag = id3_tag_parse(id3_data, tagsize); const UniqueId3Tag id3_tag(id3_tag_parse(id3_data, tagsize));
if (id3_tag == nullptr) if (id3_tag == nullptr)
return; return;
if (mpd_tag) { if (mpd_tag) {
auto tmp_tag = tag_id3_import(id3_tag); auto tmp_tag = tag_id3_import(id3_tag.get());
if (tmp_tag != nullptr) { if (tmp_tag != nullptr) {
delete *mpd_tag; delete *mpd_tag;
*mpd_tag = tmp_tag.release(); *mpd_tag = tmp_tag.release();
@ -325,16 +326,14 @@ MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
if (client != nullptr) { if (client != nullptr) {
ReplayGainInfo rgi; ReplayGainInfo rgi;
if (Id3ToReplayGainInfo(rgi, id3_tag)) { if (Id3ToReplayGainInfo(rgi, id3_tag.get())) {
client->SubmitReplayGain(&rgi); client->SubmitReplayGain(&rgi);
found_replay_gain = true; found_replay_gain = true;
} }
client->SubmitMixRamp(parse_id3_mixramp(id3_tag)); client->SubmitMixRamp(parse_id3_mixramp(id3_tag.get()));
} }
id3_tag_delete(id3_tag);
#else /* !ENABLE_ID3TAG */ #else /* !ENABLE_ID3TAG */
(void)mpd_tag; (void)mpd_tag;