aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-01-27 19:01:25 -0800
committerChris Robinson <[email protected]>2018-01-27 19:04:32 -0800
commite8c268ef09d53461386fa7e81bd853cd1007d6c2 (patch)
tree9c17f4bac398ca3de8c74661bf28a9b5fc046933 /Alc
parent6a839600b96b73104f8b93a4fa4a1a8da67cae5c (diff)
Store effects in an array of lists
Diffstat (limited to 'Alc')
-rw-r--r--Alc/ALc.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 0dc93b56..9a0fa63b 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -2392,13 +2392,12 @@ static ALCvoid FreeDevice(ALCdevice *device)
VECTOR_DEINIT(device->BufferList);
almtx_destroy(&device->BufferLock);
- if(device->EffectMap.size > 0)
- {
- WARN("(%p) Deleting %d Effect%s\n", device, device->EffectMap.size,
- (device->EffectMap.size==1)?"":"s");
- ReleaseALEffects(device);
- }
- ResetUIntMap(&device->EffectMap);
+ ReleaseALEffects(device);
+#define FREE_EFFECTSUBLIST(x) al_free((x)->Effects)
+ VECTOR_FOR_EACH(EffectSubList, device->EffectList, FREE_EFFECTSUBLIST);
+#undef FREE_EFFECTSUBLIST
+ VECTOR_DEINIT(device->EffectList);
+ almtx_destroy(&device->EffectLock);
if(device->FilterMap.size > 0)
{
@@ -4000,7 +3999,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
device->NumAuxSends = DEFAULT_SENDS;
VECTOR_INIT(device->BufferList);
- InitUIntMap(&device->EffectMap, INT_MAX);
+ VECTOR_INIT(device->EffectList);
InitUIntMap(&device->FilterMap, INT_MAX);
for(i = 0;i < MAX_OUTPUT_CHANNELS;i++)
@@ -4132,6 +4131,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
}
almtx_init(&device->BackendLock, almtx_plain);
almtx_init(&device->BufferLock, almtx_plain);
+ almtx_init(&device->EffectLock, almtx_plain);
if(ConfigValueStr(alstr_get_cstr(device->DeviceName), NULL, "ambi-format", &fmt))
{
@@ -4278,7 +4278,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName,
device->RealOut.NumChannels = 0;
VECTOR_INIT(device->BufferList);
- InitUIntMap(&device->EffectMap, INT_MAX);
+ VECTOR_INIT(device->EffectList);
InitUIntMap(&device->FilterMap, INT_MAX);
for(i = 0;i < MAX_OUTPUT_CHANNELS;i++)
@@ -4327,6 +4327,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName,
}
almtx_init(&device->BackendLock, almtx_plain);
almtx_init(&device->BufferLock, almtx_plain);
+ almtx_init(&device->EffectLock, almtx_plain);
{
ALCdevice *head = ATOMIC_LOAD_SEQ(&DeviceList);
@@ -4502,7 +4503,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceN
device->NumAuxSends = DEFAULT_SENDS;
VECTOR_INIT(device->BufferList);
- InitUIntMap(&device->EffectMap, INT_MAX);
+ VECTOR_INIT(device->EffectList);
InitUIntMap(&device->FilterMap, INT_MAX);
for(i = 0;i < MAX_OUTPUT_CHANNELS;i++)
@@ -4522,6 +4523,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceN
}
almtx_init(&device->BackendLock, almtx_plain);
almtx_init(&device->BufferLock, almtx_plain);
+ almtx_init(&device->EffectLock, almtx_plain);
//Set output format
device->NumUpdates = 0;