moved the initial buffering code into the big loop

Eliminating some duplicated and. This also decreases the number of lines calling processDecodeInput(). git-svn-id: https://svn.musicpd.org/mpd/trunk@7260 09075e82-0dd4-0310-85a5-a0d7c8717e4f

moved the initial buffering code into the big loop
b89b0197 · Max Kellermann · Eric Wong · aaebd9ef · b89b0197
Commit b89b0197 authored 16 years ago by Max Kellermann Committed by Eric Wong 16 years ago
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 12 deletions

decode.c src/decode.c +9 -12

No files found.
--- a/src/decode.c
+++ b/src/decode.c
@@ -365,6 +365,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 {
 	int pause = 0;
 	int quit = 0;
+	int buffering = 1;
 	unsigned int bbp = buffered_before_play;
 	/** cross fading enabled for the current song? 0=must check;
 	    1=enabled; -1=disabled */
@@ -390,8 +391,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 	pc->play = 0;
 	wakeup_main_task();
-	while (availableOutputBuffer(cb) < bbp &&
+	while (!quit) {
-	       dc->state != DECODE_STATE_STOP) {
 		processDecodeInput(pc, dc, cb,
 				   &pause, &bbp, &doCrossFade,
 				   &nextChunk, &decodeWaitedOn, &next);
@@ -401,17 +401,14 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 			return;
 		}
+		if (buffering) {
+			if (availableOutputBuffer(cb) < bbp) {
+				/* not enough decoded buffer space yet */
 				player_sleep();
-	}
+				continue;
+			} else
-	while (!quit) {
+				/* buffering is complete */
-		processDecodeInput(pc, dc, cb,
+				buffering = 0;
-				   &pause, &bbp, &doCrossFade,
-				   &nextChunk, &decodeWaitedOn, &next);
-		if (pc->stop) {
-			dropBufferedAudio();
-			quitDecode(pc,dc);
-			return;
 		}
 		if (decodeWaitedOn) {