summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-11-16 14:34:15 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-11-16 14:34:15 +0000
commit18330a050c282c67966e4bc35308d2373d506286 (patch)
tree7f901cda3620c8260f018abb186a995413096776 /apps
parent869a7e7ca67332c358c96c3b6ac591ee062528c0 (diff)
downloadrockbox-18330a050c282c67966e4bc35308d2373d506286.tar.gz
rockbox-18330a050c282c67966e4bc35308d2373d506286.tar.bz2
rockbox-18330a050c282c67966e4bc35308d2373d506286.zip
Missed a couple changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15638 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/pcmbuf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 1a2324baaf..b887264997 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -708,7 +708,7 @@ static size_t crossfade_mix(const char *buf, size_t length)
while (length)
{
- int sample = *input_buf++ + *output_buf;
+ int32_t sample = *input_buf++ + *output_buf;
*output_buf++ = clip_sample_16(sample);
length -= 2;
@@ -717,7 +717,7 @@ static size_t crossfade_mix(const char *buf, size_t length)
crossfade_chunk = crossfade_chunk->link;
if (!crossfade_chunk)
return length;
- output_buf = (int16_t *)(crossfade_chunk->addr);
+ output_buf = (int16_t *)crossfade_chunk->addr;
chunk_end = SKIPBYTES(output_buf, crossfade_chunk->size);
}
}
@@ -1046,7 +1046,7 @@ void pcmbuf_mix_voice(int count)
return;
obuf = (int16_t *)pcmbuf_mix_chunk->addr;
- chunk_samples = pcmbuf_mix_chunk->size / 2;
+ chunk_samples = pcmbuf_mix_chunk->size / sizeof (int16_t);
count <<= 1;