summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-06-20 12:40:30 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-06-20 12:40:30 +0000
commit644d073652924a78b065fe10d4fbde1261b597cd (patch)
treeb075efde0a68dd8e546a44817dc403a1b9629435 /firmware
parentcdcd651e7d3e52dbf484a2b8fc1ac8e1a91ca8a5 (diff)
downloadrockbox-644d073652924a78b065fe10d4fbde1261b597cd.tar.gz
rockbox-644d073652924a78b065fe10d4fbde1261b597cd.zip
Crossfade adjustments.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6777 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 fcbdb355b7..758c14782a 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);