diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-22 18:42:01 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-22 18:42:01 +0200 |
| commit | 72aa1cd86cf04964f08e7ca0557f73afd1c96e83 (patch) | |
| tree | c9f59e03d54bd2ca4f15fe6bc94a06e918df4e6e /libs/ardour/kmeterdsp.cc | |
| parent | e294e78fefe77897a9a014d7b84d436a9aff6f9b (diff) | |
Revert "Revert new meter types (postponed until after 3.3 release)"
This reverts commit d80f672e8487f459d76ab291958bffcded08f0fd.
Diffstat (limited to 'libs/ardour/kmeterdsp.cc')
| -rw-r--r-- | libs/ardour/kmeterdsp.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libs/ardour/kmeterdsp.cc b/libs/ardour/kmeterdsp.cc index afd0f71719..d4460f94cb 100644 --- a/libs/ardour/kmeterdsp.cc +++ b/libs/ardour/kmeterdsp.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2008-2011 Fons Adriaensen <fons@linuxaudio.org> - Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org> + Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,12 +17,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #include <math.h> -#include "kmeterdsp.h" +#include "ardour/kmeterdsp.h" + float Kmeterdsp::_omega; + Kmeterdsp::Kmeterdsp (void) : _z1 (0), _z2 (0), @@ -36,6 +37,10 @@ Kmeterdsp::~Kmeterdsp (void) { } +void Kmeterdsp::init (int fsamp) +{ + _omega = 9.72f / fsamp; // ballistic filter coefficient +} void Kmeterdsp::process (float *p, int n) { @@ -96,7 +101,6 @@ void Kmeterdsp::process (float *p, int n) } } - /* Returns highest _rms value since last call */ float Kmeterdsp::read () { @@ -105,15 +109,10 @@ float Kmeterdsp::read () return rv; } -void Kmeterdsp::init (int fsamp) -{ - _omega = 9.72f / fsamp; // ballistic filter coefficient -} - void Kmeterdsp::reset () { - _z1 = _z2 = _rms = 0.0; - _flag=false; + _z1 = _z2 = _rms = .0f; + _flag = false; } -/* vi:set ts=8 sts=8 sw=8: */ +/* vi:set ts=8 sts=8 sw=4: */ |