diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2012-02-05 22:48:47 -0500 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2012-02-05 22:48:47 -0500 |
| commit | 43e6d7aef833b894780981eaceda35424c2186e8 (patch) | |
| tree | aac7b18a73d0e4822aa0175d4c8f8f51695aa1b3 /firmware/asm/pcm-mixer.c | |
| parent | 691c7a76148d3e8f46c98add6d0b78666b503e96 (diff) | |
| download | rockbox-43e6d7aef833b894780981eaceda35424c2186e8.tar.gz rockbox-43e6d7aef833b894780981eaceda35424c2186e8.zip | |
Urgh...actually change all the stuff I'm supposed to.
Goofed a couple fn params.
Change-Id: I2474d10fe08d2629ada54c83e201ee91c596d854
Diffstat (limited to 'firmware/asm/pcm-mixer.c')
| -rw-r--r-- | firmware/asm/pcm-mixer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/asm/pcm-mixer.c b/firmware/asm/pcm-mixer.c index bedaa4c7cb..62dfa3e9db 100644 --- a/firmware/asm/pcm-mixer.c +++ b/firmware/asm/pcm-mixer.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include "dsp-util.h" /* for clip_sample_16 */ | 28 | #include "dsp-util.h" /* for clip_sample_16 */ |
| 29 | /* Mix channels' samples and apply gain factors */ | 29 | /* Mix channels' samples and apply gain factors */ |
| 30 | static FORCE_INLINE void mix_samples(uint16_t *out, | 30 | static FORCE_INLINE void mix_samples(int16_t *out, |
| 31 | int16_t *src0, | 31 | int16_t *src0, |
| 32 | int32_t src0_amp, | 32 | int32_t src0_amp, |
| 33 | int16_t *src1, | 33 | int16_t *src1, |
| @@ -83,7 +83,7 @@ static FORCE_INLINE void mix_samples(uint16_t *out, | |||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | /* Write channel's samples and apply gain factor */ | 85 | /* Write channel's samples and apply gain factor */ |
| 86 | static FORCE_INLINE void write_samples(uint32_t *out, | 86 | static FORCE_INLINE void write_samples(int16_t *out, |
| 87 | int16_t *src, | 87 | int16_t *src, |
| 88 | int32_t amp, | 88 | int32_t amp, |
| 89 | size_t size) | 89 | size_t size) |