Use vtables for setting effect properties

9 files changed, 136 insertions, 117 deletions

diff --git a/Alc/effects/chorus.c b/Alc/effects/chorus.c
index e5a20b5d..c74bf0b5 100644
--- a/Alc/effects/chorus.c
+++ b/Alc/effects/chorus.c
@@ -290,7 +290,7 @@ ALeffectStateFactory *ALchorusStateFactory_getFactory(void)
 }
 
 
-void chorus_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALchorus_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 {
     switch(param)
     {
@@ -313,11 +313,11 @@ void chorus_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint
             break;
     }
 }
-void chorus_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALchorus_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    chorus_SetParami(effect, context, param, vals[0]);
+    ALchorus_SetParami(effect, context, param, vals[0]);
 }
-void chorus_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALchorus_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -354,12 +354,12 @@ void chorus_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALflo
             break;
     }
 }
-void chorus_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALchorus_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    chorus_SetParamf(effect, context, param, vals[0]);
+    ALchorus_SetParamf(effect, context, param, vals[0]);
 }
 
-void chorus_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALchorus_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 {
     switch(param)
     {
@@ -376,11 +376,11 @@ void chorus_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint
             break;
     }
 }
-void chorus_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALchorus_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    chorus_GetParami(effect, context, param, vals);
+    ALchorus_GetParami(effect, context, param, vals);
 }
-void chorus_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALchorus_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -405,7 +405,9 @@ void chorus_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALflo
             break;
     }
 }
-void chorus_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALchorus_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    chorus_GetParamf(effect, context, param, vals);
+    ALchorus_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALchorus);
diff --git a/Alc/effects/dedicated.c b/Alc/effects/dedicated.c
index bd266b0e..6b3ce1ae 100644
--- a/Alc/effects/dedicated.c
+++ b/Alc/effects/dedicated.c
@@ -131,13 +131,13 @@ ALeffectStateFactory *ALdedicatedStateFactory_getFactory(void)
 }
 
 
-void ded_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALdedicated_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void ded_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALdedicated_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    ded_SetParami(effect, context, param, vals[0]);
+    ALdedicated_SetParami(effect, context, param, vals[0]);
 }
-void ded_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALdedicated_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -153,18 +153,18 @@ void ded_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat
             break;
     }
 }
-void ded_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALdedicated_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    ded_SetParamf(effect, context, param, vals[0]);
+    ALdedicated_SetParamf(effect, context, param, vals[0]);
 }
 
-void ded_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALdedicated_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void ded_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALdedicated_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    ded_GetParami(effect, context, param, vals);
+    ALdedicated_GetParami(effect, context, param, vals);
 }
-void ded_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALdedicated_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -177,7 +177,9 @@ void ded_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat
             break;
     }
 }
-void ded_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALdedicated_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    ded_GetParamf(effect, context, param, vals);
+    ALdedicated_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALdedicated);
diff --git a/Alc/effects/distortion.c b/Alc/effects/distortion.c
index 7828377c..e92fb9a8 100644
--- a/Alc/effects/distortion.c
+++ b/Alc/effects/distortion.c
@@ -286,7 +286,7 @@ ALeffectStateFactory *ALdistortionStateFactory_getFactory(void)
 }
 
 
-void distortion_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALdistortion_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 {
     effect=effect;
     val=val;
@@ -298,11 +298,11 @@ void distortion_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, A
             break;
     }
 }
-void distortion_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALdistortion_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    distortion_SetParami(effect, context, param, vals[0]);
+    ALdistortion_SetParami(effect, context, param, vals[0]);
 }
-void distortion_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALdistortion_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -346,12 +346,12 @@ void distortion_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, A
             break;
     }
 }
-void distortion_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALdistortion_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    distortion_SetParamf(effect, context, param, vals[0]);
+    ALdistortion_SetParamf(effect, context, param, vals[0]);
 }
 
