svn path=/trunk/externals/nusmuk/; revision=10108

2 files changed, 486 insertions, 0 deletions

diff --git a/tab/tabosc4aa~-help.pd b/tab/tabosc4aa~-help.pd
new file mode 100644
index 0000000..da9adac
--- /dev/null
+++ b/tab/tabosc4aa~-help.pd
@@ -0,0 +1,231 @@
+#N canvas 624 76 774 681 12;
+#X floatatom 41 42 9 0 0 0 - - -;
+#N canvas 0 0 450 300 (subpatch) 0;
+#X array array99 11 float 0;
+#X coords 0 1 10 -1 250 200 1;
+#X restore 436 180 graph;
+#X obj 437 48 loadbang;
+#X floatatom 41 -1 5 0 0 0 - - -;
+#X obj 41 19 mtof;
+#X floatatom 77 307 0 0 0 0 - - -;
+#N canvas 159 26 706 447 output 0;
+#X obj 414 196 t b;
+#X obj 414 134 f;
+#X obj 414 73 inlet;
+#X text 421 36 mute;
+#X obj 414 227 f;
+#X msg 521 218 0;
+#X msg 414 104 bang;
+#X obj 414 166 moses 1;
+#X obj 521 187 t b f;
+#X obj 486 143 moses 1;
+#X obj 102 181 dbtorms;
+#X obj 486 113 r master-lvl;
+#X obj 102 52 r master-lvl;
+#X obj 414 257 s master-lvl;
+#X obj 26 222 inlet~;
+#X obj 244 50 inlet;
+#X text 244 22 level;
+#X obj 244 122 s master-lvl;
+#X msg 118 80 set \$1;
+#X obj 118 109 outlet;
+#X msg 262 78 \; pd dsp 1;
+#X obj 102 238 line~;
+#X obj 26 259 *~;
+#X obj 26 295 dac~;
+#X obj 102 210 pack 0 50;
+#X text 24 195 audio;
+#X text 114 135 show level;
+#X connect 0 0 4 0;
+#X connect 1 0 7 0;
+#X connect 2 0 6 0;
+#X connect 4 0 13 0;
+#X connect 5 0 13 0;
+#X connect 6 0 1 0;
+#X connect 7 0 0 0;
+#X connect 7 1 8 0;
+#X connect 8 0 5 0;
+#X connect 9 1 4 1;
+#X connect 10 0 24 0;
+#X connect 11 0 1 1;
+#X connect 11 0 9 0;
+#X connect 12 0 10 0;
+#X connect 12 0 18 0;
+#X connect 14 0 22 0;
+#X connect 15 0 17 0;
+#X connect 15 0 20 0;
+#X connect 18 0 19 0;
+#X connect 21 0 22 1;
+#X connect 22 0 23 0;
+#X connect 22 0 23 1;
+#X connect 24 0 21 0;
+#X restore 43 333 pd output;
+#X msg 113 307 MUTE;
+#X obj 179 230 *~;
+#X msg 356 42 \$1 30;
+#X obj 359 19 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 12700 1;
+#X obj 357 89 -~ 1;
+#X obj 356 113 *~ -1;
+#X obj 356 66 line~;
+#X obj 43 231 *~;
+#X msg 294 67 0;
+#X msg 437 75 \; array99 resize 11 \; array99 0 0 0 -0.5 -0.5 1 -1
+0.5 -1 0 0 0 \; pd dsp 1 \;;
+#X text 40 395 tabosc4c~ is a drop in remplacement for tabosc4~ \,
+but offer a 4 points cubic interpolation with tengent continuity. So
+\, in some case \, quality is better than the standart interpolation
+;
+#X obj 42 123 tabosc4aa~ array99;
+#X obj 179 122 tabosc4~ array99;
+#X obj 157 498 oscillo~;
+#X text 279 17 tabosc4~;
+#X text 498 18 tabosc4aa~;
+#N canvas 607 39 645 763 osc~ 0;
+#X obj 12 133 pack~;
+#X obj 14 7 inlet~;
+#X text 269 6 change block size;
+#X msg 77 379 0;
+#X obj 47 403 f;
+#X obj 63 428 + 1;
+#X obj 17 379 t a b;
+#X obj 16 245 gemhead;
+#X text 72 7 audio input;
+#X obj 13 29 rfft~;
+#X obj 13 51 *~;
+#X obj 53 53 *~;
+#X obj 173 6 block~ 4096 4;
+#X obj 12 75 /~ 4096;
+#X obj 12 95 log~;
+#X obj 12 114 *~ 0.05;
+#X obj 12 152 list prepend 0;
+#X obj 12 173 s \$0-fft;
+#X obj 172 26 table \$0-fft 2048;
+#X obj 172 46 table \$0-fft-lop 2048;
+#X obj 401 13 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 401 31 t b b;
+#X obj 400 71 until;
+#X msg 401 52 2048;
+#X msg 443 74 0;
+#X obj 400 96 f;
+#X obj 415 119 + 1;
+#X obj 400 163 tabread \$0-fft;
+#X obj 494 163 tabread \$0-fft-lop;
+#X obj 400 213 +;
+#X obj 400 256 tabwrite \$0-fft-lop;
+#X obj 400 138 t f f f;
+#X obj 424 7 bang~;
+#X obj 400 235 / 8;
+#X obj 495 187 * 7;
+#X obj 77 494 tabread \$0-fft-lop;
+#X obj 30 589 loadbang;
+#X obj 47 451 t f f;
+#X obj 98 591 l;
+#X msg 30 611 res 3;
+#X obj 22 224 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+1;
+#X obj 97 560 t l b;
+#X obj 18 659 curve 2;
+#X obj 46 519 pack f f f;
+#X floatatom 36 296 5 0 0 0 - - -;
+#X floatatom 78 297 5 0 0 0 - - -;
+#X obj 17 334 t a b;
+#X floatatom 72 250 5 0 0 0 - - -;
+#X floatatom 114 251 5 0 0 0 - - -;
+#X obj 17 358 repeat 2048;
+#X obj 14 277 translateXYZ -4 0 0;
+#X obj 47 471 log;
+#X obj 17 314 scaleXYZ 1.04 6 0;
+#X connect 0 0 16 0;
+#X connect 1 0 9 0;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 4 0 37 0;
+#X connect 5 0 4 1;
+#X connect 6 0 42 0;
+#X connect 6 1 4 0;
+#X connect 7 0 50 0;
+#X connect 9 0 10 0;
+#X connect 9 0 10 1;
+#X connect 9 1 11 0;
+#X connect 9 1 11 1;
+#X connect 10 0 13 0;
+#X connect 11 0 13 0;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 15 0 0 0;
+#X connect 16 0 17 0;
+#X connect 20 0 21 0;
+#X connect 21 0 23 0;
+#X connect 21 1 24 0;
+#X connect 22 0 25 0;
+#X connect 23 0 22 0;
+#X connect 24 0 25 1;
+#X connect 25 0 26 0;
+#X connect 25 0 31 0;
+#X connect 26 0 25 1;
+#X connect 27 0 29 0;
+#X connect 28 0 34 0;
+#X connect 29 0 33 0;
+#X connect 31 0 27 0;
+#X connect 31 1 28 0;
+#X connect 31 2 30 1;
+#X connect 32 0 21 0;
+#X connect 33 0 30 0;
+#X connect 34 0 29 1;
+#X connect 35 0 43 1;
+#X connect 36 0 39 0;
+#X connect 37 0 51 0;
+#X connect 37 1 35 0;
+#X connect 38 0 42 2;
+#X connect 39 0 42 0;
+#X connect 40 0 7 0;
+#X connect 41 0 38 1;
+#X connect 41 1 38 0;
+#X connect 43 0 41 0;
+#X connect 43 0 42 1;
+#X connect 44 0 52 1;
+#X connect 45 0 52 2;
+#X connect 46 0 49 0;
+#X connect 46 1 3 0;
+#X connect 47 0 50 1;
+#X connect 48 0 50 2;
+#X connect 49 0 6 0;
+#X connect 50 0 52 0;
+#X connect 51 0 43 0;
+#X connect 52 0 46 0;
+#X restore 205 288 pd osc~;
+#X msg 305 230 reset \, create \, 1;
+#X msg 311 252 0 \, destroy;
+#X obj 305 274 gemwin 60;
+#X msg 41 60 \$1 100;
+#X obj 41 83 line~;
+#X connect 0 0 27 0;
+#X connect 2 0 16 0;
+#X connect 3 0 4 0;
+#X connect 4 0 0 0;
+#X connect 5 0 6 1;
+#X connect 6 0 5 0;
+#X connect 7 0 6 2;
+#X connect 8 0 6 0;
+#X connect 8 0 20 0;
+#X connect 8 0 23 0;
+#X connect 9 0 13 0;
+#X connect 10 0 9 0;
+#X connect 11 0 12 0;
+#X connect 12 0 8 1;
+#X connect 13 0 11 0;
+#X connect 13 0 14 1;
+#X connect 14 0 6 0;
+#X connect 14 0 20 0;
+#X connect 14 0 23 0;
+#X connect 15 0 18 1;
+#X connect 15 0 19 1;
+#X connect 18 0 14 0;
+#X connect 19 0 8 0;
+#X connect 24 0 26 0;
+#X connect 25 0 26 0;
+#X connect 27 0 28 0;
+#X connect 28 0 18 0;
+#X connect 28 0 19 0;
diff --git a/tab/tabosc4aa~.c b/tab/tabosc4aa~.c
new file mode 100644
index 0000000..8ebf5b8
--- /dev/null
+++ b/tab/tabosc4aa~.c
@@ -0,0 +1,255 @@
+// tabosc4aa~
+// can replace with tabosc4~
+// most of this code comes from pd. just the interpolation shematic is diferent.
+
+/* 
+This software is copyrighted by Miller Puckette and others.  The following
+terms (the "Standard Improved BSD License") apply to all files associated with
+the software unless explicitly disclaimed in individual files:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above  
+   copyright notice, this list of conditions and the following 
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+3. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior 
+   written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,   
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// Cyrille Henry 06 2008
+
+
+#include "m_pd.h"
+
+/******************** tabosc4aa~ ***********************/
+
+/* this is all copied from d_osc.c... what include file could this go in? */
+#define UNITBIT32 1572864.  /* 3*2^19; bit 32 has place value 1 */
+
+    /* machine-dependent definitions.  These ifdefs really
+    should have been by CPU type and not by operating system! */
+#ifdef IRIX
+    /* big-endian.  Most significant byte is at low address in memory */
+#define HIOFFSET 0    /* word offset to find MSB */
+#define LOWOFFSET 1    /* word offset to find LSB */
+#define int32 long  /* a data type that has 32 bits */
+#endif /* IRIX */
+
+#ifdef MSW
+    /* little-endian; most significant byte is at highest address */
+#define HIOFFSET 1
+#define LOWOFFSET 0
+#define int32 long
+#endif
+
+#if defined(__FreeBSD__) || defined(__APPLE__)
+#include <machine/endian.h>
+#endif
+
+#ifdef __linux__
+#include <endian.h>
+#endif
+
+#if defined(__unix__) || defined(__APPLE__)
+#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN)                         
+#error No byte order defined                                                    
+#endif                                                                          
+
+#if BYTE_ORDER == LITTLE_ENDIAN                                             
+#define HIOFFSET 1                                                              
+#define LOWOFFSET 0                                                             
+#else                                                                           
+#define HIOFFSET 0    /* word offset to find MSB */                             
+#define LOWOFFSET 1    /* word offset to find LSB */                            
+#endif /* __BYTE_ORDER */                                                       
+#include <sys/types.h>
+#define int32 int32_t
+#endif /* __unix__ or __APPLE__*/
+
+union tabfudge
+{
+    double tf_d;
+    int32 tf_i[2];
+};
+
+static t_class *tabosc4aa_tilde_class;
+
+typedef struct _tabosc4aa_tilde
+{
+    t_object x_obj;
+    t_float x_fnpoints;
+    t_float x_finvnpoints;
+    t_word *x_vec;
+    t_symbol *x_arrayname;
+    t_float x_f;
+    double x_phase;
+    t_float x_conv;
+	t_sample x_prev_in, x_last_in, x_prev_out, x_last_out;
+} t_tabosc4aa_tilde;
+
+static void *tabosc4aa_tilde_new(t_symbol *s)
+{
+    t_tabosc4aa_tilde *x = (t_tabosc4aa_tilde *)pd_new(tabosc4aa_tilde_class);
+    x->x_arrayname = s;
+    x->x_vec = 0;
+    x->x_fnpoints = 512.;
+    x->x_finvnpoints = (1./512.);
+    outlet_new(&x->x_obj, gensym("signal"));
+    inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft1"));
+    x->x_f = 0;
+    return (x);
+}
+
+static t_int *tabosc4aa_tilde_perform(t_int *w)
+{
+    t_tabosc4aa_tilde *x = (t_tabosc4aa_tilde *)(w[1]);
+    t_sample *in = (t_sample *)(w[2]);
+    t_sample *out = (t_sample *)(w[3]);
+    int n = (int)(w[4]);
+    int normhipart;
+    union tabfudge tf;
+    double a1,a2,a3; // CH
+    t_float fnpoints = x->x_fnpoints;
+    int mask = fnpoints - 1;
+    t_float conv = fnpoints * x->x_conv;
+    int maxindex;
+    t_word *tab = x->x_vec, *addr;
+    int i;
+    double dphase = fnpoints * x->x_phase + UNITBIT32;
+
+    if (!tab) goto zero;
+    tf.tf_d = UNITBIT32;
+    normhipart = tf.tf_i[HIOFFSET];
+
+#if 1
+    while (n--)
+    {
+        t_sample frac,  a,  b,  c,  d, cminusb, temp, filter_out;
+
+		temp = 0;
+		for (i=0;i<8;i++)
+		{
+	        tf.tf_d = dphase;
+    	    dphase += *in/8 * conv;
+    	    addr = tab + (tf.tf_i[HIOFFSET] & mask);
+    	    tf.tf_i[HIOFFSET] = normhipart;
+    	    frac = tf.tf_d - UNITBIT32;
+    	    a = addr[0].w_float;
+    	    b = addr[1].w_float;
+    	    c = addr[2].w_float;
+    	    d = addr[3].w_float;
+
+			// 4-point, 3rd-order Hermite (x-form)
+			a1 = 0.5f * (c - a);
+			a2 = a - 2.5 * b + 2.f * c - 0.5f * d;
+			a3 = 0.5f * (d - a) + 1.5f * (b - c);
+
+			temp =  ((a3 * frac + a2) * frac + a1) * frac + b;
+
+//			temp = cut_filter(x, temp);
+//	t_sample filter_out;
+
+			filter_out = 0.0147491 * temp + 0.0294982 * x->x_last_in + 0.0147491 * x->x_prev_in + 1.60425 * x->x_last_out - 0.663244 * x->x_prev_out; 
+
+			x->x_prev_in = x->x_last_in;
+			x->x_last_in = temp;
+			x->x_prev_out = x->x_last_out;
+			x->x_last_out = filter_out;
+
+		}
+		*out++ = filter_out;
+		*in++;
+    }
+#endif
+
+    tf.tf_d = UNITBIT32 * fnpoints;
+    normhipart = tf.tf_i[HIOFFSET];
+    tf.tf_d = dphase + (UNITBIT32 * fnpoints - UNITBIT32);
+    tf.tf_i[HIOFFSET] = normhipart;
+    x->x_phase = (tf.tf_d - UNITBIT32 * fnpoints)  * x->x_finvnpoints;
+    return (w+5);
+ zero:
+    while (n--) *out++ = 0;
+
+    return (w+5);
+}
+
+void tabosc4aa_tilde_set(t_tabosc4aa_tilde *x, t_symbol *s)
+{
+    t_garray *a;
+    int npoints, pointsinarray;
+
+    x->x_arrayname = s;
+    if (!(a = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class)))
+    {
+        if (*s->s_name)
+            pd_error(x, "tabosc4aa~: %s: no such array", x->x_arrayname->s_name);
+        x->x_vec = 0;
+    }
+    else if (!garray_getfloatwords(a, &pointsinarray, &x->x_vec))
+    {
+        pd_error(x, "%s: bad template for tabosc4aa~", x->x_arrayname->s_name);
+        x->x_vec = 0;
+    }
+    else if ((npoints = pointsinarray - 3) != (1 << ilog2(pointsinarray - 3)))
+    {
+        pd_error(x, "%s: number of points (%d) not a power of 2 plus three",
+            x->x_arrayname->s_name, pointsinarray);
+        x->x_vec = 0;
+        garray_usedindsp(a);
+    }
+    else
+    {
+        x->x_fnpoints = npoints;
+        x->x_finvnpoints = 1./npoints;
+        garray_usedindsp(a);
+    }
+}
+
+static void tabosc4aa_tilde_ft1(t_tabosc4aa_tilde *x, t_float f)
+{
+    x->x_phase = f;
+}
+
+static void tabosc4aa_tilde_dsp(t_tabosc4aa_tilde *x, t_signal **sp)
+{
+    x->x_conv = 1. / sp[0]->s_sr;
+    tabosc4aa_tilde_set(x, x->x_arrayname);
+
+    dsp_add(tabosc4aa_tilde_perform, 4, x,
+        sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
+}
+
+void tabosc4aa_tilde_setup(void)
+{
+    tabosc4aa_tilde_class = class_new(gensym("tabosc4aa~"),
+        (t_newmethod)tabosc4aa_tilde_new, 0,
+        sizeof(t_tabosc4aa_tilde), 0, A_DEFSYM, 0);
+    CLASS_MAINSIGNALIN(tabosc4aa_tilde_class, t_tabosc4aa_tilde, x_f);
+    class_addmethod(tabosc4aa_tilde_class, (t_method)tabosc4aa_tilde_dsp,
+        gensym("dsp"), 0);
+    class_addmethod(tabosc4aa_tilde_class, (t_method)tabosc4aa_tilde_set,
+        gensym("set"), A_SYMBOL, 0);
+    class_addmethod(tabosc4aa_tilde_class, (t_method)tabosc4aa_tilde_ft1,
+        gensym("ft1"), A_FLOAT, 0);
+}
+