Couple more tiny changes. :)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15639 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
18330a050c
commit
88c4748a4b
1 changed files with 4 additions and 3 deletions
|
@ -680,7 +680,7 @@ static size_t crossfade_fade_mix(int factor, const char *buf, size_t fade_rem)
|
||||||
|
|
||||||
while (fade_rem)
|
while (fade_rem)
|
||||||
{
|
{
|
||||||
int sample = *input_buf++;
|
int32_t sample = *input_buf++;
|
||||||
sample = ((sample * factor) >> 8) + *output_buf;
|
sample = ((sample * factor) >> 8) + *output_buf;
|
||||||
*output_buf++ = clip_sample_16(sample);
|
*output_buf++ = clip_sample_16(sample);
|
||||||
fade_rem -= 2;
|
fade_rem -= 2;
|
||||||
|
@ -1050,8 +1050,9 @@ void pcmbuf_mix_voice(int count)
|
||||||
|
|
||||||
count <<= 1;
|
count <<= 1;
|
||||||
|
|
||||||
while (count-- > 0) {
|
while (count-- > 0)
|
||||||
int sample = *ibuf++;
|
{
|
||||||
|
int32_t sample = *ibuf++;
|
||||||
if (pcmbuf_mix_sample >= chunk_samples)
|
if (pcmbuf_mix_sample >= chunk_samples)
|
||||||
{
|
{
|
||||||
pcmbuf_mix_chunk = pcmbuf_mix_chunk->link;
|
pcmbuf_mix_chunk = pcmbuf_mix_chunk->link;
|
||||||
|
|
Loading…
Reference in a new issue