[PD-cvs] SF.net SVN: pure-data: [10068] trunk/externals/nusmuk/tab

nusmuk at users.sourceforge.net nusmuk at users.sourceforge.net
Mon Jun 23 11:05:45 CEST 2008


Revision: 10068
          http://pure-data.svn.sourceforge.net/pure-data/?rev=10068&view=rev
Author:   nusmuk
Date:     2008-06-23 02:05:45 -0700 (Mon, 23 Jun 2008)

Log Message:
-----------


Modified Paths:
--------------
    trunk/externals/nusmuk/tab/makefile
    trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd
    trunk/externals/nusmuk/tab/tabosc4cloop~.c
    trunk/externals/nusmuk/tab/tabosc4c~-help.pd
    trunk/externals/nusmuk/tab/tabosc4c~.c
    trunk/externals/nusmuk/tab/tabread4c~-help.pd
    trunk/externals/nusmuk/tab/tabread4c~.c

Added Paths:
-----------
    trunk/externals/nusmuk/tab/tabosc4h~-help.pd
    trunk/externals/nusmuk/tab/tabosc4h~.c
    trunk/externals/nusmuk/tab/tabread4h~-help.pd

Modified: trunk/externals/nusmuk/tab/makefile
===================================================================
--- trunk/externals/nusmuk/tab/makefile	2008-06-22 23:21:10 UTC (rev 10067)
+++ trunk/externals/nusmuk/tab/makefile	2008-06-23 09:05:45 UTC (rev 10068)
@@ -5,7 +5,7 @@
 
 # ----------------------- NT -----------------------
 
-pd_nt: tabosc4c~.dll tabread4c~.dll
+pd_nt: tabosc4c~.dll tabosc4cloop~.dll tabread4c~.dll tabosc4h~.dll
 
 .SUFFIXES: .dll
 
@@ -26,7 +26,7 @@
 
 # ----------------------- IRIX 5.x -----------------------
 
-pd_irix5: tabosc4c~.pd_irix5 tabread4c~.pd_irix5
+pd_irix5: tabosc4c~.pd_irix5 tabosc4cloop~.pd_irix5 tabread4c~.pd_irix5 tabosc4h~.pd_irix5
 
 .SUFFIXES: .pd_irix5
 
@@ -42,7 +42,7 @@
 
 # ----------------------- IRIX 6.x -----------------------
 
-pd_irix6: tabosc4c~.pd_irix6 tabread4c~.pd_irix6
+pd_irix6: tabosc4c~.pd_irix6 tabosc4cloop~.pd_irix6 tabread4c~.pd_irix6 tabosc4h~.pd_irix6
 
 .SUFFIXES: .pd_irix6
 
@@ -57,7 +57,7 @@
 
 # ----------------------- LINUX i386 -----------------------
 
-pd_linux: tabosc4c~.pd_linux tabread4c~.pd_linux  tabosc4cloop~.pd_linux
+pd_linux: tabosc4c~.pd_linux tabread4c~.pd_linux tabosc4cloop~.pd_linux tabosc4h~.pd_linux
 
 .SUFFIXES: .pd_linux
 
@@ -76,7 +76,7 @@
 # ----------------------- Mac OS X (Darwin) -----------------------
 
 
-pd_darwin:  tabosc4c~.pd_darwin tabread4c~.pd_darwin
+pd_darwin:  tabosc4cloop~.pd_darwin tabosc4h~.pd_darwin tabosc4c~.pd_darwin tabread4c~.pd_darwin
 
 .SUFFIXES: .pd_darwin
 

Modified: trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd
===================================================================
--- trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd	2008-06-22 23:21:10 UTC (rev 10067)
+++ trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd	2008-06-23 09:05:45 UTC (rev 10068)
@@ -65,8 +65,8 @@
 #X obj 41 92 tabosc4cloop~ array99;
 #X msg 251 39 \; array99 resize 8 \; array99 0 0 0 -0.5 -0.5 1 -1 0.5
 0.5 \; pd dsp 1 \;;
-#X text 42 346 just like tabosc4c~ \, but does not need to copy the
-last 3 point in the beggining. So \, table must be a power of 2;
+#X text 42 345 just like tabosc4c~ \, but does not need to copy the
+first 3 point in the end. So \, table must be a power of 2;
 #X connect 0 0 1 0;
 #X connect 1 0 9 0;
 #X connect 3 0 10 0;

