From e9b7aae3f070ded65ecc914f0684562bc53a2c56 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 12 Apr 2008 04:13:00 +0000
Subject: do not reset nextChunk

The variables "nextChunk" and "crossFadeChunks" are only used when
doCrossFade==1.  This means that we do not have to reset these as long
as doCrossFade!=1.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7265 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/decode.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/decode.c')

diff --git a/src/decode.c b/src/decode.c
index 55f272303..96f738bcc 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -157,7 +157,6 @@ static void processDecodeInput(PlayerControl * pc, DecoderControl * dc,
 			       OutputBuffer * cb,
 			       int *pause_r, unsigned int *bbp_r,
 			       int *doCrossFade_r,
-			       int *nextChunk_r,
 			       int *decodeWaitedOn_r,
 			       int *next_r)
 {
@@ -201,7 +200,6 @@ static void processDecodeInput(PlayerControl * pc, DecoderControl * dc,
 		dropBufferedAudio();
 		if(decodeSeek(pc,dc,cb,decodeWaitedOn_r,next_r) == 0) {
 			*doCrossFade_r = 0;
-			*nextChunk_r =  -1;
 			*bbp_r = 0;
 		}
 	}
@@ -370,10 +368,10 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 	/** cross fading enabled for the current song? 0=must check;
 	    1=enabled; -1=disabled */
 	int doCrossFade = 0;
-	unsigned int crossFadeChunks = 0;
+	unsigned int crossFadeChunks;
 	/** the position of the next cross-faded chunk in the next
 	    song */
-	int nextChunk = -1;
+	int nextChunk;
 	int decodeWaitedOn = 0;
 	static const char silence[CHUNK_SIZE];
 	double sizeToTime = 0.0;
@@ -392,7 +390,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 	while (!quit) {
 		processDecodeInput(pc, dc, cb,
 				   &pause, &bbp, &doCrossFade,
-				   &nextChunk, &decodeWaitedOn, &next);
+				   &decodeWaitedOn, &next);
 		if (pc->stop) {
 			dropBufferedAudio();
 			quitDecode(pc,dc);
@@ -469,9 +467,9 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 			/* enable cross fading in this song?  if yes,
 			   calculate how many chunks will be required
 			   for it */
-			nextChunk = -1;
 			if (isCurrentAudioFormat(&(cb->audioFormat))) {
 				doCrossFade = 1;
+				nextChunk = -1;
 				crossFadeChunks =
 				    calculateCrossFadeChunks(pc,
 							     &(cb->
@@ -575,7 +573,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 			       pc->queueLockState == PLAYER_QUEUE_LOCKED) {
 				processDecodeInput(pc, dc, cb,
 						   &pause, &bbp, &doCrossFade,
-						   &nextChunk, &decodeWaitedOn,
+						   &decodeWaitedOn,
 						   &next);
 				if (pc->stop) {
 					dropBufferedAudio();
@@ -592,9 +590,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 			if (waitOnDecode(pc, dc, cb, &decodeWaitedOn) < 0)
 				return;
 
-			nextChunk = -1;
 			doCrossFade = 0;
-			crossFadeChunks = 0;
 			pc->queueState = PLAYER_QUEUE_EMPTY;
 			wakeup_main_task();
 		} else if (dc->state == DECODE_STATE_STOP && !dc->start) {
-- 
cgit v1.2.3