aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-09-24 22:50:28 +0200
committerMax Kellermann <max@duempel.org>2014-09-24 22:50:28 +0200
commitf32d34b9650b34726f002ea067673d565bf6f4bb (patch)
treef7f80e409263febc789f422dd020dd3cb562329d /src
parent8a7ff6a6fd70d6a8e7611ffb0f794fb3eab2a462 (diff)
downloadmpd-f32d34b9650b34726f002ea067673d565bf6f4bb.tar.gz
mpd-f32d34b9650b34726f002ea067673d565bf6f4bb.tar.xz
mpd-f32d34b9650b34726f002ea067673d565bf6f4bb.zip
decoder/flac: pass VorbisComment to flac_parse_mixramp()
Diffstat (limited to '')
-rw-r--r--src/decoder/plugins/FlacCommon.cxx3
-rw-r--r--src/decoder/plugins/FlacMetadata.cxx5
-rw-r--r--src/decoder/plugins/FlacMetadata.hxx2
3 files changed, 4 insertions, 6 deletions
diff --git a/src/decoder/plugins/FlacCommon.cxx b/src/decoder/plugins/FlacCommon.cxx
index 74eaf4909..e86f85569 100644
--- a/src/decoder/plugins/FlacCommon.cxx
+++ b/src/decoder/plugins/FlacCommon.cxx
@@ -101,7 +101,8 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
if (flac_parse_replay_gain(rgi, block->data.vorbis_comment))
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);
break;
diff --git a/src/decoder/plugins/FlacMetadata.cxx b/src/decoder/plugins/FlacMetadata.cxx
index f917a8fcc..03e276dce 100644
--- a/src/decoder/plugins/FlacMetadata.cxx
+++ b/src/decoder/plugins/FlacMetadata.cxx
@@ -50,11 +50,8 @@ flac_parse_replay_gain(ReplayGainInfo &rgi,
}
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;
const auto *comments = vc.comments;
diff --git a/src/decoder/plugins/FlacMetadata.hxx b/src/decoder/plugins/FlacMetadata.hxx
index f9c3d0840..d791fa34e 100644
--- a/src/decoder/plugins/FlacMetadata.hxx
+++ b/src/decoder/plugins/FlacMetadata.hxx
@@ -119,7 +119,7 @@ flac_parse_replay_gain(ReplayGainInfo &rgi,
const FLAC__StreamMetadata_VorbisComment &vc);
MixRampInfo
-flac_parse_mixramp(const FLAC__StreamMetadata *block);
+flac_parse_mixramp(const FLAC__StreamMetadata_VorbisComment &vc);
Tag
flac_vorbis_comments_to_tag(const FLAC__StreamMetadata_VorbisComment *comment);