From c5c537cc5f5cb466cdf6679c9af9768301e32cc3 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 19 Nov 2018 06:43:37 -0800 Subject: Use proper inheritence for EffectStateFactory --- Alc/effects/equalizer.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'Alc/effects/equalizer.cpp') diff --git a/Alc/effects/equalizer.cpp b/Alc/effects/equalizer.cpp index e8d50fad..17eee5b4 100644 --- a/Alc/effects/equalizer.cpp +++ b/Alc/effects/equalizer.cpp @@ -199,30 +199,20 @@ static ALvoid ALequalizerState_process(ALequalizerState *state, ALsizei SamplesT struct EqualizerStateFactory final : public EffectStateFactory { - EqualizerStateFactory() noexcept; + ALeffectState *create() override; }; -ALeffectState *EqualizerStateFactory_create(EqualizerStateFactory *UNUSED(factory)) +ALeffectState *EqualizerStateFactory::create() { ALequalizerState *state; - NEW_OBJ0(state, ALequalizerState)(); - if(!state) return NULL; - - return STATIC_CAST(ALeffectState, state); -} - -DEFINE_EFFECTSTATEFACTORY_VTABLE(EqualizerStateFactory); - -EqualizerStateFactory::EqualizerStateFactory() noexcept - : EffectStateFactory{GET_VTABLE2(EqualizerStateFactory, EffectStateFactory)} -{ + return state; } EffectStateFactory *EqualizerStateFactory_getFactory(void) { static EqualizerStateFactory EqualizerFactory{}; - return STATIC_CAST(EffectStateFactory, &EqualizerFactory); + return &EqualizerFactory; } -- cgit v1.2.3