Update of /cvsroot/pure-data/externals/creb/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv360/creb/modules
Modified Files: Makefile eadsr~.c ead~.c ear~.c extlib_util.h Log Message: removed envelope_utils.c - moved milliseconds_2_one_minus_realpole() to extlib_util.h as static inline
Index: eadsr~.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/eadsr~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** eadsr~.c 22 Aug 2006 00:58:25 -0000 1.5 --- eadsr~.c 25 Aug 2006 23:07:37 -0000 1.6 *************** *** 179,213 **** }
- /* - * 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; - } --- 179,180 ----
Index: ear~.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/ear~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ear~.c 22 Aug 2006 00:58:25 -0000 1.5 --- ear~.c 25 Aug 2006 23:07:37 -0000 1.6 *************** *** 141,175 **** }
- /* - * 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; - } --- 141,142 ----
Index: extlib_util.h =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/extlib_util.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extlib_util.h 25 Aug 2006 22:38:42 -0000 1.4 --- extlib_util.h 25 Aug 2006 23:07:37 -0000 1.5 *************** *** 32,36 ****
/* convert milliseconds to 1-p, with p a real pole */ ! float milliseconds_2_one_minus_realpole(float time);
--- 32,46 ----
/* convert milliseconds to 1-p, with p a real pole */ ! 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; ! }
Index: ead~.c =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/ead~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ead~.c 22 Aug 2006 00:58:25 -0000 1.5 --- ead~.c 25 Aug 2006 23:07:37 -0000 1.6 *************** *** 157,192 **** 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; - } --- 157,158 ----
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/creb/modules/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 15 Aug 2006 15:11:51 -0000 1.5 --- Makefile 25 Aug 2006 23:07:37 -0000 1.6 *************** *** 11,15 **** dwt.o cmath.o \ \ ! envelope_util.o setup.o
--- 11,15 ---- dwt.o cmath.o \ \ ! setup.o