summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-07-05 07:25:55 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-07-05 07:25:55 +0000
commitaa30f0483be326d44a6a50bd4d4eabcbe6b5ae8c (patch)
treebea5f8778f55827492538487a6f9c346acc55ee8 /firmware
parent72550d94b6688fa2b00bcf5fb759a1b9adfcad34 (diff)
downloadrockbox-aa30f0483be326d44a6a50bd4d4eabcbe6b5ae8c.tar.gz
rockbox-aa30f0483be326d44a6a50bd4d4eabcbe6b5ae8c.zip
Fixed crossfading.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7022 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/pcm_playback.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index 9e02079d76..298d2e7874 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -431,7 +431,8 @@ bool pcm_is_lowdata(void)
431 431
432bool pcm_crossfade_init(void) 432bool pcm_crossfade_init(void)
433{ 433{
434 if (PCMBUF_SIZE - audiobuffer_free < CHUNK_SIZE * 8 || !crossfade_enabled) { 434 if (PCMBUF_SIZE - audiobuffer_free < CHUNK_SIZE * 8 || !crossfade_enabled
435 || crossfade_active) {
435 return false; 436 return false;
436 } 437 }
437 logf("crossfading!"); 438 logf("crossfading!");