diff options
| author | Max Kellermann <max@duempel.org> | 2008-01-26 12:46:21 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-01-26 12:46:21 +0000 |
| commit | 07adb14e3c4daa8b1e6ebc69e54128b38b014d30 (patch) | |
| tree | 7d22b4b2eb31a9bf46cf648731fe1370005ab1c9 /src/inputPlugins/mp3_plugin.c | |
| parent | 28008e697720bb2b11989bb887eb468b91409b1a (diff) | |
| download | mpd-07adb14e3c4daa8b1e6ebc69e54128b38b014d30.tar.gz mpd-07adb14e3c4daa8b1e6ebc69e54128b38b014d30.tar.xz mpd-07adb14e3c4daa8b1e6ebc69e54128b38b014d30.zip | |
fixed -Wshadow warnings
Signed-off-by: Eric Wong <normalperson@yhbt.net>
git-svn-id: https://svn.musicpd.org/mpd/trunk@7143 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
| -rw-r--r-- | src/inputPlugins/mp3_plugin.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c index 9bb3f2f4b..2d101f616 100644 --- a/src/inputPlugins/mp3_plugin.c +++ b/src/inputPlugins/mp3_plugin.c @@ -69,7 +69,7 @@ static signed long audio_linear_dither(unsigned int bits, mad_fixed_t sample, struct audio_dither *dither) { unsigned int scalebits; - mad_fixed_t output, mask, random; + mad_fixed_t output, mask, rnd; enum { MIN = -MAD_F_ONE, @@ -86,10 +86,10 @@ static signed long audio_linear_dither(unsigned int bits, mad_fixed_t sample, scalebits = MAD_F_FRACBITS + 1 - bits; mask = (1L << scalebits) - 1; - random = prng(dither->random); - output += (random & mask) - (dither->random & mask); + rnd = prng(dither->random); + output += (rnd & mask) - (dither->random & mask); - dither->random = random; + dither->random = rnd; if (output > MAX) { output = MAX; @@ -1093,16 +1093,16 @@ static int mp3_decode(OutputBuffer * cb, DecoderControl * dc, static MpdTag *mp3_tagDup(char *file) { MpdTag *ret = NULL; - int time; + int total_time; ret = id3Dup(file); - time = getMp3TotalTime(file); + total_time = getMp3TotalTime(file); - if (time >= 0) { + if (total_time >= 0) { if (!ret) ret = newMpdTag(); - ret->time = time; + ret->time = total_time; } else { DEBUG("mp3_tagDup: Failed to get total song time from: %s\n", file); |