From 3af5c344f242e9e37b5d3dc853639f4d6ae6c1c6 Mon Sep 17 00:00:00 2001 From: HiveBeats Date: Sun, 10 Sep 2023 01:28:48 +0400 Subject: [PATCH] wip: private method naming conventions --- inc/BandPassFilter.h | 2 +- inc/Filter.h | 4 ++-- inc/FilterFactory.h | 14 +++++++------- inc/HighPassFilter.h | 2 +- inc/LowPassFilter.h | 2 +- src/BandPassFilter.cpp | 4 ++-- src/Filter.cpp | 4 ++-- src/HighPassFilter.cpp | 4 ++-- src/LowPassFilter.cpp | 4 ++-- src/Synth.cpp | 10 +++++----- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/inc/BandPassFilter.h b/inc/BandPassFilter.h index 43e287d..e83c929 100644 --- a/inc/BandPassFilter.h +++ b/inc/BandPassFilter.h @@ -3,7 +3,7 @@ class BandPassFilter : public Filter { private: - void calculate_coefficients() override; + void CalculateCoefficients() override; public: BandPassFilter(Filter* filter); diff --git a/inc/Filter.h b/inc/Filter.h index 75a82bd..7b5f567 100644 --- a/inc/Filter.h +++ b/inc/Filter.h @@ -17,8 +17,8 @@ class Filter : public Effect { float m_a0, m_a1, m_a2, m_b1, m_b2; float m_z1, m_z2; - void calculate_normals(); - virtual void calculate_coefficients(){}; + void CalculateNormals(); + virtual void CalculateCoefficients(){}; public: Filter(/* args */); diff --git a/inc/FilterFactory.h b/inc/FilterFactory.h index 830838b..1fe471c 100644 --- a/inc/FilterFactory.h +++ b/inc/FilterFactory.h @@ -5,22 +5,22 @@ #include "HighPassFilter.h" struct FilterFactory { - static Filter* CreateFilter(Filter* oldFilter, FilterType newType) { - Filter* newFilter; - switch (newType) { + static Filter* CreateFilter(Filter* old_filter, FilterType new_type) { + Filter* new_filter; + switch (new_type) { case LowPass: - newFilter = new LowPassFilter(oldFilter); + new_filter = new LowPassFilter(old_filter); break; case BandPass: - newFilter = new BandPassFilter(oldFilter); + new_filter = new BandPassFilter(old_filter); break; case HighPass: - newFilter = new HighPassFilter(oldFilter); + new_filter = new HighPassFilter(old_filter); break; default: break; } - return newFilter; + return new_filter; } static Filter* GetDefaultFilter() { diff --git a/inc/HighPassFilter.h b/inc/HighPassFilter.h index 3461322..69556a5 100644 --- a/inc/HighPassFilter.h +++ b/inc/HighPassFilter.h @@ -3,7 +3,7 @@ class HighPassFilter : public Filter { private: - void calculate_coefficients() override; + void CalculateCoefficients() override; public: HighPassFilter(); diff --git a/inc/LowPassFilter.h b/inc/LowPassFilter.h index 53e1084..1ee043b 100644 --- a/inc/LowPassFilter.h +++ b/inc/LowPassFilter.h @@ -4,7 +4,7 @@ class LowPassFilter : public Filter { protected: - void calculate_coefficients() override; + void CalculateCoefficients() override; public: LowPassFilter(); diff --git a/src/BandPassFilter.cpp b/src/BandPassFilter.cpp index 7b2a39c..c751e3d 100644 --- a/src/BandPassFilter.cpp +++ b/src/BandPassFilter.cpp @@ -12,8 +12,8 @@ BandPassFilter::BandPassFilter(float freq, float res, float q) {} BandPassFilter::~BandPassFilter() {} -void BandPassFilter::calculate_coefficients() { - calculate_normals(); +void BandPassFilter::CalculateCoefficients() { + CalculateNormals(); m_norm = 1 / (1 + m_k / m_q + m_k * m_k); m_a0 = m_k / m_q * m_norm; m_a1 = 0; diff --git a/src/Filter.cpp b/src/Filter.cpp index 82ddbe4..4beecce 100644 --- a/src/Filter.cpp +++ b/src/Filter.cpp @@ -5,7 +5,7 @@ Filter::Filter(/* args */) {} Filter::~Filter() {} -void Filter::calculate_normals() { +void Filter::CalculateNormals() { m_v = powf(10, fabs(m_order) / 20.0); m_k = tanf(M_PI * m_freq); } @@ -16,7 +16,7 @@ void Filter::Release() {} float Filter::Process(float in) { // may move to a compile-time dictionary calculation, if needed - calculate_coefficients(); + CalculateCoefficients(); float out = in * m_a0 + m_z1; m_z1 = in * m_a1 + m_z2 - m_b1 * out; m_z2 = in * m_a2 - m_b2 * out; diff --git a/src/HighPassFilter.cpp b/src/HighPassFilter.cpp index b210f8c..587d520 100644 --- a/src/HighPassFilter.cpp +++ b/src/HighPassFilter.cpp @@ -12,8 +12,8 @@ HighPassFilter::HighPassFilter(float freq, float res, float q) {} HighPassFilter::~HighPassFilter() {} -void HighPassFilter::calculate_coefficients() { - calculate_normals(); +void HighPassFilter::CalculateCoefficients() { + CalculateNormals(); m_norm = 1 / (1 + m_k / m_q + m_k * m_k); m_a0 = 1 * m_norm; m_a1 = -2 * m_a0; diff --git a/src/LowPassFilter.cpp b/src/LowPassFilter.cpp index 2b42168..2ee08dd 100644 --- a/src/LowPassFilter.cpp +++ b/src/LowPassFilter.cpp @@ -22,8 +22,8 @@ LowPassFilter::LowPassFilter(Filter* filter) { LowPassFilter::~LowPassFilter() {} -void LowPassFilter::calculate_coefficients() { - calculate_normals(); +void LowPassFilter::CalculateCoefficients() { + CalculateNormals(); m_norm = 1 / (1 + m_k / m_q + m_k * m_k); m_a0 = m_k * m_k * m_norm; m_a1 = 2 * m_a0; diff --git a/src/Synth.cpp b/src/Synth.cpp index e4dfe41..59b1efa 100644 --- a/src/Synth.cpp +++ b/src/Synth.cpp @@ -96,10 +96,10 @@ void Synth::Release() { void Synth::AddEffect(Effect* fx) { m_effects.push_back(fx); } void Synth::SetFilter(FilterType type) { - Filter* oldFilter = this->GetFilter(); - if (!oldFilter->IsSameFilterType(type)) { - Filter* newFilter = FilterFactory::CreateFilter(oldFilter, type); - delete oldFilter; - m_effects[1] = newFilter; + Filter* old_filter = this->GetFilter(); + if (!old_filter->IsSameFilterType(type)) { + Filter* new_filter = FilterFactory::CreateFilter(old_filter, type); + delete old_filter; + m_effects[1] = new_filter; } }