diff options
| -rw-r--r-- | Alc/effects/fshifter.c | 14 | ||||
| -rw-r--r-- | OpenAL32/Include/alEffect.h | 6 | ||||
| -rw-r--r-- | OpenAL32/alEffect.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Alc/effects/fshifter.c b/Alc/effects/fshifter.c index 2e1a6c45..fd229f3f 100644 --- a/Alc/effects/fshifter.c +++ b/Alc/effects/fshifter.c @@ -125,7 +125,7 @@ static ALvoid ALfshifterState_update(ALfshifterState *state, const ALCcontext *c state->frac_freq = props->Fshifter.Frequency/(ALdouble)device->Frequency; - switch(props->Fshifter.Left_direction) + switch(props->Fshifter.LeftDirection) { case AL_FREQUENCY_SHIFTER_DIRECTION_DOWN: state->ld_sign = -1.0; @@ -242,7 +242,7 @@ void ALfshifter_setParamf(ALeffect *effect, ALCcontext *context, ALenum param, A case AL_FREQUENCY_SHIFTER_FREQUENCY: if(!(val >= AL_FREQUENCY_SHIFTER_MIN_FREQUENCY && val <= AL_FREQUENCY_SHIFTER_MAX_FREQUENCY)) SETERR_RETURN(context, AL_INVALID_VALUE,,"Frequency shifter frequency out of range"); - props->Fshifter.Frequency = (ALfloat) val; + props->Fshifter.Frequency = val; break; default: @@ -263,13 +263,13 @@ void ALfshifter_setParami(ALeffect *effect, ALCcontext *context, ALenum param, A case AL_FREQUENCY_SHIFTER_LEFT_DIRECTION: if(!(val >= AL_FREQUENCY_SHIFTER_MIN_LEFT_DIRECTION && val <= AL_FREQUENCY_SHIFTER_MAX_LEFT_DIRECTION)) SETERR_RETURN(context, AL_INVALID_VALUE,,"Frequency shifter left direction out of range"); - props->Fshifter.Left_direction = val; + props->Fshifter.LeftDirection = val; break; case AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION: if(!(val >= AL_FREQUENCY_SHIFTER_MIN_RIGHT_DIRECTION && val <= AL_FREQUENCY_SHIFTER_MAX_RIGHT_DIRECTION)) SETERR_RETURN(context, AL_INVALID_VALUE,,"Frequency shifter right direction out of range"); - props->Fshifter.Right_direction = val; + props->Fshifter.RightDirection = val; break; default: @@ -287,10 +287,10 @@ void ALfshifter_getParami(const ALeffect *effect, ALCcontext *context, ALenum pa switch(param) { case AL_FREQUENCY_SHIFTER_LEFT_DIRECTION: - *val = (ALint)props->Fshifter.Left_direction; + *val = props->Fshifter.LeftDirection; break; case AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION: - *val = (ALint)props->Fshifter.Right_direction; + *val = props->Fshifter.RightDirection; break; default: alSetError(context, AL_INVALID_ENUM, "Invalid frequency shifter integer property 0x%04x", param); @@ -308,7 +308,7 @@ void ALfshifter_getParamf(const ALeffect *effect, ALCcontext *context, ALenum pa switch(param) { case AL_FREQUENCY_SHIFTER_FREQUENCY: - *val = (ALfloat)props->Fshifter.Frequency; + *val = props->Fshifter.Frequency; break; default: diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h index 206c495b..4d28a708 100644 --- a/OpenAL32/Include/alEffect.h +++ b/OpenAL32/Include/alEffect.h @@ -147,10 +147,10 @@ typedef union ALeffectProps { ALfloat HighGain; } Equalizer; - struct { + struct { ALfloat Frequency; - ALint Left_direction; - ALint Right_direction; + ALint LeftDirection; + ALint RightDirection; } Fshifter; struct { diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c index a69bf70c..aacddd4c 100644 --- a/OpenAL32/alEffect.c +++ b/OpenAL32/alEffect.c @@ -586,9 +586,9 @@ static void InitEffectParams(ALeffect *effect, ALenum type) effect->vtab = &ALflanger_vtable; break; case AL_EFFECT_FREQUENCY_SHIFTER: - effect->Props.Fshifter.Frequency = AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY; - effect->Props.Fshifter.Left_direction = AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION; - effect->Props.Fshifter.Right_direction = AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION; + effect->Props.Fshifter.Frequency = AL_FREQUENCY_SHIFTER_DEFAULT_FREQUENCY; + effect->Props.Fshifter.LeftDirection = AL_FREQUENCY_SHIFTER_DEFAULT_LEFT_DIRECTION; + effect->Props.Fshifter.RightDirection = AL_FREQUENCY_SHIFTER_DEFAULT_RIGHT_DIRECTION; effect->vtab = &ALfshifter_vtable; break; case AL_EFFECT_RING_MODULATOR: |