Store filters in an array of lists

2 files changed, 10 insertions, 16 deletions

diff --git a/OpenAL32/Include/alFilter.h b/OpenAL32/Include/alFilter.h
index c1932e2e..e28b7b2b 100644
--- a/OpenAL32/Include/alFilter.h
+++ b/OpenAL32/Include/alFilter.h
@@ -163,21 +163,7 @@ typedef struct ALfilter {
     ALuint id;
 } ALfilter;
 
-inline void LockFiltersRead(ALCdevice *device)
-{ LockUIntMapRead(&device->FilterMap); }
-inline void UnlockFiltersRead(ALCdevice *device)
-{ UnlockUIntMapRead(&device->FilterMap); }
-inline void LockFiltersWrite(ALCdevice *device)
-{ LockUIntMapWrite(&device->FilterMap); }
-inline void UnlockFiltersWrite(ALCdevice *device)
-{ UnlockUIntMapWrite(&device->FilterMap); }
-
-inline struct ALfilter *LookupFilter(ALCdevice *device, ALuint id)
-{ return (struct ALfilter*)LookupUIntMapKeyNoLock(&device->FilterMap, id); }
-inline struct ALfilter *RemoveFilter(ALCdevice *device, ALuint id)
-{ return (struct ALfilter*)RemoveUIntMapKeyNoLock(&device->FilterMap, id); }
-
-ALvoid ReleaseALFilters(ALCdevice *device);
+void ReleaseALFilters(ALCdevice *device);
 
 #ifdef __cplusplus
 }
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 8908d93f..d21ec3b0 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -166,6 +166,7 @@ struct Compressor;
 struct ALCbackend;
 struct ALbuffer;
 struct ALeffect;
+struct ALfilter;
 struct ALsource;
 struct ALcontextProps;
 struct ALlistenerProps;
@@ -388,6 +389,12 @@ typedef struct EffectSubList {
 } EffectSubList;
 TYPEDEF_VECTOR(EffectSubList, vector_EffectSubList)
 
+typedef struct FilterSubList {
+    ALuint64 FreeMask;
+    struct ALfilter *Filters; /* 64 */
+} FilterSubList;
+TYPEDEF_VECTOR(FilterSubList, vector_FilterSubList)
+
 typedef struct SourceSubList {
     ALuint64 FreeMask;
     struct ALsource *Sources; /* 64 */
@@ -496,7 +503,8 @@ struct ALCdevice_struct
     almtx_t EffectLock;
 
     // Map of Filters for this device
-    UIntMap FilterMap;
+    vector_FilterSubList FilterList;
+    almtx_t FilterLock;
 
     /* HRTF state and info */
     struct DirectHrtfState *Hrtf;