Modified: trunk/externals/nusmuk/tab/tabosc4cloop~.c
===================================================================
--- trunk/externals/nusmuk/tab/tabosc4cloop~.c	2008-06-22 23:21:10 UTC (rev 10067)
+++ trunk/externals/nusmuk/tab/tabosc4cloop~.c	2008-06-23 09:05:45 UTC (rev 10068)
@@ -1,8 +1,43 @@
-// GPL
+// tabosc4cloop~
 // most of this code comes from pd. just the interpolation shematic is diferent.
-// and the modulo for the position is made for all sample, so you do'nt need to copy the last 3 point in the beggining
+// and the modulo for the position is made for all sample, so you don't need to copy the first 3 points in the end of the table for a smoth loop
 
+/* 
+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"
 
 /******************** tabosc4cloop~ ***********************/

Modified: trunk/externals/nusmuk/tab/tabosc4c~-help.pd
===================================================================
--- trunk/externals/nusmuk/tab/tabosc4c~-help.pd	2008-06-22 23:21:10 UTC (rev 10067)
+++ trunk/externals/nusmuk/tab/tabosc4c~-help.pd	2008-06-23 09:05:45 UTC (rev 10068)
@@ -1,4 +1,4 @@
-#N canvas 79 60 755 582 12;
+#N canvas 298 40 774 479 12;
 #X floatatom 41 42 9 0 0 0 - - -;
 #X obj 41 63 sig~ 100;
 #N canvas 0 0 450 300 (subpatch) 0;
@@ -77,9 +77,10 @@
 #X obj 178 123 tabosc4c~ array99;
 #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 52 419 tabosc4c~ is a drop in remplacement for tabosc4~ \,
-but offer a true 4 points cubic interpolation. So \, quality is better
-than the standart interpolation;
+#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 connect 0 0 1 0;
 #X connect 1 0 9 0;
 #X connect 1 0 20 0;

Modified: trunk/externals/nusmuk/tab/tabosc4c~.c
===================================================================
--- trunk/externals/nusmuk/tab/tabosc4c~.c	2008-06-22 23:21:10 UTC (rev 10067)
+++ trunk/externals/nusmuk/tab/tabosc4c~.c	2008-06-23 09:05:45 UTC (rev 10068)
@@ -1,7 +1,43 @@
-// GPL
+// tabosc4c~
+// 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"
 
 /******************** tabosc4c~ ***********************/

Added: trunk/externals/nusmuk/tab/tabosc4h~-help.pd
===================================================================
--- trunk/externals/nusmuk/tab/tabosc4h~-help.pd	                        (rev 0)
+++ trunk/externals/nusmuk/tab/tabosc4h~-help.pd	2008-06-23 09:05:45 UTC (rev 10068)
@@ -0,0 +1,110 @@
+#N canvas 398 81 891 660 12;
+#X floatatom 40 43 9 0 0 0 - - -;
+#X obj 40 63 sig~ 100;
+#X text 116 41 signal input for frequency (Hz.);
+#X obj 78 127 oscillo~;
+#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 522 197 graph;
+#X obj 511 40 loadbang;
+#X floatatom 40 0 5 0 0 0 - - -;
+#X obj 40 21 mtof;
+#X floatatom 85 592 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 51 618 pd output;
+#X msg 121 592 MUTE;
+#X obj 80 342 oscillo~;
+#X obj 40 564 *~;
+#X msg 116 456 \$1 30;
+#X obj 119 433 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X obj 117 503 -~ 1;
+#X obj 116 527 *~ -1;
+#X obj 116 480 line~;
+#X obj 60 511 *~;
+#X msg 190 67 0;
+#X msg 514 74 \; array99 resize 11 \; array99 0 0 0 -1 0.5 -0.5 -0.5
+-0.5 0.5 1 0 0 \; pd dsp 1 \;;
+#X msg 81 273 tension \$1;
+#X floatatom 81 251 5 0 0 0 - - -;
+#X obj 62 94 tabosc4~ array99;
+#X obj 41 303 tabosc4h~ array99;
+#X text 172 272 with tension = -1 \, tabosc4h~ is like tabosc4c~;
+#X text 174 256 -1 < tension < 1;
+#X text 300 598 tabosc4h~ is a drop in remplacement for tabosc4~;
+#X connect 0 0 1 0;
+#X connect 1 0 23 0;
+#X connect 1 0 24 0;
+#X connect 5 0 20 0;
+#X connect 6 0 7 0;
+#X connect 7 0 0 0;
+#X connect 8 0 9 1;
+#X connect 9 0 8 0;
+#X connect 10 0 9 2;
+#X connect 12 0 9 0;
+#X connect 13 0 17 0;
+#X connect 14 0 13 0;
+#X connect 15 0 16 0;
+#X connect 16 0 12 1;
+#X connect 17 0 15 0;
+#X connect 17 0 18 1;
+#X connect 18 0 9 0;
+#X connect 19 0 23 1;
+#X connect 19 0 24 1;
+#X connect 21 0 24 0;
+#X connect 22 0 21 0;
+#X connect 23 0 3 0;
+#X connect 23 0 18 0;
+#X connect 24 0 11 0;
+#X connect 24 0 12 0;

