aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2010-08-06 04:52:34 -0700
committerChris Robinson <[email protected]>2010-08-06 04:52:34 -0700
commitd9d8319c22236ec8b3eebaa5bd68d51ca7677249 (patch)
tree345fba7518313adbe7318feab08764aaf7750b20
parent56b094767bb9c797f4b0d1a456d996a0c869c089 (diff)
Effectslot's Effectstate should never be NULL
-rw-r--r--Alc/ALc.c2
-rw-r--r--Alc/mixer.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 257c2b0d..02de6ce0 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1582,8 +1582,6 @@ ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCin
for(pos = 0;pos < context->EffectSlotMap.size;pos++)
{
ALeffectslot *slot = context->EffectSlotMap.array[pos].value;
- if(!slot->EffectState)
- continue;
if(ALEffect_DeviceUpdate(slot->EffectState, device) == AL_FALSE)
{
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 3984a8b8..4907c72e 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -610,8 +610,7 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
for(e = 0;e < ALContext->EffectSlotMap.size;e++)
{
ALEffectSlot = ALContext->EffectSlotMap.array[e].value;
- if(ALEffectSlot->EffectState)
- ALEffect_Process(ALEffectSlot->EffectState, ALEffectSlot, SamplesToDo, ALEffectSlot->WetBuffer, DryBuffer);
+ ALEffect_Process(ALEffectSlot->EffectState, ALEffectSlot, SamplesToDo, ALEffectSlot->WetBuffer, DryBuffer);
for(i = 0;i < SamplesToDo;i++)
ALEffectSlot->WetBuffer[i] = 0.0f;