diff options
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/mixer.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_c.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_defs.h | 10 | ||||
| -rw-r--r-- | Alc/mixer_inc.c | 4 | ||||
| -rw-r--r-- | Alc/mixer_sse.c | 4 |
5 files changed, 10 insertions, 16 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c index dc66577e..f75a7803 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -330,8 +330,8 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo) Filter2P(&directparms->iirFilter, chan, SrcData, ResampledData, DstBufferSize); - Source->Params.DryMix(Device, directparms, SrcData, chan, - OutPos, SamplesToDo, DstBufferSize); + Source->Params.DryMix(directparms, SrcData, chan, OutPos, + SamplesToDo, DstBufferSize); } for(j = 0;j < Device->NumAuxSends;j++) diff --git a/Alc/mixer_c.c b/Alc/mixer_c.c index a0a7b4d0..9283c8e9 100644 --- a/Alc/mixer_c.c +++ b/Alc/mixer_c.c @@ -83,8 +83,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2], #undef SUFFIX -void MixDirect_C(ALCdevice *Device, DirectParams *params, - const ALfloat *RESTRICT data, ALuint srcchan, +void MixDirect_C(DirectParams *params, const ALfloat *RESTRICT data, ALuint srcchan, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) { ALfloat (*RESTRICT DryBuffer)[BUFFERSIZE] = params->OutBuffer; @@ -93,7 +92,6 @@ void MixDirect_C(ALCdevice *Device, DirectParams *params, ALfloat DrySend; ALuint pos; ALuint c; - (void)Device; for(c = 0;c < MaxChannels;c++) { diff --git a/Alc/mixer_defs.h b/Alc/mixer_defs.h index 47c2d6f4..1f9bc0b4 100644 --- a/Alc/mixer_defs.h +++ b/Alc/mixer_defs.h @@ -16,16 +16,16 @@ void Resample_cubic32_C(const ALfloat *src, ALuint frac, ALuint increment, ALflo /* C mixers */ -void MixDirect_Hrtf_C(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); -void MixDirect_C(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); +void MixDirect_Hrtf_C(struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); +void MixDirect_C(struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); void MixSend_C(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint); /* SSE mixers */ -void MixDirect_Hrtf_SSE(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); -void MixDirect_SSE(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); +void MixDirect_Hrtf_SSE(struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); +void MixDirect_SSE(struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); void MixSend_SSE(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint); /* Neon mixers */ -void MixDirect_Hrtf_Neon(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); +void MixDirect_Hrtf_Neon(struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); #endif /* MIXER_DEFS_H */ diff --git a/Alc/mixer_inc.c b/Alc/mixer_inc.c index 1630d5d9..9bbc8fee 100644 --- a/Alc/mixer_inc.c +++ b/Alc/mixer_inc.c @@ -29,8 +29,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2], ALfloat left, ALfloat right); -void MixDirect_Hrtf(ALCdevice *Device, DirectParams *params, - const ALfloat *RESTRICT data, ALuint srcchan, +void MixDirect_Hrtf(DirectParams *params, const ALfloat *RESTRICT data, ALuint srcchan, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) { ALfloat (*RESTRICT DryBuffer)[BUFFERSIZE] = params->OutBuffer; @@ -50,7 +49,6 @@ void MixDirect_Hrtf(ALCdevice *Device, DirectParams *params, ALfloat left, right; ALuint pos; ALuint c; - (void)Device; pos = 0; for(c = 0;c < IrSize;c++) diff --git a/Alc/mixer_sse.c b/Alc/mixer_sse.c index 6ce72cb4..deff3232 100644 --- a/Alc/mixer_sse.c +++ b/Alc/mixer_sse.c @@ -133,8 +133,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2], #undef SUFFIX -void MixDirect_SSE(ALCdevice *Device, DirectParams *params, - const ALfloat *RESTRICT data, ALuint srcchan, +void MixDirect_SSE(DirectParams *params, const ALfloat *RESTRICT data, ALuint srcchan, ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) { ALfloat (*RESTRICT DryBuffer)[BUFFERSIZE] = params->OutBuffer; @@ -143,7 +142,6 @@ void MixDirect_SSE(ALCdevice *Device, DirectParams *params, ALfloat DrySend; ALuint pos; ALuint c; - (void)Device; for(c = 0;c < MaxChannels;c++) { |