Skip to content

M
mpd
Commit 891dab7b authored by Tim Phipps's avatar Tim Phipps Committed by Max Kellermann
Browse files
Options

decoder/flac: fix replay gain (short-circuiting "or")

parent 7a24e496
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 8 deletions
src/decoder/flac_metadata.c
View file @ 891dab7b
...@@ -64,14 +64,19 @@ flac_parse_replay_gain(const FLAC__StreamMetadata *block) ...@@ -64,14 +64,19 @@ flac_parse_replay_gain(const FLAC__StreamMetadata *block)
rgi = replay_gain_info_new(); rgi = replay_gain_info_new();
found = flac_find_float_comment(block, "replaygain_album_gain", if (flac_find_float_comment(block, "replaygain_album_gain",
&rgi->tuples[REPLAY_GAIN_ALBUM].gain) || &rgi->tuples[REPLAY_GAIN_ALBUM].gain))
flac_find_float_comment(block, "replaygain_album_peak", found = true;
&rgi->tuples[REPLAY_GAIN_ALBUM].peak) || if (flac_find_float_comment(block, "replaygain_album_peak",
flac_find_float_comment(block, "replaygain_track_gain", &rgi->tuples[REPLAY_GAIN_ALBUM].peak))
&rgi->tuples[REPLAY_GAIN_TRACK].gain) || found = true;
flac_find_float_comment(block, "replaygain_track_peak", if (flac_find_float_comment(block, "replaygain_track_gain",
&rgi->tuples[REPLAY_GAIN_TRACK].peak); &rgi->tuples[REPLAY_GAIN_TRACK].gain))
found = true;
if (flac_find_float_comment(block, "replaygain_track_peak",
&rgi->tuples[REPLAY_GAIN_TRACK].peak))
found = true;
if (!found) { if (!found) {
replay_gain_info_free(rgi); replay_gain_info_free(rgi);
rgi = NULL; rgi = NULL;
......
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