diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-11-16 14:49:17 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-11-16 14:49:17 +0000 |
commit | 88c4748a4b93b6dcf0a8288c030bf93ae571ce5e (patch) | |
tree | a111ce1d77f9ec804418a9fbdc6bb61860bef91d /apps | |
parent | 18330a050c282c67966e4bc35308d2373d506286 (diff) | |
download | rockbox-88c4748a4b93b6dcf0a8288c030bf93ae571ce5e.tar.gz rockbox-88c4748a4b93b6dcf0a8288c030bf93ae571ce5e.zip |
Couple more tiny changes. :)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15639 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/pcmbuf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c index b887264997..49333d108b 100644 --- a/apps/pcmbuf.c +++ b/apps/pcmbuf.c | |||
@@ -680,7 +680,7 @@ static size_t crossfade_fade_mix(int factor, const char *buf, size_t fade_rem) | |||
680 | 680 | ||
681 | while (fade_rem) | 681 | while (fade_rem) |
682 | { | 682 | { |
683 | int sample = *input_buf++; | 683 | int32_t sample = *input_buf++; |
684 | sample = ((sample * factor) >> 8) + *output_buf; | 684 | sample = ((sample * factor) >> 8) + *output_buf; |
685 | *output_buf++ = clip_sample_16(sample); | 685 | *output_buf++ = clip_sample_16(sample); |
686 | fade_rem -= 2; | 686 | fade_rem -= 2; |
@@ -1050,8 +1050,9 @@ void pcmbuf_mix_voice(int count) | |||
1050 | 1050 | ||
1051 | count <<= 1; | 1051 | count <<= 1; |
1052 | 1052 | ||
1053 | while (count-- > 0) { | 1053 | while (count-- > 0) |
1054 | int sample = *ibuf++; | 1054 | { |
1055 | int32_t sample = *ibuf++; | ||
1055 | if (pcmbuf_mix_sample >= chunk_samples) | 1056 | if (pcmbuf_mix_sample >= chunk_samples) |
1056 | { | 1057 | { |
1057 | pcmbuf_mix_chunk = pcmbuf_mix_chunk->link; | 1058 | pcmbuf_mix_chunk = pcmbuf_mix_chunk->link; |