diff options
| -rw-r--r-- | al/source.cpp | 12 | ||||
| -rw-r--r-- | alc/context.cpp | 6 | ||||
| -rw-r--r-- | alc/context.h | 5 |
3 files changed, 4 insertions, 19 deletions
diff --git a/al/source.cpp b/al/source.cpp index 59ce5549..4be5045b 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -3894,12 +3894,10 @@ EaxAlLowPassParam ALsource::eax_create_direct_filter_param() const noexcept } } - const auto max_gain = eax_al_context_->eax_get_max_filter_gain(); - const auto al_low_pass_param = EaxAlLowPassParam { - clamp(level_mb_to_gain(gain_mb), 0.0F, max_gain), - clamp(level_mb_to_gain(gain_hf_mb), 0.0F, max_gain) + level_mb_to_gain(gain_mb), + minf(level_mb_to_gain(gain_hf_mb), 1.0f) }; return al_low_pass_param; @@ -3947,12 +3945,10 @@ EaxAlLowPassParam ALsource::eax_create_room_filter_param( 0.0F; - const auto max_gain = eax_al_context_->eax_get_max_filter_gain(); - const auto al_low_pass_param = EaxAlLowPassParam { - clamp(level_mb_to_gain(gain_mb), 0.0F, max_gain), - clamp(level_mb_to_gain(gain_hf_mb), 0.0F, max_gain) + level_mb_to_gain(gain_mb), + minf(level_mb_to_gain(gain_hf_mb), 1.0f) }; return al_low_pass_param; diff --git a/alc/context.cpp b/alc/context.cpp index 84221c3d..b418debb 100644 --- a/alc/context.cpp +++ b/alc/context.cpp @@ -635,7 +635,6 @@ void ALCcontext::eax_initialize() } eax_ensure_compatibility(); - eax_initialize_filter_gain(); eax_set_defaults(); eax_set_air_absorbtion_hf(); eax_update_speaker_configuration(); @@ -713,11 +712,6 @@ void ALCcontext::eax_update_speaker_configuration() eax_speaker_config_ = eax_detect_speaker_configuration(); } -void ALCcontext::eax_initialize_filter_gain() -{ - eax_max_filter_gain_ = level_mb_to_gain(GainMixMax / mGainBoost); -} - void ALCcontext::eax_set_last_error_defaults() noexcept { eax_last_error_ = EAX_OK; diff --git a/alc/context.h b/alc/context.h index 64c484a8..0a884835 100644 --- a/alc/context.h +++ b/alc/context.h @@ -248,8 +248,6 @@ public: void eax_set_last_error() noexcept; - float eax_get_max_filter_gain() const noexcept { return eax_max_filter_gain_; } - EaxFxSlotIndex eax_get_previous_primary_fx_slot_index() const noexcept { return eax_previous_primary_fx_slot_index_; } EaxFxSlotIndex eax_get_primary_fx_slot_index() const noexcept @@ -337,7 +335,6 @@ private: long eax_last_error_{}; unsigned long eax_speaker_config_{}; - float eax_max_filter_gain_{}; EaxFxSlotIndex eax_previous_primary_fx_slot_index_{}; EaxFxSlotIndex eax_primary_fx_slot_index_{}; EaxFxSlots eax_fx_slots_{}; @@ -378,8 +375,6 @@ private: void eax_update_speaker_configuration(); - void eax_initialize_filter_gain(); - void eax_set_last_error_defaults() noexcept; void eax_set_session_defaults() noexcept; |