summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-04-23 05:30:52 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-04-23 05:30:52 +0000
commit920516c3e9fe6081a634056aea7b90428b60e3ef (patch)
tree49438e7821f3a5271886be0763260a40c39e68a0
parentf932cf6f0d5e1cffdc78c6488b3555cf83317f0d (diff)
downloadrockbox-920516c3e9fe6081a634056aea7b90428b60e3ef.tar.gz
rockbox-920516c3e9fe6081a634056aea7b90428b60e3ef.tar.bz2
rockbox-920516c3e9fe6081a634056aea7b90428b60e3ef.zip
Whoops, forgot to 'duck' the music below the voice when I redid the mix
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9772 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/pcmbuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 85a23e78bd..0c12790389 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -947,7 +947,7 @@ void pcmbuf_mix_voice(size_t length)
obuf = pcmbuf_mix_chunk->addr;
chunk_samples = pcmbuf_mix_chunk->size / 2;
}
- sample += obuf[pcmbuf_mix_sample];
+ sample += obuf[pcmbuf_mix_sample] >> 2;
obuf[pcmbuf_mix_sample++] = MIN(MAX(sample, -32768), 32767);
}
}