diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:16:32 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:16:32 +0000 |
| commit | f275a1a1abf353873ce85c5c66b2be7c51d317a5 (patch) | |
| tree | d4be50e4a404dbcf7d6ba405ad3b7e91671c4ad0 /src/decode.c | |
| parent | 4e4441fd32e694753824a543c050e5d3c0b49a5a (diff) | |
| download | mpd-f275a1a1abf353873ce85c5c66b2be7c51d317a5.tar.gz mpd-f275a1a1abf353873ce85c5c66b2be7c51d317a5.tar.xz mpd-f275a1a1abf353873ce85c5c66b2be7c51d317a5.zip | |
Fix a few more warnings from -Wshadow
git-svn-id: https://svn.musicpd.org/mpd/trunk@7300 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/decode.c')
| -rw-r--r-- | src/decode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/decode.c b/src/decode.c index fea4f8b8b..7d292726d 100644 --- a/src/decode.c +++ b/src/decode.c @@ -401,7 +401,7 @@ static int playChunk(PlayerControl * pc, OutputBufferChunk * chunk, static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) { - int pause = 0; + int do_pause = 0; int buffering = 1; unsigned int bbp = buffered_before_play; /** cross fading enabled for the current song? 0=must check; @@ -428,7 +428,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * while (1) { processDecodeInput(pc, dc, cb, - &pause, &bbp, &doCrossFade, + &do_pause, &bbp, &doCrossFade, &decodeWaitedOn, &next); if (pc->stop) { dropBufferedAudio(); @@ -461,7 +461,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * } else { player_wakeup_decoder(); } - if (pause) { + if (do_pause) { dropBufferedAudio(); closeAudioDevice(); } @@ -519,7 +519,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * race conditions and weirdness */ end = cb->end; - if (pause) + if (do_pause) player_sleep(); else if (!outputBufferEmpty(cb) && cb->begin != next) { OutputBufferChunk *beginChunk = |