fix crossfading issue with ogg

problem was, ov_read doesn't always fill to CHUNK_SIZE
and we were moving chunk on every ov_read, instead now we only
dump the buffer when its full

git-svn-id: https://svn.musicpd.org/mpd/trunk@206 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 3 insertions, 6 deletions

diff --git a/src/decode.c b/src/decode.c
index b1c0bb012..ce2629f5f 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -345,7 +345,7 @@ void decode() {
 			else if((cb->begin!=cb->end || cb->wrap) && 
 				cb->begin!=cb->next)
 			{
-				if(doCrossFade==1 && cb->next>=0 && 
+				if(doCrossFade==1 && cb->next>=0 &&
 					((cb->next>cb->begin && 
 					(fadePosition=cb->next-cb->begin)
 					<=crossFadeChunks) || 
@@ -356,9 +356,9 @@ void decode() {
 					if(nextChunk<0) {
 						crossFadeChunks = fadePosition;
 					}
-					nextChunk = cb->begin+crossFadeChunks;
 					test = cb->end;
 					if(cb->wrap) test+=buffered_chunks;
+					nextChunk = cb->begin+crossFadeChunks;
 					if(nextChunk<test) {
 						if(nextChunk>=buffered_chunks)
 						{
@@ -390,10 +390,7 @@ void decode() {
 						{
 							doCrossFade = -1;
 						}
-						else {
-							usleep(10);
-							continue;
-						}
+						else continue;
 					}
 				}
 				pc->elapsedTime = cb->times[cb->begin];