added outputBufferEmpty()

Another "don't use OutputBuffer internals" patch. This ignores the copied "end" value, but I do not think that has ever been a real issue. git-svn-id: https://svn.musicpd.org/mpd/trunk@7263 09075e82-0dd4-0310-85a5-a0d7c8717e4f

added outputBufferEmpty()
50dc380f · Max Kellermann · Eric Wong · e626028b · 50dc380f · 50dc380f
Commit 50dc380f authored Apr 12, 2008 by Max Kellermann Committed by Eric Wong Apr 12, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

decode.c src/decode.c +2 -2

outputBuffer.c src/outputBuffer.c +5 -0

outputBuffer.h src/outputBuffer.h +3 -0

No files found.
--- a/src/decode.c
+++ b/src/decode.c
@@ -493,7 +493,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *

 		if (pause)
 			player_sleep();
-		else if (cb->begin != end && cb->begin != next) {
+		else if (!outputBufferEmpty(cb) && cb->begin != next) {
 			unsigned int fadePosition;
 			if (doCrossFade == 1 && next >= 0 &&
 			    ((next > cb->begin &&
@@ -562,7 +562,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
 			} else
 				cb->begin++;
 			player_wakeup_decoder_nb();
-		} else if (cb->begin != end && cb->begin == next) {
+		} else if (!outputBufferEmpty(cb) && cb->begin == next) {
 			/* at the beginning of a new song */

 			if (doCrossFade == 1 && nextChunk >= 0) {

--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -57,6 +57,11 @@ void flushOutputBuffer(OutputBuffer * cb)
 	}
 }

+int outputBufferEmpty(const OutputBuffer * cb)
+{
+	return cb->begin == cb->end;
+}
+
 unsigned availableOutputBuffer(const OutputBuffer * cb)
 {
 	if (cb->end >= cb->begin)

--- a/src/outputBuffer.h
+++ b/src/outputBuffer.h
@@ -55,6 +55,9 @@ void clearOutputBuffer(OutputBuffer * cb);

 void flushOutputBuffer(OutputBuffer * cb);

+/** is the buffer empty? */
+int outputBufferEmpty(const OutputBuffer * cb);
+
 /** determine the number of decoded chunks */
 unsigned availableOutputBuffer(const OutputBuffer * cb);