aboutsummaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2013-05-29 11:17:45 -0700
committerChris Robinson <[email protected]>2013-05-29 11:17:45 -0700
commit764e3aa4963c4fbfb08b313d93f6246b5d79b1b9 (patch)
treebf565ba0334fbd943bc2146f3882e05b70a69dc4 /OpenAL32
parente96cc656e9c9176ba60cd191896fd6386a7fd74d (diff)
Fix up the naming convention of effect methods
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alAuxEffectSlot.h27
-rw-r--r--OpenAL32/Include/alEffect.h26
-rw-r--r--OpenAL32/alAuxEffectSlot.c4
-rw-r--r--OpenAL32/alEffect.c16
-rw-r--r--OpenAL32/alState.c2
5 files changed, 39 insertions, 36 deletions
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 60724654..463a6770 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -15,9 +15,10 @@ typedef struct ALeffectslot ALeffectslot;
struct ALeffectStateVtable {
ALvoid (*const Destruct)(ALeffectState *state);
- ALboolean (*const DeviceUpdate)(ALeffectState *state, ALCdevice *device);
- ALvoid (*const Update)(ALeffectState *state, ALCdevice *device, const ALeffectslot *slot);
- ALvoid (*const Process)(ALeffectState *state, ALuint samplesToDo, const ALfloat *restrict samplesIn, ALfloat (*restrict samplesOut)[BUFFERSIZE]);
+
+ ALboolean (*const deviceUpdate)(ALeffectState *state, ALCdevice *device);
+ ALvoid (*const update)(ALeffectState *state, ALCdevice *device, const ALeffectslot *slot);
+ ALvoid (*const process)(ALeffectState *state, ALuint samplesToDo, const ALfloat *restrict samplesIn, ALfloat (*restrict samplesOut)[BUFFERSIZE]);
void (*const Delete)(ALeffectState *state);
};
@@ -29,20 +30,22 @@ struct ALeffectState {
#define DEFINE_ALEFFECTSTATE_VTABLE(T) \
static ALvoid T##_ALeffectState_Destruct(ALeffectState *state) \
{ T##_Destruct(STATIC_UPCAST(T, ALeffectState, state)); } \
-static ALboolean T##_ALeffectState_DeviceUpdate(ALeffectState *state, ALCdevice *device) \
-{ return T##_DeviceUpdate(STATIC_UPCAST(T, ALeffectState, state), device); } \
-static ALvoid T##_ALeffectState_Update(ALeffectState *state, ALCdevice *device, const ALeffectslot *slot) \
-{ T##_Update(STATIC_UPCAST(T, ALeffectState, state), device, slot); } \
-static ALvoid T##_ALeffectState_Process(ALeffectState *state, ALuint samplesToDo, const ALfloat *restrict samplesIn, ALfloat (*restrict samplesOut)[BUFFERSIZE]) \
-{ T##_Process(STATIC_UPCAST(T, ALeffectState, state), samplesToDo, samplesIn, samplesOut); } \
+static ALboolean T##_ALeffectState_deviceUpdate(ALeffectState *state, ALCdevice *device) \
+{ return T##_deviceUpdate(STATIC_UPCAST(T, ALeffectState, state), device); } \
+static ALvoid T##_ALeffectState_update(ALeffectState *state, ALCdevice *device, const ALeffectslot *slot) \
+{ T##_update(STATIC_UPCAST(T, ALeffectState, state), device, slot); } \
+static ALvoid T##_ALeffectState_process(ALeffectState *state, ALuint samplesToDo, const ALfloat *restrict samplesIn, ALfloat (*restrict samplesOut)[BUFFERSIZE]) \
+{ T##_process(STATIC_UPCAST(T, ALeffectState, state), samplesToDo, samplesIn, samplesOut); } \
static ALvoid T##_ALeffectState_Delete(ALeffectState *state) \
{ T##_Delete(STATIC_UPCAST(T, ALeffectState, state)); } \
\
static const struct ALeffectStateVtable T##_ALeffectState_vtable = { \
T##_ALeffectState_Destruct, \
- T##_ALeffectState_DeviceUpdate, \
- T##_ALeffectState_Update, \
- T##_ALeffectState_Process, \
+ \
+ T##_ALeffectState_deviceUpdate, \
+ T##_ALeffectState_update, \
+ T##_ALeffectState_process, \
+ \
T##_ALeffectState_Delete, \
}
diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h
index a1b430e9..8b7b612f 100644
--- a/OpenAL32/Include/alEffect.h
+++ b/OpenAL32/Include/alEffect.h
@@ -28,23 +28,23 @@ extern ALfloat ReverbBoost;
extern ALboolean EmulateEAXReverb;
struct ALeffectVtable {
- void (*const SetParami)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALint val);
- void (*const SetParamiv)(struct ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals);
- void (*const SetParamf)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val);
- void (*const SetParamfv)(struct ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals);
-
- void (*const GetParami)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALint *val);
- void (*const GetParamiv)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals);
- void (*const GetParamf)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val);
- void (*const GetParamfv)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals);
+ void (*const setParami)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALint val);
+ void (*const setParamiv)(struct ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals);
+ void (*const setParamf)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val);
+ void (*const setParamfv)(struct ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals);
+
+ void (*const getParami)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALint *val);
+ void (*const getParamiv)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals);
+ void (*const getParamf)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val);
+ void (*const getParamfv)(struct ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals);
};
#define DEFINE_ALEFFECT_VTABLE(T) \
const struct ALeffectVtable T##_vtable = { \
- T##_SetParami, T##_SetParamiv, \
- T##_SetParamf, T##_SetParamfv, \
- T##_GetParami, T##_GetParamiv, \
- T##_GetParamf, T##_GetParamfv, \
+ T##_setParami, T##_setParamiv, \
+ T##_setParamf, T##_setParamfv, \
+ T##_getParami, T##_getParamiv, \
+ T##_getParamf, T##_getParamfv, \
}
extern const struct ALeffectVtable ALeaxreverb_vtable;
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 99cac58e..b3d0d826 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -496,7 +496,7 @@ ALenum InitializeEffect(ALCdevice *Device, ALeffectslot *EffectSlot, ALeffect *e
SetMixerFPUMode(&oldMode);
ALCdevice_Lock(Device);
- if(VCALL(State,DeviceUpdate,(Device)) == AL_FALSE)
+ if(VCALL(State,deviceUpdate,(Device)) == AL_FALSE)
{
ALCdevice_Unlock(Device);
RestoreFPUMode(&oldMode);
@@ -520,7 +520,7 @@ ALenum InitializeEffect(ALCdevice *Device, ALeffectslot *EffectSlot, ALeffect *e
* object was changed, it needs an update before its Process method can
* be called. */
EffectSlot->NeedsUpdate = AL_FALSE;
- VCALL(EffectSlot->EffectState,Update,(Device, EffectSlot));
+ VCALL(EffectSlot->EffectState,update,(Device, EffectSlot));
ALCdevice_Unlock(Device);
RestoreFPUMode(&oldMode);
diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c
index 425d2b60..b67e34ae 100644
--- a/OpenAL32/alEffect.c
+++ b/OpenAL32/alEffect.c
@@ -167,7 +167,7 @@ AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint value)
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,SetParami,(Context, param, value));
+ VCALL(ALEffect,setParami,(Context, param, value));
}
}
@@ -196,7 +196,7 @@ AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *v
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,SetParamiv,(Context, param, values));
+ VCALL(ALEffect,setParamiv,(Context, param, values));
}
ALCcontext_DecRef(Context);
@@ -217,7 +217,7 @@ AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat value)
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,SetParamf,(Context, param, value));
+ VCALL(ALEffect,setParamf,(Context, param, value));
}
ALCcontext_DecRef(Context);
@@ -238,7 +238,7 @@ AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,SetParamfv,(Context, param, values));
+ VCALL(ALEffect,setParamfv,(Context, param, values));
}
ALCcontext_DecRef(Context);
@@ -263,7 +263,7 @@ AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *value
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,GetParami,(Context, param, value));
+ VCALL(ALEffect,getParami,(Context, param, value));
}
}
@@ -292,7 +292,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *valu
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,GetParamiv,(Context, param, values));
+ VCALL(ALEffect,getParamiv,(Context, param, values));
}
ALCcontext_DecRef(Context);
@@ -313,7 +313,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *val
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,GetParamf,(Context, param, value));
+ VCALL(ALEffect,getParamf,(Context, param, value));
}
ALCcontext_DecRef(Context);
@@ -334,7 +334,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *va
else
{
/* Call the appropriate handler */
- VCALL(ALEffect,GetParamfv,(Context, param, values));
+ VCALL(ALEffect,getParamfv,(Context, param, values));
}
ALCcontext_DecRef(Context);
diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c
index ab39afed..f56dc98d 100644
--- a/OpenAL32/alState.c
+++ b/OpenAL32/alState.c
@@ -625,7 +625,7 @@ AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void)
while(slot != slot_end)
{
if(ExchangeInt(&(*slot)->NeedsUpdate, AL_FALSE))
- VCALL((*slot)->EffectState,Update,(Context->Device, *slot));
+ VCALL((*slot)->EffectState,update,(Context->Device, *slot));
slot++;
}