Added: trunk/externals/nusmuk/tab/tabosc4h~.c
===================================================================
--- trunk/externals/nusmuk/tab/tabosc4h~.c	                        (rev 0)
+++ trunk/externals/nusmuk/tab/tabosc4h~.c	2008-06-23 09:05:45 UTC (rev 10068)
@@ -0,0 +1,270 @@
+// tabosc4h~
+// can replace with tabosc4~
+//
+// 99% comes from pd. just the interpolation shematic is diferent and comes from :
+// http://local.wasp.uwa.edu.au/~pbourke/other/interpolation/
+
+
+/* 
+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"
+
+/******************** tabosc4h~ ***********************/
+
+/* 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__*/
+
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+
+union tabfudge
+{
+    double tf_d;
+    int32 tf_i[2];
+};
+
+static t_class *tabosc4h_tilde_class;
+
+typedef struct _tabosc4h_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_float x_tension;
+} t_tabosc4h_tilde;
+
+static void *tabosc4h_tilde_new(t_symbol *s, t_floatarg tension)
+{
+    t_tabosc4h_tilde *x = (t_tabosc4h_tilde *)pd_new(tabosc4h_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;
+	x->x_tension = min(1,max(-1,tension));
+    return (x);
+}
+
+static t_int *tabosc4h_tilde_perform(t_int *w)
+{
+    t_tabosc4h_tilde *x = (t_tabosc4h_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 a0,a1,a2,a3; // CH
+    double m0,m1,mu,mu2,mu3; // 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;
+        tf.tf_d = dphase;
+        dphase += *in++ * 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;
+ //       cminusb = c-b;
+ //       *out++ = b + frac * (cminusb - 0.1666667f * (1.-frac) * ( (d - a - 3.0f * cminusb) * frac + (d + 2.0f*a - 3.0f*b) ) );
+// CH
+	mu = frac;
+	mu2 = mu * mu;
+	mu3 = mu2 * mu;
+
+    m0  = (b-a)*(1-x->x_tension)/2;
+    m0 += (c-b)*(1-x->x_tension)/2;
+    m1  = (c-b)*(1-x->x_tension)/2;
+    m1 += (d-c)*(1-x->x_tension)/2;
+
+    a0 =  2*mu3 - 3*mu2 + 1;
+    a1 =    mu3 - 2*mu2 + mu;
+    a2 =    mu3 -   mu2;
+    a3 = -2*mu3 + 3*mu2;
+ 
+   *out++ = a0*b+a1*m0+a2*m1+a3*c;
+
+    }
+#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 tabosc4h_tilde_set(t_tabosc4h_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, "tabosc4h~: %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 tabosc4h~", 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 tabosc4h_tilde_ft1(t_tabosc4h_tilde *x, t_float f)
+{
+    x->x_phase = f;
+}
+
+static void tabosc4h_tilde_tension(t_tabosc4h_tilde *x, t_float f)
+{
+    x->x_tension = min(1,max(-1,f));
+}
+
+static void tabosc4h_tilde_dsp(t_tabosc4h_tilde *x, t_signal **sp)
+{
+    x->x_conv = 1. / sp[0]->s_sr;
+    tabosc4h_tilde_set(x, x->x_arrayname);
+
+    dsp_add(tabosc4h_tilde_perform, 4, x,
+        sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n);
+}
+
+void tabosc4h_tilde_setup(void)
+{
+    tabosc4h_tilde_class = class_new(gensym("tabosc4h~"),
+        (t_newmethod)tabosc4h_tilde_new, 0,
+        sizeof(t_tabosc4h_tilde), 0, A_DEFSYM, A_DEFFLOAT, 0);
+    CLASS_MAINSIGNALIN(tabosc4h_tilde_class, t_tabosc4h_tilde, x_f);
+    class_addmethod(tabosc4h_tilde_class, (t_method)tabosc4h_tilde_dsp,
+        gensym("dsp"), 0);
+    class_addmethod(tabosc4h_tilde_class, (t_method)tabosc4h_tilde_set,
+        gensym("set"), A_SYMBOL, 0);
+    class_addmethod(tabosc4h_tilde_class, (t_method)tabosc4h_tilde_ft1,
+        gensym("ft1"), A_FLOAT, 0);
+    class_addmethod(tabosc4h_tilde_class, (t_method)tabosc4h_tilde_tension,
+        gensym("tension"), A_FLOAT, 0);
+}
+

Modified: trunk/externals/nusmuk/tab/tabread4c~-help.pd
===================================================================
--- trunk/externals/nusmuk/tab/tabread4c~-help.pd	2008-06-22 23:21:10 UTC (rev 10067)
+++ trunk/externals/nusmuk/tab/tabread4c~-help.pd	2008-06-23 09:05:45 UTC (rev 10068)
@@ -1,7 +1,7 @@
-#N canvas 106 72 743 605 10;
+#N canvas 252 101 743 661 10;
 #N canvas 0 0 450 300 (subpatch) 0;
-#X array array99 10 float 0;
-#X coords 0 1 9 -1 250 200 1;
+#X array array99 11 float 0;
+#X coords 0 1 10 -1 250 200 1;
 #X restore 461 80 graph;
 #X obj 69 195 line~;
 #X obj 36 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
@@ -23,11 +23,12 @@
 #X array test_cubic 44100 float 0;
 #X coords 0 1 44099 -1 250 200 1;
 #X restore 34 312 graph;
-#X text 49 530 tabread4c~ is a drop in remplacement for tabrad4~ \,
-but offer a true 4 points cubic interpolation. So \, quality is better
-than the standart interpolation;
 #X msg 63 77 \; array99 resize 10 \; array99 0 -0.5 -0.5 -0.5 0.5 0.5
 0.5 -0.5 0 0 \; pd dsp 1 \;;
+#X text 43 531 tabread4c~ is a drop in remplacement for tabrad4~ \,
+but offer a 4 points cubic interpolation with tengent continuity. So
+\, in some case \, quality is better than the standart interpolation
+;
 #X connect 1 0 4 0;
 #X connect 2 0 3 0;
 #X connect 2 0 7 0;
@@ -40,4 +41,4 @@
 #X connect 7 0 6 0;
 #X connect 8 0 9 0;
 #X connect 11 0 2 0;
-#X connect 11 1 15 0;
+#X connect 11 1 14 0;

Modified: trunk/externals/nusmuk/tab/tabread4c~.c
===================================================================
--- trunk/externals/nusmuk/tab/tabread4c~.c	2008-06-22 23:21:10 UTC (rev 10067)
+++ trunk/externals/nusmuk/tab/tabread4c~.c	2008-06-23 09:05:45 UTC (rev 10068)
@@ -1,6 +1,43 @@
-// GPL
+// tabread4c~
+// can replace tabread4c~
 // 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"
 
 /******************** tabread4c~ ***********************/

Added: trunk/externals/nusmuk/tab/tabread4h~-help.pd
===================================================================
--- trunk/externals/nusmuk/tab/tabread4h~-help.pd	                        (rev 0)
+++ trunk/externals/nusmuk/tab/tabread4h~-help.pd	2008-06-23 09:05:45 UTC (rev 10068)
@@ -0,0 +1,33 @@
+#N canvas 413 327 814 475 10;
+#X text 27 173 signal input x(n);
+#X msg 727 51 \; pd dsp 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 514 173 graph;
+#X text 127 21 4-point-interpolating table lookup;
+#X msg 452 50 \; readout 1 \; array99 resize 10 \; array99 0 -0.5 -0.5
+-0.5 0.5 0.5 0.5 \; pd dsp 1 \;;
+#X msg 40 144 set array99;
+#X text 122 144 "set" message permits you to switch between arrays
+;
+#X text 145 194 creation argument initializes array name;
+#X text 509 27 click here to test;
+#X text 7 58 Tabread4~ is used to build samplers and other table lookup
+algorithms. The interpolation scheme is 4-point polynomial.;
+#X text 616 460 updated for Pd version 0.29;
+#X obj 15 120 line~;
+#X obj 149 87 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
+#X obj 458 6 table save1 44100;
+#X obj 16 224 tabwrite~ save1;
+#X floatatom 25 31 5 0 0 0 - - -;
+#X msg 15 97 0 \, 10 1000;
+#X obj 16 194 tabread4h~ array99;
+#X connect 5 0 17 0;
+#X connect 11 0 17 0;
+#X connect 12 0 16 0;
+#X connect 12 0 14 0;
+#X connect 15 0 11 0;
+#X connect 16 0 11 0;
+#X connect 17 0 14 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Pd-cvs mailing list