aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2013-05-27 11:48:29 -0700
committerChris Robinson <[email protected]>2013-05-27 11:48:29 -0700
commit9e84f38a46f49230bf836e8a33b0637c000d659b (patch)
tree733ee48b1c03794731ff1e0f2454b0db52886e5c /Alc
parent06c8442af67fcb38241d2f13a649fc8d4dedaa85 (diff)
Use generic VCALL[_NOARGS] macros instead of type-specific wrappers
Diffstat (limited to 'Alc')
-rw-r--r--Alc/ALc.c8
-rw-r--r--Alc/ALu.c12
2 files changed, 10 insertions, 10 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 4472d9e6..975fe661 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1707,7 +1707,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
{
ALeffectslot *slot = context->EffectSlotMap.array[pos].value;
- if(ALeffectState_DeviceUpdate(slot->EffectState, device) == AL_FALSE)
+ if(VCALL(slot->EffectState,DeviceUpdate,(device)) == AL_FALSE)
{
UnlockUIntMapRead(&context->EffectSlotMap);
ALCdevice_Unlock(device);
@@ -1715,7 +1715,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
return ALC_INVALID_DEVICE;
}
slot->NeedsUpdate = AL_FALSE;
- ALeffectState_Update(slot->EffectState, device, slot);
+ VCALL(slot->EffectState,Update,(device, slot));
}
UnlockUIntMapRead(&context->EffectSlotMap);
@@ -1744,14 +1744,14 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
{
ALeffectslot *slot = device->DefaultSlot;
- if(ALeffectState_DeviceUpdate(slot->EffectState, device) == AL_FALSE)
+ if(VCALL(slot->EffectState,DeviceUpdate,(device)) == AL_FALSE)
{
ALCdevice_Unlock(device);
RestoreFPUMode(&oldMode);
return ALC_INVALID_DEVICE;
}
slot->NeedsUpdate = AL_FALSE;
- ALeffectState_Update(slot->EffectState, device, slot);
+ VCALL(slot->EffectState,Update,(device, slot));
}
ALCdevice_Unlock(device);
RestoreFPUMode(&oldMode);
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 2f005b77..4d6c46da 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -1041,10 +1041,10 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
(*slot)->PendingClicks[0] = 0.0f;
if(!DeferUpdates && ExchangeInt(&(*slot)->NeedsUpdate, AL_FALSE))
- ALeffectState_Update((*slot)->EffectState, device, *slot);
+ VCALL((*slot)->EffectState,Update,(device, *slot));
- ALeffectState_Process((*slot)->EffectState, SamplesToDo,
- (*slot)->WetBuffer[0], device->DryBuffer);
+ VCALL((*slot)->EffectState,Process,(SamplesToDo, (*slot)->WetBuffer[0],
+ device->DryBuffer));
for(i = 0;i < SamplesToDo;i++)
(*slot)->WetBuffer[0][i] = 0.0f;
@@ -1070,10 +1070,10 @@ ALvoid aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
(*slot)->PendingClicks[0] = 0.0f;
if(ExchangeInt(&(*slot)->NeedsUpdate, AL_FALSE))
- ALeffectState_Update((*slot)->EffectState, device, *slot);
+ VCALL((*slot)->EffectState,Update,(device, *slot));
- ALeffectState_Process((*slot)->EffectState, SamplesToDo,
- (*slot)->WetBuffer[0], device->DryBuffer);
+ VCALL((*slot)->EffectState,Process,(SamplesToDo, (*slot)->WetBuffer[0],
+ device->DryBuffer));
for(i = 0;i < SamplesToDo;i++)
(*slot)->WetBuffer[0][i] = 0.0f;