Use proper inheritence for EffectStateFactory

1 files changed, 3 insertions, 22 deletions

diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 815ae77e..d3d4e704 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -7,9 +7,6 @@
 #include "almalloc.h"
 #include "atomic.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct ALeffectStateVtable;
 struct ALeffectslot;
@@ -59,23 +56,11 @@ static const struct ALeffectStateVtable T##_ALeffectState_vtable = {          \
 }
 
 
-struct EffectStateFactoryVtable;
-
-typedef struct EffectStateFactory {
-    const struct EffectStateFactoryVtable *vtab;
-} EffectStateFactory;
+struct EffectStateFactory {
+    virtual ~EffectStateFactory() { }
 
-struct EffectStateFactoryVtable {
-    ALeffectState *(*const create)(EffectStateFactory *factory);
+    virtual ALeffectState *create() = 0;
 };
-#define EffectStateFactory_create(x) ((x)->vtab->create((x)))
-
-#define DEFINE_EFFECTSTATEFACTORY_VTABLE(T)                                   \
-DECLARE_THUNK(T, EffectStateFactory, ALeffectState*, create)                  \
-                                                                              \
-static const struct EffectStateFactoryVtable T##_EffectStateFactory_vtable = { \
-    T##_EffectStateFactory_create,                                            \
-}
 
 
 #define MAX_EFFECT_CHANNELS (4)
@@ -184,8 +169,4 @@ ALenum InitializeEffect(ALCcontext *Context, ALeffectslot *EffectSlot, ALeffect
 
 void ALeffectState_DecRef(ALeffectState *state);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif