diff options
| author | Chris Robinson <[email protected]> | 2014-05-18 11:05:38 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-05-18 11:05:38 -0700 |
| commit | ef9dfe3772b7dd8db641ca841eb3704b23f9ac7e (patch) | |
| tree | 55c36b74a0a74e4c574784240ef53122c78bf5db /Alc/mixer.c | |
| parent | 9317ec59b99af1b598de1c302470113a77da966d (diff) | |
Move an HRTF mixer parameter and shorten a couple variable names
Diffstat (limited to 'Alc/mixer.c')
| -rw-r--r-- | Alc/mixer.c | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c index e90bb482..7b0b9d30 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -345,37 +345,33 @@ ALvoid MixSource(ALactivesource *src, ALCdevice *Device, ALuint SamplesToDo) increment, ResampledData, DstBufferSize); { - DirectParams *directparms = &src->Direct; + DirectParams *parms = &src->Direct; - DoFilters(&directparms->LpFilter[chan], &directparms->HpFilter[chan], - SrcData, ResampledData, DstBufferSize, - directparms->Filters[chan]); + DoFilters(&parms->LpFilter[chan], &parms->HpFilter[chan], SrcData, + ResampledData, DstBufferSize, parms->Filters[chan]); if(!src->IsHrtf) - src->Dry.Mix(directparms->OutBuffer, SrcData, - &directparms->Mix.Gains[chan], - maxu(directparms->Counter, OutPos) - OutPos, - OutPos, DstBufferSize); + src->Dry.Mix(parms->OutBuffer, SrcData, &parms->Mix.Gains[chan], + maxu(parms->Counter, OutPos) - OutPos, OutPos, + DstBufferSize); else - src->Dry.HrtfMix(directparms->OutBuffer, SrcData, - maxu(directparms->Counter, OutPos) - OutPos, - directparms->Offset + OutPos, - directparms->Mix.Hrtf.IrSize, - &directparms->Mix.Hrtf.Params[chan], - &directparms->Mix.Hrtf.State[chan], - OutPos, DstBufferSize); + src->Dry.HrtfMix(parms->OutBuffer, SrcData, + maxu(parms->Counter, OutPos) - OutPos, + parms->Offset + OutPos, OutPos, + parms->Mix.Hrtf.IrSize, &parms->Mix.Hrtf.Params[chan], + &parms->Mix.Hrtf.State[chan], DstBufferSize); } for(j = 0;j < Device->NumAuxSends;j++) { - SendParams *sendparms = &src->Send[j]; - if(!sendparms->OutBuffer) + SendParams *parms = &src->Send[j]; + if(!parms->OutBuffer) continue; - DoFilters(&sendparms->LpFilter[chan], &sendparms->HpFilter[chan], + DoFilters(&parms->LpFilter[chan], &parms->HpFilter[chan], SrcData, ResampledData, DstBufferSize, - sendparms->Filters[chan]); - src->WetMix(sendparms->OutBuffer, SrcData, &sendparms->Gain, - maxu(sendparms->Counter, OutPos) - OutPos, + parms->Filters[chan]); + src->WetMix(parms->OutBuffer, SrcData, &parms->Gain, + maxu(parms->Counter, OutPos) - OutPos, OutPos, DstBufferSize); } } |