Store the filter gains directly in the source instead of duplicate filter objects

2 files changed, 12 insertions, 36 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 886a38b0..deeab0dd 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1267,8 +1267,8 @@ static ALCboolean UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
                 if(source->Send[s].Slot)
                     DecrementRef(&source->Send[s].Slot->ref);
                 source->Send[s].Slot = NULL;
-                source->Send[s].WetFilter.type = 0;
-                source->Send[s].WetFilter.filter = 0;
+                source->Send[s].WetGain = 1.0f;
+                source->Send[s].WetGainHF = 1.0f;
                 s++;
             }
             source->NeedsUpdate = AL_FALSE;
diff --git a/Alc/ALu.c b/Alc/ALu.c
index f2658da7..1819c80e 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -182,26 +182,14 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
     }
 
     /* Calculate gains */
-    DryGain = clampf(SourceVolume, MinVolume, MaxVolume);
-    DryGainHF = 1.0f;
-    switch(ALSource->DirectFilter.type)
-    {
-        case AL_FILTER_LOWPASS:
-            DryGain *= ALSource->DirectFilter.Gain;
-            DryGainHF *= ALSource->DirectFilter.GainHF;
-            break;
-    }
+    DryGain  = clampf(SourceVolume, MinVolume, MaxVolume);
+    DryGain *= ALSource->DirectGain;
+    DryGainHF = ALSource->DirectGainHF;
     for(i = 0;i < NumSends;i++)
     {
-        WetGain[i] = clampf(SourceVolume, MinVolume, MaxVolume);
-        WetGainHF[i] = 1.0f;
-        switch(ALSource->Send[i].WetFilter.type)
-        {
-            case AL_FILTER_LOWPASS:
-                WetGain[i] *= ALSource->Send[i].WetFilter.Gain;
-                WetGainHF[i] *= ALSource->Send[i].WetFilter.GainHF;
-                break;
-        }
+        WetGain[i]  = clampf(SourceVolume, MinVolume, MaxVolume);
+        WetGain[i] *= ALSource->Send[i].WetGain;
+        WetGainHF[i] = WetGainHF[i] *= ALSource->Send[i].WetGainHF;
     }
 
     SrcMatrix = ALSource->Params.DryGains;
@@ -610,24 +598,12 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
         WetGain[i] = clampf(WetGain[i], MinVolume, MaxVolume);
 
     // Apply filter gains and filters
-    switch(ALSource->DirectFilter.type)
-    {
-        case AL_FILTER_LOWPASS:
-            DryGain *= ALSource->DirectFilter.Gain;
-            DryGainHF *= ALSource->DirectFilter.GainHF;
-            break;
-    }
-    DryGain *= ListenerGain;
+    DryGain   *= ALSource->DirectGain * ListenerGain;
+    DryGainHF *= ALSource->DirectGainHF;
     for(i = 0;i < NumSends;i++)
     {
-        switch(ALSource->Send[i].WetFilter.type)
-        {
-            case AL_FILTER_LOWPASS:
-                WetGain[i] *= ALSource->Send[i].WetFilter.Gain;
-                WetGainHF[i] *= ALSource->Send[i].WetFilter.GainHF;
-                break;
-        }
-        WetGain[i] *= ListenerGain;
+        WetGain[i]   *= ALSource->Send[i].WetGain * ListenerGain;
+        WetGainHF[i] *= ALSource->Send[i].WetGainHF;
     }
 
     if(WetGainAuto)