diff options
| author | Chris Robinson <[email protected]> | 2010-09-26 01:15:27 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-09-26 01:15:27 -0700 |
| commit | 9fbd6c6c3f0e4c486cdf37823369959e43ac88c3 (patch) | |
| tree | a0a4480d2b088e26fbf48a7dedcd68bd455a64fe /Alc/mixer.c | |
| parent | 08fdc5fa98c96035b4c2c1c873bfa15895542ef2 (diff) | |
Make the SourceMix function a method of the ALsource struct
Diffstat (limited to 'Alc/mixer.c')
| -rw-r--r-- | Alc/mixer.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c index 0b25c4d4..8504d388 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -601,9 +601,9 @@ static __inline ALfloat cos_lerp16(ALfloat val1, ALfloat val2, ALint frac) } while(0) -static ALvoid MixSource(ALsource *Source, ALfloat (*DryBuffer)[OUTPUTCHANNELS], - ALuint SamplesToDo, ALfloat *ClickRemoval, - ALfloat *PendingClicks) +ALvoid MixSource(ALsource *Source, ALuint SamplesToDo, + ALfloat (*DryBuffer)[OUTPUTCHANNELS], + ALfloat *ClickRemoval, ALfloat *PendingClicks) { ALbufferlistitem *BufferListItem; ALint64 DataSize64,DataPos64; @@ -749,9 +749,6 @@ static ALvoid MixSource(ALsource *Source, ALfloat (*DryBuffer)[OUTPUTCHANNELS], Source->Buffer = BufferListItem->buffer; } -#undef DO_MIX_MC -#undef DO_MIX_STEREO -#undef DO_MIX_MONO ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size) { @@ -809,8 +806,8 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size) (*src)->NeedsUpdate = AL_FALSE; } - MixSource(*src, DryBuffer, SamplesToDo, - device->ClickRemoval, device->PendingClicks); + ALsource_Mix(*src, SamplesToDo, DryBuffer, + device->ClickRemoval, device->PendingClicks); src++; } |