From 80aa2574819e947668092c660d767e25a661c6f1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 15 Jul 2013 15:00:22 +0200 Subject: add VU and IEC meter DSP (from jmeters) --- libs/ardour/kmeterdsp.cc | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'libs/ardour/kmeterdsp.cc') diff --git a/libs/ardour/kmeterdsp.cc b/libs/ardour/kmeterdsp.cc index 77d1a87a81..2490ae34ec 100644 --- a/libs/ardour/kmeterdsp.cc +++ b/libs/ardour/kmeterdsp.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2008-2011 Fons Adriaensen - Adopted for Ardour 2013 by Robin Gareus + Adopted for Ardour 2013 by Robin Gareus 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 -#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) { @@ -93,7 +98,6 @@ void Kmeterdsp::process (float *p, int n) if (s > _rms) _rms = s; } - /* Returns highest _rms value since last call */ float Kmeterdsp::read () { @@ -102,15 +106,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: */ -- cgit v1.2.3