Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Missed a couple changes

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15638 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-11-16 14:34:15 +00:00
parent 869a7e7ca6
commit 18330a050c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/pcmbuf.c
View file

@ -708,7 +708,7 @@ static size_t crossfade_mix(const char *buf, size_t length)
while (length) while (length)
{ {
int sample = *input_buf++ + *output_buf; int32_t sample = *input_buf++ + *output_buf;
*output_buf++ = clip_sample_16(sample); *output_buf++ = clip_sample_16(sample);
length -= 2; length -= 2;
@ -717,7 +717,7 @@ static size_t crossfade_mix(const char *buf, size_t length)
crossfade_chunk = crossfade_chunk->link; crossfade_chunk = crossfade_chunk->link;
if (!crossfade_chunk) if (!crossfade_chunk)
return length; return length;
output_buf = (int16_t *)(crossfade_chunk->addr); output_buf = (int16_t *)crossfade_chunk->addr;
chunk_end = SKIPBYTES(output_buf, crossfade_chunk->size); chunk_end = SKIPBYTES(output_buf, crossfade_chunk->size);
} }
} }
@ -1046,7 +1046,7 @@ void pcmbuf_mix_voice(int count)
return; return;
obuf = (int16_t *)pcmbuf_mix_chunk->addr; 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; count <<= 1;