kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the now-unused Source parameter from the DryMix methods

Browse Source
This commit is contained in:
Chris Robinson 2012-10-14 11:04:36 -07:00
parent 0b679167c9
commit 3240894cd5
6 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Alc/mixer.c
View File

@ -330,8 +330,8 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo)
Filter2P(&directparms->iirFilter, chan, SrcData, ResampledData, Filter2P(&directparms->iirFilter, chan, SrcData, ResampledData,
DstBufferSize); DstBufferSize);
Source->Params.DryMix(Source, Device, directparms, SrcData, Source->Params.DryMix(Device, directparms, SrcData, chan,
chan, OutPos, SamplesToDo, DstBufferSize); OutPos, SamplesToDo, DstBufferSize);
} }
for(j = 0;j < Device->NumAuxSends;j++) for(j = 0;j < Device->NumAuxSends;j++)

3
Alc/mixer_c.c
View File

@ -83,7 +83,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2],
#undef SUFFIX #undef SUFFIX
void MixDirect_C(ALsource *Source, ALCdevice *Device, DirectParams *params, void MixDirect_C(ALCdevice *Device, DirectParams *params,
const ALfloat *RESTRICT data, ALuint srcchan, const ALfloat *RESTRICT data, ALuint srcchan,
ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize)
{ {
@ -93,7 +93,6 @@ void MixDirect_C(ALsource *Source, ALCdevice *Device, DirectParams *params,
ALfloat DrySend; ALfloat DrySend;
ALuint pos; ALuint pos;
ALuint c; ALuint c;
(void)Source;
for(c = 0;c < MaxChannels;c++) for(c = 0;c < MaxChannels;c++)
{ {

11
Alc/mixer_defs.h
View File

@ -5,7 +5,6 @@
#include "AL/al.h" #include "AL/al.h"
#include "alMain.h" #include "alMain.h"
struct ALsource;
struct DirectParams; struct DirectParams;
struct SendParams; struct SendParams;
@ -17,16 +16,16 @@ void Resample_cubic32_C(const ALfloat *src, ALuint frac, ALuint increment, ALflo
/* C mixers */ /* C mixers */
void MixDirect_Hrtf_C(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); void MixDirect_Hrtf_C(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
void MixDirect_C(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); void MixDirect_C(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
void MixSend_C(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint); void MixSend_C(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint);
/* SSE mixers */ /* SSE mixers */
void MixDirect_Hrtf_SSE(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); void MixDirect_Hrtf_SSE(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
void MixDirect_SSE(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); void MixDirect_SSE(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
void MixSend_SSE(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint); void MixSend_SSE(struct SendParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint);
/* Neon mixers */ /* Neon mixers */
void MixDirect_Hrtf_Neon(struct ALsource*,ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint); void MixDirect_Hrtf_Neon(ALCdevice*,struct DirectParams*,const ALfloat*RESTRICT,ALuint,ALuint,ALuint,ALuint);
#endif /* MIXER_DEFS_H */ #endif /* MIXER_DEFS_H */

3
Alc/mixer_inc.c
View File

@ -29,7 +29,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2],
ALfloat left, ALfloat right); ALfloat left, ALfloat right);
void MixDirect_Hrtf(ALsource *Source, ALCdevice *Device, DirectParams *params, void MixDirect_Hrtf(ALCdevice *Device, DirectParams *params,
const ALfloat *RESTRICT data, ALuint srcchan, const ALfloat *RESTRICT data, ALuint srcchan,
ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize)
{ {
@ -50,7 +50,6 @@ void MixDirect_Hrtf(ALsource *Source, ALCdevice *Device, DirectParams *params,
ALfloat left, right; ALfloat left, right;
ALuint pos; ALuint pos;
ALuint c; ALuint c;
(void)Source;
pos = 0; pos = 0;
for(c = 0;c < IrSize;c++) for(c = 0;c < IrSize;c++)

3
Alc/mixer_sse.c
View File

@ -133,7 +133,7 @@ static __inline void ApplyCoeffs(ALuint Offset, ALfloat (*RESTRICT Values)[2],
#undef SUFFIX #undef SUFFIX
void MixDirect_SSE(ALsource *Source, ALCdevice *Device, DirectParams *params, void MixDirect_SSE(ALCdevice *Device, DirectParams *params,
const ALfloat *RESTRICT data, ALuint srcchan, const ALfloat *RESTRICT data, ALuint srcchan,
ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize) ALuint OutPos, ALuint SamplesToDo, ALuint BufferSize)
{ {
@ -143,7 +143,6 @@ void MixDirect_SSE(ALsource *Source, ALCdevice *Device, DirectParams *params,
ALfloat DrySend; ALfloat DrySend;
ALuint pos; ALuint pos;
ALuint c; ALuint c;
(void)Source;
for(c = 0;c < MaxChannels;c++) for(c = 0;c < MaxChannels;c++)
{ {

3
OpenAL32/Include/alu.h
View File

@ -88,8 +88,7 @@ struct SendParams;
typedef void (*ResamplerFunc)(const ALfloat *src, ALuint frac, ALuint increment, typedef void (*ResamplerFunc)(const ALfloat *src, ALuint frac, ALuint increment,
ALfloat *RESTRICT dst, ALuint dstlen); ALfloat *RESTRICT dst, ALuint dstlen);
typedef ALvoid (*DryMixerFunc)(struct ALsource *self, ALCdevice *Device, typedef ALvoid (*DryMixerFunc)(ALCdevice *Device, struct DirectParams *params,
struct DirectParams *params,
const ALfloat *RESTRICT data, ALuint srcchan, const ALfloat *RESTRICT data, ALuint srcchan,
ALuint OutPos, ALuint SamplesToDo, ALuint OutPos, ALuint SamplesToDo,
ALuint BufferSize); ALuint BufferSize);