aboutsummaryrefslogtreecommitdiffstats
path: root/src/audio.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-01-26 12:46:21 +0000
committerEric Wong <normalperson@yhbt.net>2008-01-26 12:46:21 +0000
commit07adb14e3c4daa8b1e6ebc69e54128b38b014d30 (patch)
tree7d22b4b2eb31a9bf46cf648731fe1370005ab1c9 /src/audio.c
parent28008e697720bb2b11989bb887eb468b91409b1a (diff)
downloadmpd-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 'src/audio.c')
-rw-r--r--src/audio.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/audio.c b/src/audio.c
index 07183d1ea..145e6be3c 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -360,16 +360,16 @@ int openAudioDevice(AudioFormat * audioFormat)
int playAudio(const char *playChunk, int size)
{
- int send;
+ int send_size;
while (size > 0) {
- send = audioBufferSize - audioBufferPos;
- send = send < size ? send : size;
+ send_size = audioBufferSize - audioBufferPos;
+ send_size = send_size < size ? send_size : size;
- memcpy(audioBuffer + audioBufferPos, playChunk, send);
- audioBufferPos += send;
- size -= send;
- playChunk += send;
+ memcpy(audioBuffer + audioBufferPos, playChunk, send_size);
+ audioBufferPos += send_size;
+ size -= send_size;
+ playChunk += send_size;
if (audioBufferPos == audioBufferSize) {
if (flushAudioBuffer() < 0)