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

ReplayGainInfo: don't use array in struct ReplayGainInfo

Browse Source 
Declare two named elements.  An enum should not be used as an array
index, as this is error prone.
This commit is contained in:
Max Kellermann
2016-11-24 16:45:56 +01:00
parent 1261327fa6
commit 25e58df5e0
9 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@@ -805,8 +805,8 @@ MadDecoder::DecodeFirstFrame(Tag **tag)
lame.track_gain) {
ReplayGainInfo rgi;
rgi.Clear();
rgi.tuples[REPLAY_GAIN_TRACK].gain = lame.track_gain;
rgi.tuples[REPLAY_GAIN_TRACK].peak = lame.peak;
rgi.track.gain = lame.track_gain;
rgi.track.peak = lame.peak;
client->SubmitReplayGain(&rgi);
}
}

8
src/decoder/plugins/MpcdecDecoderPlugin.cxx
View File

@@ -170,10 +170,10 @@ mpcdec_decode(DecoderClient &client, InputStream &is)
ReplayGainInfo rgi;
rgi.Clear();
rgi.tuples[REPLAY_GAIN_ALBUM].gain = MPC_OLD_GAIN_REF - (info.gain_album / 256.);
rgi.tuples[REPLAY_GAIN_ALBUM].peak = pow(10, info.peak_album / 256. / 20) / 32767;
rgi.tuples[REPLAY_GAIN_TRACK].gain = MPC_OLD_GAIN_REF - (info.gain_title / 256.);
rgi.tuples[REPLAY_GAIN_TRACK].peak = pow(10, info.peak_title / 256. / 20) / 32767;
rgi.album.gain = MPC_OLD_GAIN_REF - (info.gain_album / 256.);
rgi.album.peak = pow(10, info.peak_album / 256. / 20) / 32767;
rgi.track.gain = MPC_OLD_GAIN_REF - (info.gain_title / 256.);
rgi.track.peak = pow(10, info.peak_title / 256. / 20) / 32767;
client.SubmitReplayGain(&rgi);

2
src/decoder/plugins/OpusTags.cxx
View File

@@ -52,7 +52,7 @@ ScanOneOpusTag(const char *name, const char *value,
char *endptr;
long l = strtol(value, &endptr, 10);
if (endptr > value && *endptr == 0)
rgi->tuples[REPLAY_GAIN_TRACK].gain = double(l) / 256.;
rgi->track.gain = double(l) / 256.;
}
tag_handler_invoke_pair(handler, ctx, name, value);

8
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@@ -225,13 +225,13 @@ wavpack_replaygain(ReplayGainInfo &rgi,
bool found = false;
found |= wavpack_tag_float(wpc, "replaygain_track_gain",
&rgi.tuples[REPLAY_GAIN_TRACK].gain);
&rgi.track.gain);
found |= wavpack_tag_float(wpc, "replaygain_track_peak",
&rgi.tuples[REPLAY_GAIN_TRACK].peak);
&rgi.track.peak);
found |= wavpack_tag_float(wpc, "replaygain_album_gain",
&rgi.tuples[REPLAY_GAIN_ALBUM].gain);
&rgi.album.gain);
found |= wavpack_tag_float(wpc, "replaygain_album_peak",
&rgi.tuples[REPLAY_GAIN_ALBUM].peak);
&rgi.album.peak);
return found;
}