From 1d8ac4d61f5717c02e253a741175b037db97de4e Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 10 Apr 2020 20:23:20 -0700 Subject: Throw exceptions for errors in the effect getters/setters --- alc/effects/null.cpp | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'alc/effects/null.cpp') diff --git a/alc/effects/null.cpp b/alc/effects/null.cpp index b9429745..8ad928ca 100644 --- a/alc/effects/null.cpp +++ b/alc/effects/null.cpp @@ -64,69 +64,73 @@ void NullState::process(const size_t/*samplesToDo*/, } -void NullEffect_setParami(EffectProps* /*props*/, ALCcontext *context, ALenum param, int /*val*/) +void NullEffect_setParami(EffectProps* /*props*/, ALenum param, int /*val*/) { switch(param) { default: - context->setError(AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x", param); + throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x", + param}; } } -void NullEffect_setParamiv(EffectProps *props, ALCcontext *context, ALenum param, const int *vals) +void NullEffect_setParamiv(EffectProps *props, ALenum param, const int *vals) { switch(param) { default: - NullEffect_setParami(props, context, param, vals[0]); + NullEffect_setParami(props, param, vals[0]); } } -void NullEffect_setParamf(EffectProps* /*props*/, ALCcontext *context, ALenum param, float /*val*/) +void NullEffect_setParamf(EffectProps* /*props*/, ALenum param, float /*val*/) { switch(param) { default: - context->setError(AL_INVALID_ENUM, "Invalid null effect float property 0x%04x", param); + throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x", + param}; } } -void NullEffect_setParamfv(EffectProps *props, ALCcontext *context, ALenum param, const float *vals) +void NullEffect_setParamfv(EffectProps *props, ALenum param, const float *vals) { switch(param) { default: - NullEffect_setParamf(props, context, param, vals[0]); + NullEffect_setParamf(props, param, vals[0]); } } -void NullEffect_getParami(const EffectProps* /*props*/, ALCcontext *context, ALenum param, int* /*val*/) +void NullEffect_getParami(const EffectProps* /*props*/, ALenum param, int* /*val*/) { switch(param) { default: - context->setError(AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x", param); + throw effect_exception{AL_INVALID_ENUM, "Invalid null effect integer property 0x%04x", + param}; } } -void NullEffect_getParamiv(const EffectProps *props, ALCcontext *context, ALenum param, int *vals) +void NullEffect_getParamiv(const EffectProps *props, ALenum param, int *vals) { switch(param) { default: - NullEffect_getParami(props, context, param, vals); + NullEffect_getParami(props, param, vals); } } -void NullEffect_getParamf(const EffectProps* /*props*/, ALCcontext *context, ALenum param, float* /*val*/) +void NullEffect_getParamf(const EffectProps* /*props*/, ALenum param, float* /*val*/) { switch(param) { default: - context->setError(AL_INVALID_ENUM, "Invalid null effect float property 0x%04x", param); + throw effect_exception{AL_INVALID_ENUM, "Invalid null effect float property 0x%04x", + param}; } } -void NullEffect_getParamfv(const EffectProps *props, ALCcontext *context, ALenum param, float *vals) +void NullEffect_getParamfv(const EffectProps *props, ALenum param, float *vals) { switch(param) { default: - NullEffect_getParamf(props, context, param, vals); + NullEffect_getParamf(props, param, vals); } } -- cgit v1.2.3