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

decoder/flac: pass VorbisComment to flac_parse_replay_gain()

Browse Source
This commit is contained in:
Max Kellermann 2014-09-24 22:34:08 +02:00
parent 441f9cc2ee
commit d82547acd3
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/plugins/FlacCommon.cxx
View File

@ -98,7 +98,7 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
break; break;
case FLAC__METADATA_TYPE_VORBIS_COMMENT: case FLAC__METADATA_TYPE_VORBIS_COMMENT:
if (flac_parse_replay_gain(rgi, block)) if (flac_parse_replay_gain(rgi, block->data.vorbis_comment))
decoder_replay_gain(data->decoder, &rgi); decoder_replay_gain(data->decoder, &rgi);
decoder_mixramp(data->decoder, flac_parse_mixramp(block)); decoder_mixramp(data->decoder, flac_parse_mixramp(block));

5
src/decoder/plugins/FlacMetadata.cxx
View File

@ -55,11 +55,8 @@ vorbis_comment_value(const FLAC__StreamMetadata *block,
bool bool
flac_parse_replay_gain(ReplayGainInfo &rgi, flac_parse_replay_gain(ReplayGainInfo &rgi,
const FLAC__StreamMetadata *block) const FLAC__StreamMetadata_VorbisComment &vc)
{ {
const FLAC__StreamMetadata_VorbisComment &vc =
block->data.vorbis_comment;
rgi.Clear(); rgi.Clear();
bool found = false; bool found = false;

2
src/decoder/plugins/FlacMetadata.hxx
View File

@ -116,7 +116,7 @@ struct ReplayGainInfo;
bool bool
flac_parse_replay_gain(ReplayGainInfo &rgi, flac_parse_replay_gain(ReplayGainInfo &rgi,
const FLAC__StreamMetadata *block); const FLAC__StreamMetadata_VorbisComment &vc);
MixRampInfo MixRampInfo
flac_parse_mixramp(const FLAC__StreamMetadata *block); flac_parse_mixramp(const FLAC__StreamMetadata *block);