From fd57cb0fc97e8321a63c446a5fdf83c72804ea4b Mon Sep 17 00:00:00 2001 From: Tom Schouten Date: Fri, 25 Aug 2006 23:07:37 +0000 Subject: removed envelope_utils.c - moved milliseconds_2_one_minus_realpole() to extlib_util.h as static inline svn path=/trunk/externals/creb/; revision=5744 --- modules/Makefile | 2 +- modules/eadsr~.c | 33 --------------------------------- modules/ead~.c | 34 ---------------------------------- modules/ear~.c | 33 --------------------------------- modules/extlib_util.h | 12 +++++++++++- 5 files changed, 12 insertions(+), 102 deletions(-) (limited to 'modules') diff --git a/modules/Makefile b/modules/Makefile index 7dc0178..91f89fa 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -10,7 +10,7 @@ current: ead~.o ear~.o eadsr~.o dist~.o \ \ dwt.o cmath.o \ \ - envelope_util.o setup.o + setup.o clean: diff --git a/modules/eadsr~.c b/modules/eadsr~.c index d3d0720..d2a1968 100644 --- a/modules/eadsr~.c +++ b/modules/eadsr~.c @@ -178,36 +178,3 @@ void eadsr_tilde_setup(void) } -/* - * Utility functions for exponential decay - * Copyright (c) 2000-2003 by Tom Schouten - * - * 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 "extlib_util.h" - -float milliseconds_2_one_minus_realpole(float time) -{ - float r; - - if (time < 0.0f) time = 0.0f; - r = -expm1(1000.0f * log(ENVELOPE_RANGE) / (sys_getsr() * time)); - if (!(r < 1.0f)) r = 1.0f; - - //post("%f",r); - return r; -} diff --git a/modules/ead~.c b/modules/ead~.c index 3e8a997..3d79312 100644 --- a/modules/ead~.c +++ b/modules/ead~.c @@ -156,37 +156,3 @@ void ead_tilde_setup(void) class_addmethod(ead_class, (t_method)ead_decay, gensym("decay"), A_FLOAT, 0); } - -/* - * Utility functions for exponential decay - * Copyright (c) 2000-2003 by Tom Schouten - * - * 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 "extlib_util.h" - -float milliseconds_2_one_minus_realpole(float time) -{ - float r; - - if (time < 0.0f) time = 0.0f; - r = -expm1(1000.0f * log(ENVELOPE_RANGE) / (sys_getsr() * time)); - if (!(r < 1.0f)) r = 1.0f; - - //post("%f",r); - return r; -} diff --git a/modules/ear~.c b/modules/ear~.c index adb0078..28fe097 100644 --- a/modules/ear~.c +++ b/modules/ear~.c @@ -140,36 +140,3 @@ void ear_tilde_setup(void) } -/* - * Utility functions for exponential decay - * Copyright (c) 2000-2003 by Tom Schouten - * - * 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 "extlib_util.h" - -float milliseconds_2_one_minus_realpole(float time) -{ - float r; - - if (time < 0.0f) time = 0.0f; - r = -expm1(1000.0f * log(ENVELOPE_RANGE) / (sys_getsr() * time)); - if (!(r < 1.0f)) r = 1.0f; - - //post("%f",r); - return r; -} diff --git a/modules/extlib_util.h b/modules/extlib_util.h index ea292be..195d85f 100644 --- a/modules/extlib_util.h +++ b/modules/extlib_util.h @@ -31,7 +31,17 @@ #define ENVELOPE_MIN ENVELOPE_RANGE /* convert milliseconds to 1-p, with p a real pole */ -float milliseconds_2_one_minus_realpole(float time); +static inline float milliseconds_2_one_minus_realpole(float time) +{ + float r; + + if (time < 0.0f) time = 0.0f; + r = -expm1(1000.0f * log(ENVELOPE_RANGE) / (sys_getsr() * time)); + if (!(r < 1.0f)) r = 1.0f; + + //post("%f",r); + return r; +} typedef union -- cgit v1.2.1