Commit f32d34b9 authored by Max Kellermann's avatar Max Kellermann

decoder/flac: pass VorbisComment to flac_parse_mixramp()

parent 8a7ff6a6
...@@ -101,7 +101,8 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block, ...@@ -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;
......
...@@ -50,11 +50,8 @@ flac_parse_replay_gain(ReplayGainInfo &rgi, ...@@ -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;
......
...@@ -119,7 +119,7 @@ flac_parse_replay_gain(ReplayGainInfo &rgi, ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment