diff options
| author | Max Kellermann <max@duempel.org> | 2012-09-25 11:39:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-09-25 11:39:01 +0200 |
| commit | e2a574e2a00803f45ed6f60154f01dd2ccc8444a (patch) | |
| tree | 7bb07fc285c00d01bd0d7fb1314c49ad39cb9232 /src/decoder/flac_common.c | |
| parent | 1536b5a9d602688354648106ca8d0e34cac3c933 (diff) | |
| parent | ba6ef53ef95dfd48ce0e5dd161b3199b431044ed (diff) | |
| download | mpd-e2a574e2a00803f45ed6f60154f01dd2ccc8444a.tar.gz mpd-e2a574e2a00803f45ed6f60154f01dd2ccc8444a.tar.xz mpd-e2a574e2a00803f45ed6f60154f01dd2ccc8444a.zip | |
Merge branch 'v0.17.x'
Conflicts:
src/locate.c
Diffstat (limited to 'src/decoder/flac_common.c')
| -rw-r--r-- | src/decoder/flac_common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/decoder/flac_common.c b/src/decoder/flac_common.c index 510d16d59..1508ac123 100644 --- a/src/decoder/flac_common.c +++ b/src/decoder/flac_common.c @@ -124,11 +124,10 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block, case FLAC__METADATA_TYPE_VORBIS_COMMENT: if (flac_parse_replay_gain(&rgi, block)) replay_gain_db = decoder_replay_gain(data->decoder, &rgi); - if (flac_parse_mixramp(&mixramp_start, &mixramp_end, block)) { - g_debug("setting mixramp_tags"); + + if (flac_parse_mixramp(&mixramp_start, &mixramp_end, block)) decoder_mixramp(data->decoder, replay_gain_db, mixramp_start, mixramp_end); - } if (data->tag != NULL) flac_vorbis_comments_to_tag(data->tag, NULL, |