-void distortion_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALdistortion_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 {
     effect=effect;
     val=val;
@@ -363,11 +363,11 @@ void distortion_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, A
             break;
     }
 }
-void distortion_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALdistortion_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    distortion_GetParami(effect, context, param, vals);
+    ALdistortion_GetParami(effect, context, param, vals);
 }
-void distortion_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALdistortion_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -396,7 +396,9 @@ void distortion_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, A
             break;
     }
 }
-void distortion_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALdistortion_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    distortion_GetParamf(effect, context, param, vals);
+    ALdistortion_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALdistortion);
diff --git a/Alc/effects/echo.c b/Alc/effects/echo.c
index d5915295..8f679c41 100644
--- a/Alc/effects/echo.c
+++ b/Alc/effects/echo.c
@@ -228,13 +228,13 @@ ALeffectStateFactory *ALechoStateFactory_getFactory(void)
 }
 
 
-void echo_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALecho_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void echo_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALecho_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    echo_SetParami(effect, context, param, vals[0]);
+    ALecho_SetParami(effect, context, param, vals[0]);
 }
-void echo_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALecho_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -278,18 +278,18 @@ void echo_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat
             break;
     }
 }
-void echo_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALecho_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    echo_SetParamf(effect, context, param, vals[0]);
+    ALecho_SetParamf(effect, context, param, vals[0]);
 }
 
-void echo_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALecho_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void echo_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALecho_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    echo_GetParami(effect, context, param, vals);
+    ALecho_GetParami(effect, context, param, vals);
 }
-void echo_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALecho_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -318,7 +318,9 @@ void echo_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat
             break;
     }
 }
-void echo_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALecho_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    echo_GetParamf(effect, context, param, vals);
+    ALecho_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALecho);
diff --git a/Alc/effects/equalizer.c b/Alc/effects/equalizer.c
index d397a9ba..adcd40f4 100644
--- a/Alc/effects/equalizer.c
+++ b/Alc/effects/equalizer.c
@@ -328,7 +328,7 @@ ALeffectStateFactory *ALequalizerStateFactory_getFactory(void)
 }
 
 
-void equalizer_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALequalizer_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 {
     effect=effect;
     val=val;
@@ -340,11 +340,11 @@ void equalizer_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void equalizer_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALequalizer_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    equalizer_SetParami(effect, context, param, vals[0]);
+    ALequalizer_SetParami(effect, context, param, vals[0]);
 }
-void equalizer_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALequalizer_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -423,12 +423,12 @@ void equalizer_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void equalizer_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALequalizer_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    equalizer_SetParamf(effect, context, param, vals[0]);
+    ALequalizer_SetParamf(effect, context, param, vals[0]);
 }
 
-void equalizer_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALequalizer_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 {
     effect=effect;
     val=val;
@@ -440,11 +440,11 @@ void equalizer_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void equalizer_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALequalizer_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    equalizer_GetParami(effect, context, param, vals);
+    ALequalizer_GetParami(effect, context, param, vals);
 }
-void equalizer_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALequalizer_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -493,7 +493,9 @@ void equalizer_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void equalizer_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALequalizer_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    equalizer_GetParamf(effect, context, param, vals);
+    ALequalizer_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALequalizer);
diff --git a/Alc/effects/flanger.c b/Alc/effects/flanger.c
index a0f94a46..de98a06d 100644
--- a/Alc/effects/flanger.c
+++ b/Alc/effects/flanger.c
@@ -290,7 +290,7 @@ ALeffectStateFactory *ALflangerStateFactory_getFactory(void)
 }
 
 
-void flanger_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALflanger_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 {
     switch(param)
     {
@@ -313,11 +313,11 @@ void flanger_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALin
             break;
     }
 }
-void flanger_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALflanger_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    flanger_SetParami(effect, context, param, vals[0]);
+    ALflanger_SetParami(effect, context, param, vals[0]);
 }
