Combine multiple functions called sequentially

2 files changed, 3 insertions, 7 deletions

diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index a151c761..609118bf 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -157,7 +157,7 @@ typedef struct DirectParams {
     ALfilterState LowPass;
     ALfilterState HighPass;
 
-    NfcFilter NFCtrlFilter[MAX_AMBI_ORDER];
+    NfcFilter NFCtrlFilter;
 
     struct {
         HrtfParams Old;
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 95651f29..2323da3e 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -2534,13 +2534,9 @@ AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources)
         if(device->AvgSpeakerDist > 0.0f)
         {
             ALfloat w1 = SPEEDOFSOUNDMETRESPERSEC /
-                        (device->AvgSpeakerDist * device->Frequency);
+                         (device->AvgSpeakerDist * device->Frequency);
             for(j = 0;j < voice->NumChannels;j++)
-            {
-                NfcFilterCreate1(&voice->Direct.Params[j].NFCtrlFilter[0], 0.0f, w1);
-                NfcFilterCreate2(&voice->Direct.Params[j].NFCtrlFilter[1], 0.0f, w1);
-                NfcFilterCreate3(&voice->Direct.Params[j].NFCtrlFilter[2], 0.0f, w1);
-            }
+                NfcFilterCreate(&voice->Direct.Params[j].NFCtrlFilter, 0.0f, w1);
         }
 
         ATOMIC_STORE(&voice->Source, source, almemory_order_relaxed);