From 334a7c1d59961277263a7a69575325aeef0987ee Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 27 May 2013 13:16:17 -0700 Subject: Cleanup the ALeffectStateFactory_create methods Get rid of the ALeffectStateFactory_create macro, and use the VCALL_NOARGS helper (requires adding the 'this' factory parameter). --- Alc/effects/chorus.c | 3 ++- Alc/effects/dedicated.c | 3 ++- Alc/effects/distortion.c | 3 ++- Alc/effects/echo.c | 3 ++- Alc/effects/equalizer.c | 3 ++- Alc/effects/flanger.c | 3 ++- Alc/effects/modulator.c | 3 ++- Alc/effects/null.c | 3 ++- Alc/effects/reverb.c | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) (limited to 'Alc/effects') diff --git a/Alc/effects/chorus.c b/Alc/effects/chorus.c index 6a1a2d9c..34caf62d 100644 --- a/Alc/effects/chorus.c +++ b/Alc/effects/chorus.c @@ -251,9 +251,10 @@ static void ALchorusState_Delete(ALchorusState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALchorusState); -static ALeffectState *ALchorusStateFactory_create(void) +static ALeffectState *ALchorusStateFactory_create(ALchorusStateFactory *factory) { ALchorusState *state; + (void)factory; state = malloc(sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/dedicated.c b/Alc/effects/dedicated.c index 9ed68af2..4d3485fb 100644 --- a/Alc/effects/dedicated.c +++ b/Alc/effects/dedicated.c @@ -93,10 +93,11 @@ static void ALdedicatedState_Delete(ALdedicatedState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALdedicatedState); -ALeffectState *ALdedicatedStateFactory_create(void) +ALeffectState *ALdedicatedStateFactory_create(ALdedicatedStateFactory *factory) { ALdedicatedState *state; ALsizei s; + (void)factory; state = malloc(sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/distortion.c b/Alc/effects/distortion.c index 950ce109..84440cce 100644 --- a/Alc/effects/distortion.c +++ b/Alc/effects/distortion.c @@ -242,9 +242,10 @@ static void ALdistortionState_Delete(ALdistortionState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALdistortionState); -static ALeffectState *ALdistortionStateFactory_create(void) +static ALeffectState *ALdistortionStateFactory_create(ALdistortionStateFactory *factory) { ALdistortionState *state; + (void)factory; state = malloc(sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/echo.c b/Alc/effects/echo.c index 8e4205fc..b2b50836 100644 --- a/Alc/effects/echo.c +++ b/Alc/effects/echo.c @@ -183,9 +183,10 @@ static void ALechoState_Delete(ALechoState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALechoState); -ALeffectState *ALechoStateFactory_create(void) +ALeffectState *ALechoStateFactory_create(ALechoStateFactory *factory) { ALechoState *state; + (void)factory; state = malloc(sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/equalizer.c b/Alc/effects/equalizer.c index 1264e93c..3a77c63f 100644 --- a/Alc/effects/equalizer.c +++ b/Alc/effects/equalizer.c @@ -284,10 +284,11 @@ static void ALequalizerState_Delete(ALequalizerState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALequalizerState); -ALeffectState *ALequalizerStateFactory_create(void) +ALeffectState *ALequalizerStateFactory_create(ALequalizerStateFactory *factory) { ALequalizerState *state; int it; + (void)factory; state = malloc(sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/flanger.c b/Alc/effects/flanger.c index db8240ce..28499cd1 100644 --- a/Alc/effects/flanger.c +++ b/Alc/effects/flanger.c @@ -251,9 +251,10 @@ static void ALflangerState_Delete(ALflangerState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALflangerState); -ALeffectState *ALflangerStateFactory_create(void) +ALeffectState *ALflangerStateFactory_create(ALflangerStateFactory *factory) { ALflangerState *state; + (void)factory; state = malloc(sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/modulator.c b/Alc/effects/modulator.c index a7b84d30..0a8a4512 100644 --- a/Alc/effects/modulator.c +++ b/Alc/effects/modulator.c @@ -205,9 +205,10 @@ static void ALmodulatorState_Delete(ALmodulatorState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALmodulatorState); -static ALeffectState *ALmodulatorStateFactory_create(void) +static ALeffectState *ALmodulatorStateFactory_create(ALmodulatorStateFactory *factory) { ALmodulatorState *state; + (void)factory; state = malloc(sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/null.c b/Alc/effects/null.c index aed19a82..f7262ca5 100644 --- a/Alc/effects/null.c +++ b/Alc/effects/null.c @@ -71,9 +71,10 @@ DEFINE_ALEFFECTSTATE_VTABLE(ALnullState); /* Creates ALeffectState objects of the appropriate type. */ -ALeffectState *ALnullStateFactory_create(void) +ALeffectState *ALnullStateFactory_create(ALnullStateFactory *factory) { ALnullState *state; + (void)factory; state = calloc(1, sizeof(*state)); if(!state) return NULL; diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c index 380361e5..7dcabe3a 100644 --- a/Alc/effects/reverb.c +++ b/Alc/effects/reverb.c @@ -1182,10 +1182,11 @@ static void ALreverbState_Delete(ALreverbState *state) DEFINE_ALEFFECTSTATE_VTABLE(ALreverbState); -static ALeffectState *ALreverbStateFactory_create(void) +static ALeffectState *ALreverbStateFactory_create(ALreverbStateFactory *factory) { ALreverbState *state; ALuint index; + (void)factory; state = malloc(sizeof(ALreverbState)); if(!state) return NULL; -- cgit v1.2.3