From d80f672e8487f459d76ab291958bffcded08f0fd Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 15 Jul 2013 16:07:37 +0200 Subject: Revert new meter types (postponed until after 3.3 release) This reverts commit ce621d1c8a600853be0020942a9664ccee0ab165. This reverts commit 80aa2574819e947668092c660d767e25a661c6f1. --- libs/ardour/iec1ppmdsp.cc | 100 ---------------------------------------------- 1 file changed, 100 deletions(-) delete mode 100644 libs/ardour/iec1ppmdsp.cc (limited to 'libs/ardour/iec1ppmdsp.cc') diff --git a/libs/ardour/iec1ppmdsp.cc b/libs/ardour/iec1ppmdsp.cc deleted file mode 100644 index bed825048f..0000000000 --- a/libs/ardour/iec1ppmdsp.cc +++ /dev/null @@ -1,100 +0,0 @@ -/* - Copyright (C) 2012 Fons Adriaensen - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include -#include "ardour/iec1ppmdsp.h" - - -float Iec1ppmdsp::_w1; -float Iec1ppmdsp::_w2; -float Iec1ppmdsp::_w3; -float Iec1ppmdsp::_g; - - -Iec1ppmdsp::Iec1ppmdsp (void) : - _z1 (0), - _z2 (0), - _m (0), - _res (true) -{ -} - - -Iec1ppmdsp::~Iec1ppmdsp (void) -{ -} - - -void Iec1ppmdsp::process (float *p, int n) -{ - float z1, z2, m, t; - - z1 = _z1; - z2 = _z2; - m = _res ? 0: _m; - _res = false; - - n /= 4; - while (n--) - { - z1 *= _w3; - z2 *= _w3; - t = fabsf (*p++); - if (t > z1) z1 += _w1 * (t - z1); - if (t > z2) z2 += _w2 * (t - z2); - t = fabsf (*p++); - if (t > z1) z1 += _w1 * (t - z1); - if (t > z2) z2 += _w2 * (t - z2); - t = fabsf (*p++); - if (t > z1) z1 += _w1 * (t - z1); - if (t > z2) z2 += _w2 * (t - z2); - t = fabsf (*p++); - if (t > z1) z1 += _w1 * (t - z1); - if (t > z2) z2 += _w2 * (t - z2); - t = z1 + z2; - if (t > m) m = t; - } - - _z1 = z1 + 1e-10f; - _z2 = z2 + 1e-10f; - _m = m; -} - - -float Iec1ppmdsp::read (void) -{ - _res = true; - return _g * _m; -} - -void Iec1ppmdsp::reset () -{ - _z1 = _z2 = _m = .0f; - _res = true; -} - -void Iec1ppmdsp::init (float fsamp) -{ - _w1 = 450.0f / fsamp; - _w2 = 1300.0f / fsamp; - _w3 = 1.0f - 5.4f / fsamp; - _g = 0.5108f; -} - -/* vi:set ts=8 sts=8 sw=4: */ -- cgit v1.2.3