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

decoder/flac: pass VorbisComment to flac_parse_mixramp()

Browse Source
This commit is contained in:
Max Kellermann 2014-09-24 22:50:28 +02:00
parent 8a7ff6a6fd
commit f32d34b965
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,8 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
if (flac_parse_replay_gain(rgi, block->data.vorbis_comment)) 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->data.vorbis_comment));
data->tag = flac_vorbis_comments_to_tag(&block->data.vorbis_comment); data->tag = flac_vorbis_comments_to_tag(&block->data.vorbis_comment);
break; break;

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

@ -50,11 +50,8 @@ flac_parse_replay_gain(ReplayGainInfo &rgi,
} }
MixRampInfo MixRampInfo
flac_parse_mixramp(const FLAC__StreamMetadata *block) flac_parse_mixramp(const FLAC__StreamMetadata_VorbisComment &vc)
{ {
const FLAC__StreamMetadata_VorbisComment &vc =
block->data.vorbis_comment;
MixRampInfo mix_ramp; MixRampInfo mix_ramp;
const auto *comments = vc.comments; const auto *comments = vc.comments;

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

@ -119,7 +119,7 @@ flac_parse_replay_gain(ReplayGainInfo &rgi,
const FLAC__StreamMetadata_VorbisComment &vc); const FLAC__StreamMetadata_VorbisComment &vc);
MixRampInfo MixRampInfo
flac_parse_mixramp(const FLAC__StreamMetadata *block); flac_parse_mixramp(const FLAC__StreamMetadata_VorbisComment &vc);
Tag Tag
flac_vorbis_comments_to_tag(const FLAC__StreamMetadata_VorbisComment *comment); flac_vorbis_comments_to_tag(const FLAC__StreamMetadata_VorbisComment *comment);