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

pass max_chunks to calculateCrossFadeChunks()

Browse Source 
Make calculateCrossFadeChunks() more generic and portable by
eliminating global variable access.
This commit is contained in:
Max Kellermann
2008-08-26 08:27:09 +02:00
parent 0fc2422cd0
commit 0aedf7dd5a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/decode.c
View File

@@ -64,9 +64,10 @@ static void quitDecode(void)
wakeup_main_task();
}
static unsigned calculateCrossFadeChunks(AudioFormat * af, float totalTime)
static unsigned calculateCrossFadeChunks(AudioFormat * af,
float totalTime, unsigned max_chunks)
{
unsigned int buffered_chunks, chunks;
unsigned int chunks;
if (pc.crossFade == 0 || pc.crossFade >= totalTime ||
!isCurrentAudioFormat(af))
@@ -80,10 +81,8 @@ static unsigned calculateCrossFadeChunks(AudioFormat * af, float totalTime)
chunks = (af->sampleRate * af->bits * af->channels / 8.0 / CHUNK_SIZE);
chunks = (chunks * pc.crossFade + 0.5);
buffered_chunks = ob.size;
assert(buffered_chunks >= buffered_before_play);
if (chunks > (buffered_chunks - buffered_before_play))
chunks = buffered_chunks - buffered_before_play;
if (chunks > max_chunks)
chunks = max_chunks;
return chunks;
}
@@ -500,7 +499,9 @@ static void decodeParent(void)
for it */
crossFadeChunks =
calculateCrossFadeChunks(&(ob.audioFormat),
dc.totalTime);
dc.totalTime,
ob.size -
buffered_before_play);
if (crossFadeChunks > 0) {
do_xfade = XFADE_ENABLED;
nextChunk = -1;