continue main loop instead of nesting loops

To unify the decoderParent() main loop some more, use it to wait for the decoder to change the song. Only one single processDecodeInput() caller left after this patch. git-svn-id: https://svn.musicpd.org/mpd/trunk@7273 09075e82-0dd4-0310-85a5-a0d7c8717e4f

continue main loop instead of nesting loops
11a5728e · Max Kellermann · Eric Wong · f25ff426 · 11a5728e
Commit 11a5728e authored Apr 12, 2008 by Max Kellermann Committed by Eric Wong Apr 12, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 13 deletions

decode.c src/decode.c +5 -13

No files found.
--- a/src/decode.c
+++ b/src/decode.c
@@ -574,20 +574,13 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 					advanceOutputBufferTo(cb, nextChunk);
 			}
-			/* wait for the decoder to work on the new song */
+			doCrossFade = 0;
-			while (pc->queueState == PLAYER_QUEUE_DECODE ||
-			       pc->queueLockState == PLAYER_QUEUE_LOCKED) {
-				processDecodeInput(pc, dc, cb,
-						   &pause, &bbp, &doCrossFade,
-						   &decodeWaitedOn,
-						   &next);
-				if (pc->stop) {
-					dropBufferedAudio();
-					quitDecode(pc,dc);
-					return;
-				}
+			/* wait for the decoder to work on the new song */
+			if (pc->queueState == PLAYER_QUEUE_DECODE ||
+			    pc->queueLockState == PLAYER_QUEUE_LOCKED) {
 				player_sleep();
+				continue;
 			}
 			if (pc->queueState != PLAYER_QUEUE_PLAY)
 				break;
@@ -596,7 +589,6 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 			if (waitOnDecode(pc, dc, cb, &decodeWaitedOn) < 0)
 				return;
-			doCrossFade = 0;
 			pc->queueState = PLAYER_QUEUE_EMPTY;
 			wakeup_main_task();
 		} else if (dc->state == DECODE_STATE_STOP && !dc->start) {