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

decoder/mad: move parse_id3_mixramp() to src/tag/Id3ReplayGain.cxx

Browse Source
This commit is contained in:
Max Kellermann
2018-10-19 19:36:41 +02:00
parent ed5c0d6546
commit bdfaea0c25
4 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
#include "input/InputStream.hxx"
#include "config/Block.hxx"
#include "tag/Id3Scan.hxx"
#include "tag/Id3ReplayGain.hxx"
#include "tag/Rva2.hxx"
#include "tag/Handler.hxx"
#include "tag/ReplayGain.hxx"
@@ -254,40 +255,6 @@ MadDecoder::FillBuffer()
return true;
}
#ifdef ENABLE_ID3TAG
static bool
parse_id3_replay_gain_info(ReplayGainInfo &rgi,
struct id3_tag *tag)
{
bool found = false;
rgi.Clear();
struct id3_frame *frame;
for (unsigned i = 0; (frame = id3_tag_findframe(tag, "TXXX", i)); i++) {
if (frame->nfields < 3)
continue;
char *const key = (char *)
id3_ucs4_latin1duplicate(id3_field_getstring
(&frame->fields[1]));
char *const value = (char *)
id3_ucs4_latin1duplicate(id3_field_getstring
(&frame->fields[2]));
if (ParseReplayGainTag(rgi, key, value))
found = true;
free(key);
free(value);
}
return found ||
/* fall back on RVA2 if no replaygain tags found */
tag_rva2_parse(tag, rgi);
}
#endif
#ifdef ENABLE_ID3TAG
gcc_pure
static MixRampInfo
@@ -358,7 +325,7 @@ MadDecoder::ParseId3(size_t tagsize, Tag **mpd_tag)
if (client != nullptr) {
ReplayGainInfo rgi;
if (parse_id3_replay_gain_info(rgi, id3_tag)) {
if (Id3ToReplayGainInfo(rgi, id3_tag)) {
client->SubmitReplayGain(&rgi);
found_replay_gain = true;
}