oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fix crossfading issue with ogg

Browse Source 
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
This commit is contained in:
Warren Dukes
2004-03-05 16:02:47 +00:00
parent 8b214b7c8c
commit 09efb14dbb
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/decode.c
View File

@@ -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];