From 087d52a77c70528d042cff4472b9207702a517b8 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 16 May 2020 18:33:18 +0200 Subject: NO-OP: whitespace & const'ness --- libs/ardour/ardour/mtdm.h | 65 +++++++++------- libs/ardour/mtdm.cc | 190 +++++++++++++++++++++++----------------------- 2 files changed, 134 insertions(+), 121 deletions(-) diff --git a/libs/ardour/ardour/mtdm.h b/libs/ardour/ardour/mtdm.h index 94f855f229..7cde5d0253 100644 --- a/libs/ardour/ardour/mtdm.h +++ b/libs/ardour/ardour/mtdm.h @@ -28,36 +28,47 @@ class LIBARDOUR_API MTDM { public: + MTDM (int fsamp); + int process (size_t len, float* inp, float* out); + int resolve (void); - MTDM (int fsamp); - int process (size_t len, float *inp, float *out); - int resolve (void); - void invert (void) { _inv ^= 1; } - int inv (void) { return _inv; } - double del (void) { return _del; } - double err (void) { return _err; } - float get_peak () { const float rv = _peak; _peak = 0; return rv; } + int inv (void) const { return _inv; } + double del (void) const { return _del; } + double err (void) const { return _err; } + + void invert (void) + { + _inv ^= 1; + } + + float get_peak () + { + const float rv = _peak; + _peak = 0; + return rv; + } private: - class Freq { - public: - int p; - int f; - float xa; - float ya; - float x1; - float y1; - float x2; - float y2; - }; - - double _del; - double _err; - float _wlp; - int _cnt; - int _inv; - Freq _freq [13]; - float _peak; + class Freq + { + public: + int p; + int f; + float xa; + float ya; + float x1; + float y1; + float x2; + float y2; + }; + + double _del; + double _err; + float _wlp; + int _cnt; + int _inv; + Freq _freq[13]; + float _peak; }; #endif /* __libardour_mtdm_h__ */ diff --git a/libs/ardour/mtdm.cc b/libs/ardour/mtdm.cc index 59d3a2829f..fae0b5b5ac 100644 --- a/libs/ardour/mtdm.cc +++ b/libs/ardour/mtdm.cc @@ -19,117 +19,119 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include #include +#include #include "ardour/mtdm.h" MTDM::MTDM (int fsamp) - : _cnt (0) - , _inv (0) - , _peak (0) + : _cnt (0) + , _inv (0) + , _peak (0) { - int i; - Freq *F; + int i; + Freq* F; - _freq [0].f = 4096; - _freq [1].f = 2048; - _freq [2].f = 3072; - _freq [3].f = 2560; - _freq [4].f = 2304; - _freq [5].f = 2176; - _freq [6].f = 1088; - _freq [7].f = 1312; - _freq [8].f = 1552; - _freq [9].f = 1800; - _freq [10].f = 3332; - _freq [11].f = 3586; - _freq [12].f = 3841; - _wlp = 200.0f / fsamp; - for (i = 0, F = _freq; i < 13; i++, F++) - { - F->p = 128; - F->xa = F->ya = 0.0f; - F->x1 = F->y1 = 0.0f; - F->x2 = F->y2 = 0.0f; - } + _freq[0].f = 4096; + _freq[1].f = 2048; + _freq[2].f = 3072; + _freq[3].f = 2560; + _freq[4].f = 2304; + _freq[5].f = 2176; + _freq[6].f = 1088; + _freq[7].f = 1312; + _freq[8].f = 1552; + _freq[9].f = 1800; + _freq[10].f = 3332; + _freq[11].f = 3586; + _freq[12].f = 3841; + _wlp = 200.0f / fsamp; + for (i = 0, F = _freq; i < 13; i++, F++) { + F->p = 128; + F->xa = F->ya = 0.0f; + F->x1 = F->y1 = 0.0f; + F->x2 = F->y2 = 0.0f; + } } - -int MTDM::process (size_t len, float *ip, float *op) +int +MTDM::process (size_t len, float* ip, float* op) { - int i; - float vip, vop, a, c, s; - Freq *F; - float peak = 0; - assert (len > 0); + int i; + float vip, vop, a, c, s; + Freq* F; + float peak = 0; + assert (len > 0); - while (len--) - { - vop = 0.0f; - vip = *ip++; - if (fabsf(vip) > peak) { peak = vip; } - for (i = 0, F = _freq; i < 13; i++, F++) - { - a = 2 * (float) M_PI * (F->p & 65535) / 65536.0; - F->p += F->f; - c = cosf (a); - s = -sinf (a); - vop += (i ? 0.01f : 0.20f) * s; - F->xa += s * vip; - F->ya += c * vip; - } - *op++ = vop; - if (++_cnt == 16) - { - for (i = 0, F = _freq; i < 13; i++, F++) - { - F->x1 += _wlp * (F->xa - F->x1 + 1e-20); - F->y1 += _wlp * (F->ya - F->y1 + 1e-20); - F->x2 += _wlp * (F->x1 - F->x2 + 1e-20); - F->y2 += _wlp * (F->y1 - F->y2 + 1e-20); - F->xa = F->ya = 0.0f; - } - _cnt = 0; + while (len--) { + vop = 0.0f; + vip = *ip++; + if (fabsf (vip) > peak) { + peak = vip; + } + for (i = 0, F = _freq; i < 13; i++, F++) { + a = 2 * (float)M_PI * (F->p & 65535) / 65536.0; + F->p += F->f; + c = cosf (a); + s = -sinf (a); + vop += (i ? 0.01f : 0.20f) * s; + F->xa += s * vip; + F->ya += c * vip; + } + *op++ = vop; + if (++_cnt == 16) { + for (i = 0, F = _freq; i < 13; i++, F++) { + F->x1 += _wlp * (F->xa - F->x1 + 1e-20); + F->y1 += _wlp * (F->ya - F->y1 + 1e-20); + F->x2 += _wlp * (F->x1 - F->x2 + 1e-20); + F->y2 += _wlp * (F->y1 - F->y2 + 1e-20); + F->xa = F->ya = 0.0f; + } + _cnt = 0; + } } - } - if (peak > _peak) { _peak = vip; } + if (peak > _peak) { + _peak = vip; + } - return 0; + return 0; } - -int MTDM::resolve (void) +int +MTDM::resolve (void) { - int i, k, m; - double d, e, f0, p; - Freq *F = _freq; + int i, k, m; + double d, e, f0, p; + Freq* F = _freq; - if (hypot (F->x2, F->y2) < 0.001) return -1; - d = atan2 (F->y2, F->x2) / (2 * M_PI); - if (_inv) d += 0.5; - if (d > 0.5) d -= 1.0; - f0 = _freq [0].f; - m = 1; - _err = 0.0; - for (i = 0; i < 12; i++) - { - F++; - p = atan2 (F->y2, F->x2) / (2 * M_PI) - d * F->f / f0; - if (_inv) p += 0.5; - p -= floor (p); - p *= 2; - k = (int)(floor (p + 0.5)); - e = fabs (p - k); - if (e > _err) _err = e; - if (e > 0.4) return 1; - d += m * (k & 1); - m *= 2; - } - _del = 16 * d; + if (hypot (F->x2, F->y2) < 0.001) + return -1; + d = atan2 (F->y2, F->x2) / (2 * M_PI); + if (_inv) + d += 0.5; + if (d > 0.5) + d -= 1.0; + f0 = _freq[0].f; + m = 1; + _err = 0.0; + for (i = 0; i < 12; i++) { + F++; + p = atan2 (F->y2, F->x2) / (2 * M_PI) - d * F->f / f0; + if (_inv) + p += 0.5; + p -= floor (p); + p *= 2; + k = (int)(floor (p + 0.5)); + e = fabs (p - k); + if (e > _err) + _err = e; + if (e > 0.4) + return 1; + d += m * (k & 1); + m *= 2; + } + _del = 16 * d; - return 0; + return 0; } - - -- cgit v1.2.3