aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/Makefile2
-rw-r--r--modules/eadsr~.c33
-rw-r--r--modules/ead~.c34
-rw-r--r--modules/ear~.c33
-rw-r--r--modules/extlib_util.h12
5 files changed, 12 insertions, 102 deletions
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