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

moved code to crossFade()

Browse Source 
Calling crossFade() with the chunk objects is easier than unrolling
all the chunk properties manually, and decodeParent() can really use
more of these simplifications.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7271 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann 2008-04-12 04:13:36 +00:00 committed by Eric Wong
parent bc20b64302
commit 9760325ee6
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/decode.c
View File

@ -359,6 +359,21 @@ static void advanceOutputBufferTo(OutputBuffer * cb, int to)
cb->begin = to;
}
static void crossFade(OutputBufferChunk * a, OutputBufferChunk * b,
AudioFormat * format,
int fadePosition, int crossFadeChunks)
{
pcm_mix(a->data,
b->data,
a->chunkSize,
b->chunkSize,
format,
((float)fadePosition) /
crossFadeChunks);
if (b->chunkSize > a->chunkSize)
a->chunkSize = b->chunkSize;
}
static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb)
{
int pause = 0;
@ -508,21 +523,11 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
}
nextChunk = outputBufferAbsolute(cb, crossFadeChunks);
if (nextChunk >= 0) {
OutputBufferChunk *fadeChunk =
outputBufferGetChunk(cb, nextChunk);
pcm_mix(beginChunk->data,
fadeChunk->data,
beginChunk->chunkSize,
fadeChunk->chunkSize,
&(cb->audioFormat),
((float)fadePosition) /
crossFadeChunks);
if (fadeChunk->chunkSize >
beginChunk->chunkSize
) {
beginChunk->chunkSize
= fadeChunk->chunkSize;
}
crossFade(beginChunk,
outputBufferGetChunk(cb, nextChunk),
&(cb->audioFormat),
fadePosition,
crossFadeChunks);
} else {
/* there are not enough
decoded chunks yet */