From 644d073652924a78b065fe10d4fbde1261b597cd Mon Sep 17 00:00:00 2001 From: Miika Pekkarinen Date: Mon, 20 Jun 2005 12:40:30 +0000 Subject: Crossfade adjustments. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6777 a1c6a512-1295-4272-9138-f99709370657 --- firmware/pcm_playback.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index fcbdb35..758c147 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c @@ -48,7 +48,7 @@ #define NUM_PCM_BUFFERS (PCMBUF_SIZE / CHUNK_SIZE) #define NUM_PCM_BUFFERS_MASK (NUM_PCM_BUFFERS - 1) #define PCM_WATERMARK (CHUNK_SIZE * 4) -#define PCM_CF_WATERMARK (PCMBUF_SIZE - CHUNK_SIZE*4) +#define PCM_CF_WATERMARK (PCMBUF_SIZE - CHUNK_SIZE*8) static bool pcm_playing; static bool pcm_paused; @@ -223,6 +223,7 @@ void pcm_play_data(const unsigned char* start, int size, void pcm_play_stop(void) { + crossfade_active = false; pcm_set_boost_mode(false); if (pcm_playing) { uda1380_enable_output(false); -- cgit v1.1