-void flanger_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALflanger_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -354,12 +354,12 @@ void flanger_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfl
             break;
     }
 }
-void flanger_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALflanger_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    flanger_SetParamf(effect, context, param, vals[0]);
+    ALflanger_SetParamf(effect, context, param, vals[0]);
 }
 
-void flanger_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALflanger_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 {
     switch(param)
     {
@@ -376,11 +376,11 @@ void flanger_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALin
             break;
     }
 }
-void flanger_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALflanger_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    flanger_GetParami(effect, context, param, vals);
+    ALflanger_GetParami(effect, context, param, vals);
 }
-void flanger_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALflanger_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -405,7 +405,9 @@ void flanger_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfl
             break;
     }
 }
-void flanger_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALflanger_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    flanger_GetParamf(effect, context, param, vals);
+    ALflanger_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALflanger);
diff --git a/Alc/effects/modulator.c b/Alc/effects/modulator.c
index ec99bd53..e48a6d94 100644
--- a/Alc/effects/modulator.c
+++ b/Alc/effects/modulator.c
@@ -245,7 +245,7 @@ ALeffectStateFactory *ALmodulatorStateFactory_getFactory(void)
 }
 
 
-void mod_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALmodulator_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -268,17 +268,17 @@ void mod_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat
             break;
     }
 }
-void mod_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALmodulator_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    mod_SetParamf(effect, context, param, vals[0]);
+    ALmodulator_SetParamf(effect, context, param, vals[0]);
 }
-void mod_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALmodulator_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 {
     switch(param)
     {
         case AL_RING_MODULATOR_FREQUENCY:
         case AL_RING_MODULATOR_HIGHPASS_CUTOFF:
-            mod_SetParamf(effect, context, param, (ALfloat)val);
+            ALmodulator_SetParamf(effect, context, param, (ALfloat)val);
             break;
 
         case AL_RING_MODULATOR_WAVEFORM:
@@ -293,12 +293,12 @@ void mod_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint va
             break;
     }
 }
-void mod_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALmodulator_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    mod_SetParami(effect, context, param, vals[0]);
+    ALmodulator_SetParami(effect, context, param, vals[0]);
 }
 
-void mod_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALmodulator_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 {
     switch(param)
     {
@@ -317,11 +317,11 @@ void mod_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *v
             break;
     }
 }
-void mod_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALmodulator_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    mod_GetParami(effect, context, param, vals);
+    ALmodulator_GetParami(effect, context, param, vals);
 }
-void mod_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALmodulator_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -337,7 +337,9 @@ void mod_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat
             break;
     }
 }
-void mod_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALmodulator_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    mod_GetParamf(effect, context, param, vals);
+    ALmodulator_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALmodulator);
diff --git a/Alc/effects/null.c b/Alc/effects/null.c
index 8636d573..cdca1adf 100644
--- a/Alc/effects/null.c
+++ b/Alc/effects/null.c
@@ -85,20 +85,22 @@ ALeffectStateFactory *ALnullStateFactory_getFactory(void)
 }
 
 
-void null_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALnull_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void null_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALnull_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 { (void)effect;(void)param;(void)vals; alSetError(context, AL_INVALID_ENUM); }
-void null_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALnull_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void null_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALnull_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 { (void)effect;(void)param;(void)vals; alSetError(context, AL_INVALID_ENUM); }
 
-void null_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALnull_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void null_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALnull_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 { (void)effect;(void)param;(void)vals; alSetError(context, AL_INVALID_ENUM); }
-void null_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALnull_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 { (void)effect;(void)param;(void)val; alSetError(context, AL_INVALID_ENUM); }
-void null_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALnull_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 { (void)effect;(void)param;(void)vals; alSetError(context, AL_INVALID_ENUM); }
+
+DEFINE_ALEFFECT_VTABLE(ALnull);
diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c
index a13a5693..eb47f27f 100644
--- a/Alc/effects/reverb.c
+++ b/Alc/effects/reverb.c
@@ -1307,7 +1307,7 @@ ALeffectStateFactory *ALreverbStateFactory_getFactory(void)
 }
 
 
