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

Use a lambda to apply the NFC mixes

Browse Source
This commit is contained in:
Chris Robinson 2018-12-01 23:25:34 -08:00
parent e1af866a3d
commit 607fb3e632
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Alc/mixvoice.cpp
View File

@ -537,30 +537,29 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
);
else
{
ALfloat *nfcsamples = Device->TempBuffer[NFC_DATA_BUF];
ALsizei chanoffset = 0;
MixSamples(samples,
voice->Direct.ChannelsPerOrder[0], voice->Direct.Buffer,
parms->Gains.Current, parms->Gains.Target, Counter, OutPos,
DstBufferSize
);
chanoffset += voice->Direct.ChannelsPerOrder[0];
#define APPLY_NFC_MIX(order) \
if(voice->Direct.ChannelsPerOrder[order] > 0) \
{ \
NfcFilterProcess##order(&parms->NFCtrlFilter, nfcsamples, samples, \
DstBufferSize); \
MixSamples(nfcsamples, voice->Direct.ChannelsPerOrder[order], \
voice->Direct.Buffer+chanoffset, parms->Gains.Current+chanoffset, \
parms->Gains.Target+chanoffset, Counter, OutPos, DstBufferSize \
); \
chanoffset += voice->Direct.ChannelsPerOrder[order]; \
}
APPLY_NFC_MIX(1)
APPLY_NFC_MIX(2)
APPLY_NFC_MIX(3)
#undef APPLY_NFC_MIX
ALfloat *nfcsamples{Device->TempBuffer[NFC_DATA_BUF]};
ALsizei chanoffset{voice->Direct.ChannelsPerOrder[0]};
using FilterProc = void(NfcFilter*,ALfloat*,const ALfloat*,ALsizei);
auto apply_nfc = [voice,parms,samples,DstBufferSize,Counter,OutPos,&chanoffset,nfcsamples](FilterProc &process, ALsizei order) -> void
{
if(voice->Direct.ChannelsPerOrder[order] < 1)
return;
process(&parms->NFCtrlFilter, nfcsamples, samples, DstBufferSize);
MixSamples(nfcsamples, voice->Direct.ChannelsPerOrder[order],
voice->Direct.Buffer+chanoffset, parms->Gains.Current+chanoffset,
parms->Gains.Target+chanoffset, Counter, OutPos, DstBufferSize
);
chanoffset += voice->Direct.ChannelsPerOrder[order];
};
apply_nfc(NfcFilterProcess1, 1);
apply_nfc(NfcFilterProcess2, 2);
apply_nfc(NfcFilterProcess3, 3);
}
}
else