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

Use a macro to apply NFC filtered mixes instead of a loop

Browse Source
This commit is contained in:
Chris Robinson
2017-06-26 11:19:27 -07:00
parent b13fead555
commit 8f2bbc434c
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/mixer.c
+16 -18
View File
@@ -471,13 +471,8 @@ ALboolean MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALsizei
);
else
{
static void (*const NfcUpdate[MAX_AMBI_ORDER])(
NfcFilter*,float*,const float*,const int
) = {
NfcFilterUpdate1, NfcFilterUpdate2, NfcFilterUpdate3
};
ALfloat *nfcsamples = Device->NFCtrlData;
ALsizei ord, chanoffset = 0;
ALsizei chanoffset = 0;
MixSamples(samples,
voice->Direct.ChannelsPerOrder[0], voice->Direct.Buffer,
@@ -485,18 +480,21 @@ ALboolean MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALsizei
DstBufferSize
);
chanoffset += voice->Direct.ChannelsPerOrder[0];
for(ord = 1;ord < MAX_AMBI_ORDER+1;ord++)
{
if(voice->Direct.ChannelsPerOrder[ord] <= 0)
break;
NfcUpdate[ord-1](&parms->NFCtrlFilter[ord-1], nfcsamples, samples,
DstBufferSize);
MixSamples(nfcsamples, voice->Direct.ChannelsPerOrder[ord],
voice->Direct.Buffer+chanoffset, parms->Gains.Current+chanoffset,
parms->Gains.Target+chanoffset, Counter, OutPos, DstBufferSize
);
chanoffset += voice->Direct.ChannelsPerOrder[ord];
}
#define APPLY_NFC_MIX(order) \
if(voice->Direct.ChannelsPerOrder[order] > 0) \
{ \
NfcFilterUpdate##order(&parms->NFCtrlFilter[order-1], 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
}
}
else