From 7ad63ea542c69b4d7d495a38aa247b4958989ee7 Mon Sep 17 00:00:00 2001 From: Chloe Marcec Date: Thu, 11 Feb 2021 19:44:26 +1100 Subject: [PATCH] revert to std::sin and std::cos --- src/audio_core/command_generator.cpp | 4 ++-- src/audio_core/delay_line.h | 2 +- src/audio_core/effect_context.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio_core/command_generator.cpp b/src/audio_core/command_generator.cpp index 2e2b296b05..437cc5ccd0 100644 --- a/src/audio_core/command_generator.cpp +++ b/src/audio_core/command_generator.cpp @@ -91,11 +91,11 @@ float Pow10(float x) { } float SinD(float degrees) { - return std::sinf(degrees * static_cast(std::numbers::pi) / 180.0f); + return std::sin(degrees * std::numbers::pi_v / 180.0f); } float CosD(float degrees) { - return std::cosf(degrees * static_cast(std::numbers::pi) / 180.0f); + return std::cos(degrees * std::numbers::pi_v / 180.0f); } float ToFloat(s32 sample) { diff --git a/src/audio_core/delay_line.h b/src/audio_core/delay_line.h index 420b71cdb3..cafddd4328 100644 --- a/src/audio_core/delay_line.h +++ b/src/audio_core/delay_line.h @@ -9,7 +9,7 @@ public: DelayLineBase(); ~DelayLineBase(); - void Initialize(s32 _max_delay, float* src_buffer); + void Initialize(s32 max_delay_, float* src_buffer); void SetDelay(s32 new_delay); s32 GetDelay() const; s32 GetMaxDelay() const; diff --git a/src/audio_core/effect_context.cpp b/src/audio_core/effect_context.cpp index eeee8e3255..89e4573c79 100644 --- a/src/audio_core/effect_context.cpp +++ b/src/audio_core/effect_context.cpp @@ -126,10 +126,10 @@ void EffectI3dl2Reverb::Update(EffectInfo::InParams& in_params) { params.status = ParameterStatus::Initialized; skipped = in_params.buffer_address == 0 || in_params.buffer_size == 0; if (!skipped) { - auto& work_buffer = GetWorkBuffer(); + auto& cur_work_buffer = GetWorkBuffer(); // Has two buffers internally - work_buffer.resize(in_params.buffer_size * 2); - std::fill(work_buffer.begin(), work_buffer.end(), 0); + cur_work_buffer.resize(in_params.buffer_size * 2); + std::fill(cur_work_buffer.begin(), cur_work_buffer.end(), 0); } } }