diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2023-03-11 17:03:51 -0800 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2023-03-11 17:03:51 -0800 |
| commit | 86d4a77e62857205586caf95580980f29e06eb9f (patch) | |
| tree | 108359e7f948fdba9a0bd825f6c67eabccb1fe06 /al/effects/reverb.cpp | |
| parent | 028e7eff52a4d0b7b7c023832d2792bb56fef0d1 (diff) | |
Rename some struct members for clarity
Diffstat (limited to 'al/effects/reverb.cpp')
| -rw-r--r-- | al/effects/reverb.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/al/effects/reverb.cpp b/al/effects/reverb.cpp index b154e3ff..3b04d86c 100644 --- a/al/effects/reverb.cpp +++ b/al/effects/reverb.cpp @@ -1156,66 +1156,66 @@ bool EaxReverbCommitter::commit(const EAXREVERBPROPERTIES &props) bool EaxReverbCommitter::commit(const EaxEffectProps &props) { - const auto orig = props_; - props_ = props; - if(orig.mType == props_.mType && memcmp(&orig.mReverb, &props_.mReverb, sizeof(props_.mReverb)) == 0) + const auto orig = mEaxProps; + mEaxProps = props; + if(orig.mType == mEaxProps.mType && memcmp(&orig.mReverb, &mEaxProps.mReverb, sizeof(mEaxProps.mReverb)) == 0) return false; - const auto size = props_.mReverb.flEnvironmentSize; + const auto size = mEaxProps.mReverb.flEnvironmentSize; const auto density = (size * size * size) / 16.0F; - al_effect_props_.Reverb.Density = clamp(density, + mAlProps.Reverb.Density = clamp(density, AL_EAXREVERB_MIN_DENSITY, AL_EAXREVERB_MAX_DENSITY); - al_effect_props_.Reverb.Diffusion = clamp(props_.mReverb.flEnvironmentDiffusion, + mAlProps.Reverb.Diffusion = clamp(mEaxProps.mReverb.flEnvironmentDiffusion, AL_EAXREVERB_MIN_DIFFUSION, AL_EAXREVERB_MAX_DIFFUSION); - al_effect_props_.Reverb.Gain = clamp( - level_mb_to_gain(static_cast<float>(props_.mReverb.lRoom)), + mAlProps.Reverb.Gain = clamp( + level_mb_to_gain(static_cast<float>(mEaxProps.mReverb.lRoom)), AL_EAXREVERB_MIN_GAIN, AL_EAXREVERB_MAX_GAIN); - al_effect_props_.Reverb.GainHF = clamp( - level_mb_to_gain(static_cast<float>(props_.mReverb.lRoomHF)), + mAlProps.Reverb.GainHF = clamp( + level_mb_to_gain(static_cast<float>(mEaxProps.mReverb.lRoomHF)), AL_EAXREVERB_MIN_GAINHF, AL_EAXREVERB_MAX_GAINHF); - al_effect_props_.Reverb.GainLF = clamp( - level_mb_to_gain(static_cast<float>(props_.mReverb.lRoomLF)), + mAlProps.Reverb.GainLF = clamp( + level_mb_to_gain(static_cast<float>(mEaxProps.mReverb.lRoomLF)), AL_EAXREVERB_MIN_GAINLF, AL_EAXREVERB_MAX_GAINLF); - al_effect_props_.Reverb.DecayTime = clamp(props_.mReverb.flDecayTime, + mAlProps.Reverb.DecayTime = clamp(mEaxProps.mReverb.flDecayTime, AL_EAXREVERB_MIN_DECAY_TIME, AL_EAXREVERB_MAX_DECAY_TIME); - al_effect_props_.Reverb.DecayHFRatio = clamp(props_.mReverb.flDecayHFRatio, + mAlProps.Reverb.DecayHFRatio = clamp(mEaxProps.mReverb.flDecayHFRatio, AL_EAXREVERB_MIN_DECAY_HFRATIO, AL_EAXREVERB_MAX_DECAY_HFRATIO); - al_effect_props_.Reverb.DecayLFRatio = clamp(props_.mReverb.flDecayLFRatio, + mAlProps.Reverb.DecayLFRatio = clamp(mEaxProps.mReverb.flDecayLFRatio, AL_EAXREVERB_MIN_DECAY_LFRATIO, AL_EAXREVERB_MAX_DECAY_LFRATIO); - al_effect_props_.Reverb.ReflectionsGain = clamp( - level_mb_to_gain(static_cast<float>(props_.mReverb.lReflections)), + mAlProps.Reverb.ReflectionsGain = clamp( + level_mb_to_gain(static_cast<float>(mEaxProps.mReverb.lReflections)), AL_EAXREVERB_MIN_REFLECTIONS_GAIN, AL_EAXREVERB_MAX_REFLECTIONS_GAIN); - al_effect_props_.Reverb.ReflectionsDelay = clamp(props_.mReverb.flReflectionsDelay, + mAlProps.Reverb.ReflectionsDelay = clamp(mEaxProps.mReverb.flReflectionsDelay, AL_EAXREVERB_MIN_REFLECTIONS_DELAY, AL_EAXREVERB_MAX_REFLECTIONS_DELAY); - al_effect_props_.Reverb.ReflectionsPan[0] = props_.mReverb.vReflectionsPan.x; - al_effect_props_.Reverb.ReflectionsPan[1] = props_.mReverb.vReflectionsPan.y; - al_effect_props_.Reverb.ReflectionsPan[2] = props_.mReverb.vReflectionsPan.z; - al_effect_props_.Reverb.LateReverbGain = clamp( - level_mb_to_gain(static_cast<float>(props_.mReverb.lReverb)), + mAlProps.Reverb.ReflectionsPan[0] = mEaxProps.mReverb.vReflectionsPan.x; + mAlProps.Reverb.ReflectionsPan[1] = mEaxProps.mReverb.vReflectionsPan.y; + mAlProps.Reverb.ReflectionsPan[2] = mEaxProps.mReverb.vReflectionsPan.z; + mAlProps.Reverb.LateReverbGain = clamp( + level_mb_to_gain(static_cast<float>(mEaxProps.mReverb.lReverb)), AL_EAXREVERB_MIN_LATE_REVERB_GAIN, AL_EAXREVERB_MAX_LATE_REVERB_GAIN); - al_effect_props_.Reverb.LateReverbDelay = clamp(props_.mReverb.flReverbDelay, + mAlProps.Reverb.LateReverbDelay = clamp(mEaxProps.mReverb.flReverbDelay, AL_EAXREVERB_MIN_LATE_REVERB_DELAY, AL_EAXREVERB_MAX_LATE_REVERB_DELAY); - al_effect_props_.Reverb.LateReverbPan[0] = props_.mReverb.vReverbPan.x; - al_effect_props_.Reverb.LateReverbPan[1] = props_.mReverb.vReverbPan.y; - al_effect_props_.Reverb.LateReverbPan[2] = props_.mReverb.vReverbPan.z; - al_effect_props_.Reverb.EchoTime = clamp(props_.mReverb.flEchoTime, + mAlProps.Reverb.LateReverbPan[0] = mEaxProps.mReverb.vReverbPan.x; + mAlProps.Reverb.LateReverbPan[1] = mEaxProps.mReverb.vReverbPan.y; + mAlProps.Reverb.LateReverbPan[2] = mEaxProps.mReverb.vReverbPan.z; + mAlProps.Reverb.EchoTime = clamp(mEaxProps.mReverb.flEchoTime, AL_EAXREVERB_MIN_ECHO_TIME, AL_EAXREVERB_MAX_ECHO_TIME); - al_effect_props_.Reverb.EchoDepth = clamp(props_.mReverb.flEchoDepth, + mAlProps.Reverb.EchoDepth = clamp(mEaxProps.mReverb.flEchoDepth, AL_EAXREVERB_MIN_ECHO_DEPTH, AL_EAXREVERB_MAX_ECHO_DEPTH); - al_effect_props_.Reverb.ModulationTime = clamp(props_.mReverb.flModulationTime, + mAlProps.Reverb.ModulationTime = clamp(mEaxProps.mReverb.flModulationTime, AL_EAXREVERB_MIN_MODULATION_TIME, AL_EAXREVERB_MAX_MODULATION_TIME); - al_effect_props_.Reverb.ModulationDepth = clamp(props_.mReverb.flModulationDepth, + mAlProps.Reverb.ModulationDepth = clamp(mEaxProps.mReverb.flModulationDepth, AL_EAXREVERB_MIN_MODULATION_DEPTH, AL_EAXREVERB_MAX_MODULATION_DEPTH); - al_effect_props_.Reverb.AirAbsorptionGainHF = clamp( - level_mb_to_gain(props_.mReverb.flAirAbsorptionHF), + mAlProps.Reverb.AirAbsorptionGainHF = clamp( + level_mb_to_gain(mEaxProps.mReverb.flAirAbsorptionHF), AL_EAXREVERB_MIN_AIR_ABSORPTION_GAINHF, AL_EAXREVERB_MAX_AIR_ABSORPTION_GAINHF); - al_effect_props_.Reverb.HFReference = clamp(props_.mReverb.flHFReference, + mAlProps.Reverb.HFReference = clamp(mEaxProps.mReverb.flHFReference, AL_EAXREVERB_MIN_HFREFERENCE, AL_EAXREVERB_MAX_HFREFERENCE); - al_effect_props_.Reverb.LFReference = clamp(props_.mReverb.flLFReference, + mAlProps.Reverb.LFReference = clamp(mEaxProps.mReverb.flLFReference, AL_EAXREVERB_MIN_LFREFERENCE, AL_EAXREVERB_MAX_LFREFERENCE); - al_effect_props_.Reverb.RoomRolloffFactor = clamp(props_.mReverb.flRoomRolloffFactor, + mAlProps.Reverb.RoomRolloffFactor = clamp(mEaxProps.mReverb.flRoomRolloffFactor, AL_EAXREVERB_MIN_ROOM_ROLLOFF_FACTOR, AL_EAXREVERB_MAX_ROOM_ROLLOFF_FACTOR); - al_effect_props_.Reverb.DecayHFLimit = ((props_.mReverb.ulFlags & EAXREVERBFLAGS_DECAYHFLIMIT) != 0); + mAlProps.Reverb.DecayHFLimit = ((mEaxProps.mReverb.ulFlags & EAXREVERBFLAGS_DECAYHFLIMIT) != 0); return true; } |