-void eaxreverb_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALeaxreverb_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 {
     switch(param)
     {
@@ -1323,11 +1323,11 @@ void eaxreverb_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void eaxreverb_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALeaxreverb_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    eaxreverb_SetParami(effect, context, param, vals[0]);
+    ALeaxreverb_SetParami(effect, context, param, vals[0]);
 }
-void eaxreverb_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALeaxreverb_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -1476,7 +1476,7 @@ void eaxreverb_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void eaxreverb_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALeaxreverb_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
     switch(param)
     {
@@ -1506,12 +1506,12 @@ void eaxreverb_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, c
             break;
 
         default:
-            eaxreverb_SetParamf(effect, context, param, vals[0]);
+            ALeaxreverb_SetParamf(effect, context, param, vals[0]);
             break;
     }
 }
 
-void eaxreverb_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALeaxreverb_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 {
     switch(param)
     {
@@ -1524,11 +1524,11 @@ void eaxreverb_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void eaxreverb_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALeaxreverb_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    eaxreverb_GetParami(effect, context, param, vals);
+    ALeaxreverb_GetParami(effect, context, param, vals);
 }
-void eaxreverb_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALeaxreverb_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -1617,7 +1617,7 @@ void eaxreverb_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, AL
             break;
     }
 }
-void eaxreverb_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALeaxreverb_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
     switch(param)
     {
@@ -1637,13 +1637,14 @@ void eaxreverb_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, A
             break;
 
         default:
-            eaxreverb_GetParamf(effect, context, param, vals);
+            ALeaxreverb_GetParamf(effect, context, param, vals);
             break;
     }
 }
 
+DEFINE_ALEFFECT_VTABLE(ALeaxreverb);
 
-void reverb_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
+void ALreverb_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint val)
 {
     switch(param)
     {
@@ -1659,11 +1660,11 @@ void reverb_SetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint
             break;
     }
 }
-void reverb_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
+void ALreverb_SetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, const ALint *vals)
 {
-    reverb_SetParami(effect, context, param, vals[0]);
+    ALreverb_SetParami(effect, context, param, vals[0]);
 }
-void reverb_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
+void ALreverb_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat val)
 {
     switch(param)
     {
@@ -1756,12 +1757,12 @@ void reverb_SetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALflo
             break;
     }
 }
-void reverb_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
+void ALreverb_SetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, const ALfloat *vals)
 {
-    reverb_SetParamf(effect, context, param, vals[0]);
+    ALreverb_SetParamf(effect, context, param, vals[0]);
 }
 
-void reverb_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
+void ALreverb_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint *val)
 {
     switch(param)
     {
@@ -1774,11 +1775,11 @@ void reverb_GetParami(ALeffect *effect, ALCcontext *context, ALenum param, ALint
             break;
     }
 }
-void reverb_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
+void ALreverb_GetParamiv(ALeffect *effect, ALCcontext *context, ALenum param, ALint *vals)
 {
-    reverb_GetParami(effect, context, param, vals);
+    ALreverb_GetParami(effect, context, param, vals);
 }
-void reverb_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
+void ALreverb_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *val)
 {
     switch(param)
     {
@@ -1835,7 +1836,9 @@ void reverb_GetParamf(ALeffect *effect, ALCcontext *context, ALenum param, ALflo
             break;
     }
 }
-void reverb_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
+void ALreverb_GetParamfv(ALeffect *effect, ALCcontext *context, ALenum param, ALfloat *vals)
 {
-    reverb_GetParamf(effect, context, param, vals);
+    ALreverb_GetParamf(effect, context, param, vals);
 }
+
+DEFINE_ALEFFECT_VTABLE(ALreverb);