diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-25 19:09:22 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-25 19:12:38 +0200 |
| commit | 6d475c40de567d778fa6f96c379687a8bf83f82b (patch) | |
| tree | 6302688c49ab48a514b593812688610ca9da2b75 /src/decoder/WavpackDecoderPlugin.cxx | |
| parent | ed7891bf014c5085240361d605a0eaf24f74e7df (diff) | |
| download | mpd-6d475c40de567d778fa6f96c379687a8bf83f82b.tar.gz mpd-6d475c40de567d778fa6f96c379687a8bf83f82b.tar.xz mpd-6d475c40de567d778fa6f96c379687a8bf83f82b.zip | |
ReplayGainInfo: use CamelCase for struct name
Diffstat (limited to 'src/decoder/WavpackDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/WavpackDecoderPlugin.cxx | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx index 2275e5a91..62934713f 100644 --- a/src/decoder/WavpackDecoderPlugin.cxx +++ b/src/decoder/WavpackDecoderPlugin.cxx @@ -221,29 +221,21 @@ wavpack_tag_float(WavpackContext *wpc, const char *key, float *value_r) } static bool -wavpack_replaygain(struct replay_gain_info *replay_gain_info, +wavpack_replaygain(ReplayGainInfo &rgi, WavpackContext *wpc) { bool found = false; - replay_gain_info_init(replay_gain_info); - - found |= wavpack_tag_float( - wpc, "replaygain_track_gain", - &replay_gain_info->tuples[REPLAY_GAIN_TRACK].gain - ); - found |= wavpack_tag_float( - wpc, "replaygain_track_peak", - &replay_gain_info->tuples[REPLAY_GAIN_TRACK].peak - ); - found |= wavpack_tag_float( - wpc, "replaygain_album_gain", - &replay_gain_info->tuples[REPLAY_GAIN_ALBUM].gain - ); - found |= wavpack_tag_float( - wpc, "replaygain_album_peak", - &replay_gain_info->tuples[REPLAY_GAIN_ALBUM].peak - ); + replay_gain_info_init(&rgi); + + found |= wavpack_tag_float(wpc, "replaygain_track_gain", + &rgi.tuples[REPLAY_GAIN_TRACK].gain); + found |= wavpack_tag_float(wpc, "replaygain_track_peak", + &rgi.tuples[REPLAY_GAIN_TRACK].peak); + found |= wavpack_tag_float(wpc, "replaygain_album_gain", + &rgi.tuples[REPLAY_GAIN_ALBUM].gain); + found |= wavpack_tag_float(wpc, "replaygain_album_peak", + &rgi.tuples[REPLAY_GAIN_ALBUM].peak); return found; } @@ -547,9 +539,9 @@ wavpack_filedecode(Decoder &decoder, const char *fname) return; } - struct replay_gain_info replay_gain_info; - if (wavpack_replaygain(&replay_gain_info, wpc)) - decoder_replay_gain(decoder, &replay_gain_info); + ReplayGainInfo rgi; + if (wavpack_replaygain(rgi, wpc)) + decoder_replay_gain(decoder, &rgi); wavpack_decode(decoder, wpc, true); |