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

Fix a few more warnings from -Wshadow

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@7300 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong
2008-04-12 04:16:32 +00:00
parent 4e4441fd32
commit f275a1a1ab
7 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/decode.c
View File

@@ -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 =