Pd-cvs January 2009

pd-cvs@lists.iem.at

23 participants
357 discussions

SF.net SVN: pure-data:[10497] branches/pd-extended/0.41/pd/src
by eighthave＠users.sourceforge.net 10 Jan '09

10 Jan '09

Revision: 10497 http://pure-data.svn.sourceforge.net/pure-data/?rev=10497&view=rev Author: eighthave Date: 2009-01-10 02:20:22 +0000 (Sat, 10 Jan 2009) Log Message: ----------- svn merge wants to replace these files for whatever reason, so I am humoring it Added Paths: ----------- branches/pd-extended/0.41/pd/src/d_fft_fftsg.c branches/pd-extended/0.41/pd/src/d_fft_fftw.c branches/pd-extended/0.41/pd/src/d_fftsg_h.c Removed Paths: ------------- branches/pd-extended/0.41/pd/src/d_fft_fftsg.c branches/pd-extended/0.41/pd/src/d_fft_fftw.c branches/pd-extended/0.41/pd/src/d_fftsg_h.c Deleted: branches/pd-extended/0.41/pd/src/d_fft_fftsg.c =================================================================== --- branches/pd-extended/0.41/pd/src/d_fft_fftsg.c 2009-01-10 02:18:04 UTC (rev 10496) +++ branches/pd-extended/0.41/pd/src/d_fft_fftsg.c 2009-01-10 02:20:22 UTC (rev 10497) @@ -1,3462 +0,0 @@ -/****************** begin Pd-specific prologue ***********************/ - -/* -This is the file, "fftsg.c" from the OOURA FFT package. The copyright notice -from Ooura's README is: - -Copyright: - Copyright(C) 1996-2001 Takuya OOURA - email: ooura(a)mmm.t.u-tokyo.ac.jp - download: http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html - You may use, copy, modify this code for any purpose and - without fee. You may distribute this ORIGINAL package. - -After the following prologue, the code is exactly Ooura's original, which I -believe the above notice permits me to redistribute. See Ooura's website -for another, more permissive-sounding copyright notice. -MSP -*/ - -/* ---------- Pd interface to OOURA FFT; imitate Mayer API ---------- */ -#include "m_pd.h" -#ifdef MSW -#include <malloc.h> -#else -#include <alloca.h> -#endif - -#define FFTFLT double -void cdft(int, int, double *, int *, double *); -void rdft(int, int, double *, int *, double *); - -int ilog2(int n); - -static int ooura_maxn; -static int *ooura_bitrev; -static int ooura_bitrevsize; -static FFTFLT *ooura_costab; - -static int ooura_init( int n) -{ - n = (1 << ilog2(n)); - if (n < 64) - return (0); - if (n > ooura_maxn) - { - post("init"); - if (ooura_maxn) - { - t_freebytes(ooura_bitrev, ooura_bitrevsize); - t_freebytes(ooura_costab, ooura_maxn * sizeof(FFTFLT) / 2); - } - ooura_bitrevsize = sizeof(int *) * (2 + (1 << (ilog2(n)/2))); - ooura_bitrev = (int *)t_getbytes(ooura_bitrevsize); - ooura_bitrev[0] = 0; - if (!ooura_bitrev) - { - error("out of memory allocating FFT buffer"); - ooura_maxn = 0; - return (0); - } - ooura_costab = (FFTFLT *)t_getbytes(n * sizeof(FFTFLT)/2); - if (!ooura_costab) - { - error("out of memory allocating FFT buffer"); - t_freebytes(ooura_bitrev, ooura_bitrevsize); - ooura_maxn = 0; - return (0); - } - ooura_maxn = n; - ooura_bitrev[0] = 0; - } - return (1); -} - -EXTERN void mayer_fht(t_sample *fz, int n) -{ - post("FHT: not yet implemented"); -} - -EXTERN void mayer_dofft(t_sample *fz1, t_sample *fz2, int n, int sgn) -{ - FFTFLT *buf, *fp3; - int i; - t_sample *fp1, *fp2; - buf = alloca(n * (2 * sizeof(FFTFLT))); - if (!ooura_init(n)) - return; - for (i = 0, fp1 = fz1, fp2 = fz2, fp3 = buf; i < n; i++) - { - fp3[0] = *fp1++; - fp3[1] = *fp2++; - fp3 += 2; - } - cdft(2*n, sgn, buf, ooura_bitrev, ooura_costab); - for (i = 0, fp1 = fz1, fp2 = fz2, fp3 = buf; i < n; i++) - { - *fp1++ = fp3[0]; - *fp2++ = fp3[1]; - fp3 += 2; - } -} - -EXTERN void mayer_fft(int n, t_sample *fz1, t_sample *fz2) -{ - mayer_dofft(fz1, fz2, n, -1); -} - -EXTERN void mayer_ifft(int n, t_sample *fz1, t_sample *fz2) -{ - mayer_dofft(fz1, fz2, n, 1); -} - -EXTERN void mayer_realfft(int n, t_sample *fz) -{ - FFTFLT *buf, *fp3; - int i, nover2 = n/2; - t_sample *fp1, *fp2; - buf = alloca(n * sizeof(FFTFLT)); - if (!ooura_init(n)) - return; - for (i = 0, fp1 = fz, fp3 = buf; i < n; i++, fp1++, fp3++) - buf[i] = fz[i]; - rdft(n, 1, buf, ooura_bitrev, ooura_costab); - fz[0] = buf[0]; - fz[nover2] = buf[1]; - for (i = 1, fp1 = fz+1, fp2 = fz+(n-1), fp3 = buf+2; i < nover2; - i++, fp1++, fp2--, fp3 += 2) - *fp1 = fp3[0], *fp2 = fp3[1]; -} - -EXTERN void mayer_realifft(int n, t_sample *fz) -{ - FFTFLT *buf, *fp3; - int i, nover2 = n/2; - t_sample *fp1, *fp2; - buf = alloca(n * sizeof(FFTFLT)); - if (!ooura_init(n)) - return; - buf[0] = fz[0]; - buf[1] = fz[nover2]; - for (i = 1, fp1 = fz+1, fp2 = fz+(n-1), fp3 = buf+2; i < nover2; - i++, fp1++, fp2--, fp3 += 2) - fp3[0] = *fp1, fp3[1] = *fp2; - rdft(n, -1, buf, ooura_bitrev, ooura_costab); - for (i = 0, fp1 = fz, fp3 = buf; i < n; i++, fp1++, fp3++) - fz[i] = 2*buf[i]; -} - -/****************** end Pd-specific prologue ***********************/ -/* -Fast Fourier/Cosine/Sine Transform - dimension :one - data length :power of 2 - decimation :frequency - radix :split-radix - data :inplace - table :use -functions - cdft: Complex Discrete Fourier Transform - rdft: Real Discrete Fourier Transform - ddct: Discrete Cosine Transform - ddst: Discrete Sine Transform - dfct: Cosine Transform of RDFT (Real Symmetric DFT) - dfst: Sine Transform of RDFT (Real Anti-symmetric DFT) -function prototypes - void cdft(int, int, double *, int *, double *); - void rdft(int, int, double *, int *, double *); - void ddct(int, int, double *, int *, double *); - void ddst(int, int, double *, int *, double *); - void dfct(int, double *, double *, int *, double *); - void dfst(int, double *, double *, int *, double *); -macro definitions - USE_CDFT_PTHREADS : default=not defined - CDFT_THREADS_BEGIN_N : must be >= 512, default=8192 - CDFT_4THREADS_BEGIN_N : must be >= 512, default=65536 - USE_CDFT_WINTHREADS : default=not defined - CDFT_THREADS_BEGIN_N : must be >= 512, default=32768 - CDFT_4THREADS_BEGIN_N : must be >= 512, default=524288 - - --------- Complex DFT (Discrete Fourier Transform) -------- - [definition] - <case1> - X[k] = sum_j=0^n-1 x[j]*exp(2*pi*i*j*k/n), 0<=k<n - <case2> - X[k] = sum_j=0^n-1 x[j]*exp(-2*pi*i*j*k/n), 0<=k<n - (notes: sum_j=0^n-1 is a summation from j=0 to n-1) - [usage] - <case1> - ip[0] = 0; // first time only - cdft(2*n, 1, a, ip, w); - <case2> - ip[0] = 0; // first time only - cdft(2*n, -1, a, ip, w); - [parameters] - 2*n :data length (int) - n >= 1, n = power of 2 - a[0...2*n-1] :input/output data (double *) - input data - a[2*j] = Re(x[j]), - a[2*j+1] = Im(x[j]), 0<=j<n - output data - a[2*k] = Re(X[k]), - a[2*k+1] = Im(X[k]), 0<=k<n - ip[0...*] :work area for bit reversal (int *) - length of ip >= 2+sqrt(n) - strictly, - length of ip >= - 2+(1<<(int)(log(n+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n/2-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - cdft(2*n, -1, a, ip, w); - is - cdft(2*n, 1, a, ip, w); - for (j = 0; j <= 2 * n - 1; j++) { - a[j] *= 1.0 / n; - } - . - - --------- Real DFT / Inverse of Real DFT -------- - [definition] - <case1> RDFT - R[k] = sum_j=0^n-1 a[j]*cos(2*pi*j*k/n), 0<=k<=n/2 - I[k] = sum_j=0^n-1 a[j]*sin(2*pi*j*k/n), 0<k<n/2 - <case2> IRDFT (excluding scale) - a[k] = (R[0] + R[n/2]*cos(pi*k))/2 + - sum_j=1^n/2-1 R[j]*cos(2*pi*j*k/n) + - sum_j=1^n/2-1 I[j]*sin(2*pi*j*k/n), 0<=k<n - [usage] - <case1> - ip[0] = 0; // first time only - rdft(n, 1, a, ip, w); - <case2> - ip[0] = 0; // first time only - rdft(n, -1, a, ip, w); - [parameters] - n :data length (int) - n >= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - <case1> - output data - a[2*k] = R[k], 0<=k<n/2 - a[2*k+1] = I[k], 0<k<n/2 - a[1] = R[n/2] - <case2> - input data - a[2*j] = R[j], 0<=j<n/2 - a[2*j+1] = I[j], 0<j<n/2 - a[1] = R[n/2] - ip[0...*] :work area for bit reversal (int *) - length of ip >= 2+sqrt(n/2) - strictly, - length of ip >= - 2+(1<<(int)(log(n/2+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n/2-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - rdft(n, 1, a, ip, w); - is - rdft(n, -1, a, ip, w); - for (j = 0; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - --------- DCT (Discrete Cosine Transform) / Inverse of DCT -------- - [definition] - <case1> IDCT (excluding scale) - C[k] = sum_j=0^n-1 a[j]*cos(pi*j*(k+1/2)/n), 0<=k<n - <case2> DCT - C[k] = sum_j=0^n-1 a[j]*cos(pi*(j+1/2)*k/n), 0<=k<n - [usage] - <case1> - ip[0] = 0; // first time only - ddct(n, 1, a, ip, w); - <case2> - ip[0] = 0; // first time only - ddct(n, -1, a, ip, w); - [parameters] - n :data length (int) - n >= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - output data - a[k] = C[k], 0<=k<n - ip[0...*] :work area for bit reversal (int *) - length of ip >= 2+sqrt(n/2) - strictly, - length of ip >= - 2+(1<<(int)(log(n/2+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/4-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - ddct(n, -1, a, ip, w); - is - a[0] *= 0.5; - ddct(n, 1, a, ip, w); - for (j = 0; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - --------- DST (Discrete Sine Transform) / Inverse of DST -------- - [definition] - <case1> IDST (excluding scale) - S[k] = sum_j=1^n A[j]*sin(pi*j*(k+1/2)/n), 0<=k<n - <case2> DST - S[k] = sum_j=0^n-1 a[j]*sin(pi*(j+1/2)*k/n), 0<k<=n - [usage] - <case1> - ip[0] = 0; // first time only - ddst(n, 1, a, ip, w); - <case2> - ip[0] = 0; // first time only - ddst(n, -1, a, ip, w); - [parameters] - n :data length (int) - n >= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - <case1> - input data - a[j] = A[j], 0<j<n - a[0] = A[n] - output data - a[k] = S[k], 0<=k<n - <case2> - output data - a[k] = S[k], 0<k<n - a[0] = S[n] - ip[0...*] :work area for bit reversal (int *) - length of ip >= 2+sqrt(n/2) - strictly, - length of ip >= - 2+(1<<(int)(log(n/2+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/4-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - ddst(n, -1, a, ip, w); - is - a[0] *= 0.5; - ddst(n, 1, a, ip, w); - for (j = 0; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - --------- Cosine Transform of RDFT (Real Symmetric DFT) -------- - [definition] - C[k] = sum_j=0^n a[j]*cos(pi*j*k/n), 0<=k<=n - [usage] - ip[0] = 0; // first time only - dfct(n, a, t, ip, w); - [parameters] - n :data length - 1 (int) - n >= 2, n = power of 2 - a[0...n] :input/output data (double *) - output data - a[k] = C[k], 0<=k<=n - t[0...n/2] :work area (double *) - ip[0...*] :work area for bit reversal (int *) - length of ip >= 2+sqrt(n/4) - strictly, - length of ip >= - 2+(1<<(int)(log(n/4+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/8-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - a[0] *= 0.5; - a[n] *= 0.5; - dfct(n, a, t, ip, w); - is - a[0] *= 0.5; - a[n] *= 0.5; - dfct(n, a, t, ip, w); - for (j = 0; j <= n; j++) { - a[j] *= 2.0 / n; - } - . - - --------- Sine Transform of RDFT (Real Anti-symmetric DFT) -------- - [definition] - S[k] = sum_j=1^n-1 a[j]*sin(pi*j*k/n), 0<k<n - [usage] - ip[0] = 0; // first time only - dfst(n, a, t, ip, w); - [parameters] - n :data length + 1 (int) - n >= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - output data - a[k] = S[k], 0<k<n - (a[0] is used for work area) - t[0...n/2-1] :work area (double *) - ip[0...*] :work area for bit reversal (int *) - length of ip >= 2+sqrt(n/4) - strictly, - length of ip >= - 2+(1<<(int)(log(n/4+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/8-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - dfst(n, a, t, ip, w); - is - dfst(n, a, t, ip, w); - for (j = 1; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - -Appendix : - The cos/sin table is recalculated when the larger table required. - w[] and ip[] are compatible with all routines. -*/ - - -void cdft(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - int nw; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - if (isgn >= 0) { - cftfsub(n, a, ip, nw, w); - } else { - cftbsub(n, a, ip, nw, w); - } -} - - -void rdft(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void rftbsub(int n, double *a, int nc, double *c); - int nw, nc; - double xi; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > (nc << 2)) { - nc = n >> 2; - makect(nc, ip, w + nw); - } - if (isgn >= 0) { - if (n > 4) { - cftfsub(n, a, ip, nw, w); - rftfsub(n, a, nc, w + nw); - } else if (n == 4) { - cftfsub(n, a, ip, nw, w); - } - xi = a[0] - a[1]; - a[0] += a[1]; - a[1] = xi; - } else { - a[1] = 0.5 * (a[0] - a[1]); - a[0] -= a[1]; - if (n > 4) { - rftbsub(n, a, nc, w + nw); - cftbsub(n, a, ip, nw, w); - } else if (n == 4) { - cftbsub(n, a, ip, nw, w); - } - } -} - - -void ddct(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void rftbsub(int n, double *a, int nc, double *c); - void dctsub(int n, double *a, int nc, double *c); - int j, nw, nc; - double xr; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > nc) { - nc = n; - makect(nc, ip, w + nw); - } - if (isgn < 0) { - xr = a[n - 1]; - for (j = n - 2; j >= 2; j -= 2) { - a[j + 1] = a[j] - a[j - 1]; - a[j] += a[j - 1]; - } - a[1] = a[0] - xr; - a[0] += xr; - if (n > 4) { - rftbsub(n, a, nc, w + nw); - cftbsub(n, a, ip, nw, w); - } else if (n == 4) { - cftbsub(n, a, ip, nw, w); - } - } - dctsub(n, a, nc, w + nw); - if (isgn >= 0) { - if (n > 4) { - cftfsub(n, a, ip, nw, w); - rftfsub(n, a, nc, w + nw); - } else if (n == 4) { - cftfsub(n, a, ip, nw, w); - } - xr = a[0] - a[1]; - a[0] += a[1]; - for (j = 2; j < n; j += 2) { - a[j - 1] = a[j] - a[j + 1]; - a[j] += a[j + 1]; - } - a[n - 1] = xr; - } -} - - -void ddst(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void rftbsub(int n, double *a, int nc, double *c); - void dstsub(int n, double *a, int nc, double *c); - int j, nw, nc; - double xr; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > nc) { - nc = n; - makect(nc, ip, w + nw); - } - if (isgn < 0) { - xr = a[n - 1]; - for (j = n - 2; j >= 2; j -= 2) { - a[j + 1] = -a[j] - a[j - 1]; - a[j] -= a[j - 1]; - } - a[1] = a[0] + xr; - a[0] -= xr; - if (n > 4) { - rftbsub(n, a, nc, w + nw); - cftbsub(n, a, ip, nw, w); - } else if (n == 4) { - cftbsub(n, a, ip, nw, w); - } - } - dstsub(n, a, nc, w + nw); - if (isgn >= 0) { - if (n > 4) { - cftfsub(n, a, ip, nw, w); - rftfsub(n, a, nc, w + nw); - } else if (n == 4) { - cftfsub(n, a, ip, nw, w); - } - xr = a[0] - a[1]; - a[0] += a[1]; - for (j = 2; j < n; j += 2) { - a[j - 1] = -a[j] - a[j + 1]; - a[j] -= a[j + 1]; - } - a[n - 1] = -xr; - } -} - - -void dfct(int n, double *a, double *t, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void dctsub(int n, double *a, int nc, double *c); - int j, k, l, m, mh, nw, nc; - double xr, xi, yr, yi; - - nw = ip[0]; - if (n > (nw << 3)) { - nw = n >> 3; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > (nc << 1)) { - nc = n >> 1; - makect(nc, ip, w + nw); - } - m = n >> 1; - yi = a[m]; - xi = a[0] + a[n]; - a[0] -= a[n]; - t[0] = xi - yi; - t[m] = xi + yi; - if (n > 2) { - mh = m >> 1; - for (j = 1; j < mh; j++) { - k = m - j; - xr = a[j] - a[n - j]; - xi = a[j] + a[n - j]; - yr = a[k] - a[n - k]; - yi = a[k] + a[n - k]; - a[j] = xr; - a[k] = yr; - t[j] = xi - yi; - t[k] = xi + yi; - } - t[mh] = a[mh] + a[n - mh]; - a[mh] -= a[n - mh]; - dctsub(m, a, nc, w + nw); - if (m > 4) { - cftfsub(m, a, ip, nw, w); - rftfsub(m, a, nc, w + nw); - } else if (m == 4) { - cftfsub(m, a, ip, nw, w); - } - a[n - 1] = a[0] - a[1]; - a[1] = a[0] + a[1]; - for (j = m - 2; j >= 2; j -= 2) { - a[2 * j + 1] = a[j] + a[j + 1]; - a[2 * j - 1] = a[j] - a[j + 1]; - } - l = 2; - m = mh; - while (m >= 2) { - dctsub(m, t, nc, w + nw); - if (m > 4) { - cftfsub(m, t, ip, nw, w); - rftfsub(m, t, nc, w + nw); - } else if (m == 4) { - cftfsub(m, t, ip, nw, w); - } - a[n - l] = t[0] - t[1]; - a[l] = t[0] + t[1]; - k = 0; - for (j = 2; j < m; j += 2) { - k += l << 2; - a[k - l] = t[j] - t[j + 1]; - a[k + l] = t[j] + t[j + 1]; - } - l <<= 1; - mh = m >> 1; - for (j = 0; j < mh; j++) { - k = m - j; - t[j] = t[m + k] - t[m + j]; - t[k] = t[m + k] + t[m + j]; - } - t[mh] = t[m + mh]; - m = mh; - } - a[l] = t[0]; - a[n] = t[2] - t[1]; - a[0] = t[2] + t[1]; - } else { - a[1] = a[0]; - a[2] = t[0]; - a[0] = t[1]; - } -} - - -void dfst(int n, double *a, double *t, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void dstsub(int n, double *a, int nc, double *c); - int j, k, l, m, mh, nw, nc; - double xr, xi, yr, yi; - - nw = ip[0]; - if (n > (nw << 3)) { - nw = n >> 3; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > (nc << 1)) { - nc = n >> 1; - makect(nc, ip, w + nw); - } - if (n > 2) { - m = n >> 1; - mh = m >> 1; - for (j = 1; j < mh; j++) { - k = m - j; - xr = a[j] + a[n - j]; - xi = a[j] - a[n - j]; - yr = a[k] + a[n - k]; - yi = a[k] - a[n - k]; - a[j] = xr; - a[k] = yr; - t[j] = xi + yi; - t[k] = xi - yi; - } - t[0] = a[mh] - a[n - mh]; - a[mh] += a[n - mh]; - a[0] = a[m]; - dstsub(m, a, nc, w + nw); - if (m > 4) { - cftfsub(m, a, ip, nw, w); - rftfsub(m, a, nc, w + nw); - } else if (m == 4) { - cftfsub(m, a, ip, nw, w); - } - a[n - 1] = a[1] - a[0]; - a[1] = a[0] + a[1]; - for (j = m - 2; j >= 2; j -= 2) { - a[2 * j + 1] = a[j] - a[j + 1]; - a[2 * j - 1] = -a[j] - a[j + 1]; - } - l = 2; - m = mh; - while (m >= 2) { - dstsub(m, t, nc, w + nw); - if (m > 4) { - cftfsub(m, t, ip, nw, w); - rftfsub(m, t, nc, w + nw); - } else if (m == 4) { - cftfsub(m, t, ip, nw, w); - } - a[n - l] = t[1] - t[0]; - a[l] = t[0] + t[1]; - k = 0; - for (j = 2; j < m; j += 2) { - k += l << 2; - a[k - l] = -t[j] - t[j + 1]; - a[k + l] = t[j] - t[j + 1]; - } - l <<= 1; - mh = m >> 1; - for (j = 1; j < mh; j++) { - k = m - j; - t[j] = t[m + k] + t[m + j]; - t[k] = t[m + k] - t[m + j]; - } - t[0] = t[m + mh]; - m = mh; - } - a[l] = t[0]; - } - a[0] = 0; -} - - -/* -------- initializing routines -------- */ - - -#include <math.h> - -void makewt(int nw, int *ip, double *w) -{ - void makeipt(int nw, int *ip); - int j, nwh, nw0, nw1; - double delta, wn4r, wk1r, wk1i, wk3r, wk3i; - - ip[0] = nw; - ip[1] = 1; - if (nw > 2) { - nwh = nw >> 1; - delta = atan(1.0) / nwh; - wn4r = cos(delta * nwh); - w[0] = 1; - w[1] = wn4r; - if (nwh == 4) { - w[2] = cos(delta * 2); - w[3] = sin(delta * 2); - } else if (nwh > 4) { - makeipt(nw, ip); - w[2] = 0.5 / cos(delta * 2); - w[3] = 0.5 / cos(delta * 6); - for (j = 4; j < nwh; j += 4) { - w[j] = cos(delta * j); - w[j + 1] = sin(delta * j); - w[j + 2] = cos(3 * delta * j); - w[j + 3] = -sin(3 * delta * j); - } - } - nw0 = 0; - while (nwh > 2) { - nw1 = nw0 + nwh; - nwh >>= 1; - w[nw1] = 1; - w[nw1 + 1] = wn4r; - if (nwh == 4) { - wk1r = w[nw0 + 4]; - wk1i = w[nw0 + 5]; - w[nw1 + 2] = wk1r; - w[nw1 + 3] = wk1i; - } else if (nwh > 4) { - wk1r = w[nw0 + 4]; - wk3r = w[nw0 + 6]; - w[nw1 + 2] = 0.5 / wk1r; - w[nw1 + 3] = 0.5 / wk3r; - for (j = 4; j < nwh; j += 4) { - wk1r = w[nw0 + 2 * j]; - wk1i = w[nw0 + 2 * j + 1]; - wk3r = w[nw0 + 2 * j + 2]; - wk3i = w[nw0 + 2 * j + 3]; - w[nw1 + j] = wk1r; - w[nw1 + j + 1] = wk1i; - w[nw1 + j + 2] = wk3r; - w[nw1 + j + 3] = wk3i; - } - } - nw0 = nw1; - } - } -} - - -void makeipt(int nw, int *ip) -{ - int j, l, m, m2, p, q; - - ip[2] = 0; - ip[3] = 16; - m = 2; - for (l = nw; l > 32; l >>= 2) { - m2 = m << 1; - q = m2 << 3; - for (j = m; j < m2; j++) { - p = ip[j] << 2; - ip[m + j] = p; - ip[m2 + j] = p + q; - } - m = m2; - } -} - - -void makect(int nc, int *ip, double *c) -{ - int j, nch; - double delta; - - ip[1] = nc; - if (nc > 1) { - nch = nc >> 1; - delta = atan(1.0) / nch; - c[0] = cos(delta * nch); - c[nch] = 0.5 * c[0]; - for (j = 1; j < nch; j++) { - c[j] = 0.5 * cos(delta * j); - c[nc - j] = 0.5 * sin(delta * j); - } - } -} - - -/* -------- child routines -------- */ - - -#ifdef USE_CDFT_PTHREADS -#define USE_CDFT_THREADS -#ifndef CDFT_THREADS_BEGIN_N -#define CDFT_THREADS_BEGIN_N 8192 -#endif -#ifndef CDFT_4THREADS_BEGIN_N -#define CDFT_4THREADS_BEGIN_N 65536 -#endif -#include <pthread.h> -#include <stdio.h> -#include <stdlib.h> -#define cdft_thread_t pthread_t -#define cdft_thread_create(thp,func,argp) { \ - if (pthread_create(thp, NULL, func, (void *) argp) != 0) { \ - fprintf(stderr, "cdft thread error\n"); \ - exit(1); \ - } \ -} -#define cdft_thread_wait(th) { \ - if (pthread_join(th, NULL) != 0) { \ - fprintf(stderr, "cdft thread error\n"); \ - exit(1); \ - } \ -} -#endif /* USE_CDFT_PTHREADS */ - - -#ifdef USE_CDFT_WINTHREADS -#define USE_CDFT_THREADS -#ifndef CDFT_THREADS_BEGIN_N -#define CDFT_THREADS_BEGIN_N 32768 -#endif -#ifndef CDFT_4THREADS_BEGIN_N -#define CDFT_4THREADS_BEGIN_N 524288 -#endif -#include <windows.h> -#include <stdio.h> -#include <stdlib.h> -#define cdft_thread_t HANDLE -#define cdft_thread_create(thp,func,argp) { \ - DWORD thid; \ - *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \ - if (*(thp) == 0) { \ - fprintf(stderr, "cdft thread error\n"); \ - exit(1); \ - } \ -} -#define cdft_thread_wait(th) { \ - WaitForSingleObject(th, INFINITE); \ - CloseHandle(th); \ -} -#endif /* USE_CDFT_WINTHREADS */ - - -void cftfsub(int n, double *a, int *ip, int nw, double *w) -{ - void bitrv2(int n, int *ip, double *a); - void bitrv216(double *a); - void bitrv208(double *a); - void cftf1st(int n, double *a, double *w); - void cftrec4(int n, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftfx41(int n, double *a, int nw, double *w); - void cftf161(double *a, double *w); - void cftf081(double *a, double *w); - void cftf040(double *a); - void cftx020(double *a); -#ifdef USE_CDFT_THREADS - void cftrec4_th(int n, double *a, int nw, double *w); -#endif /* USE_CDFT_THREADS */ - - if (n > 8) { - if (n > 32) { - cftf1st(n, a, &w[nw - (n >> 2)]); -#ifdef USE_CDFT_THREADS - if (n > CDFT_THREADS_BEGIN_N) { - cftrec4_th(n, a, nw, w); - } else -#endif /* USE_CDFT_THREADS */ - if (n > 512) { - cftrec4(n, a, nw, w); - } else if (n > 128) { - cftleaf(n, 1, a, nw, w); - } else { - cftfx41(n, a, nw, w); - } - bitrv2(n, ip, a); - } else if (n == 32) { - cftf161(a, &w[nw - 8]); - bitrv216(a); - } else { - cftf081(a, w); - bitrv208(a); - } - } else if (n == 8) { - cftf040(a); - } else if (n == 4) { - cftx020(a); - } -} - - -void cftbsub(int n, double *a, int *ip, int nw, double *w) -{ - void bitrv2conj(int n, int *ip, double *a); - void bitrv216neg(double *a); - void bitrv208neg(double *a); - void cftb1st(int n, double *a, double *w); - void cftrec4(int n, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftfx41(int n, double *a, int nw, double *w); - void cftf161(double *a, double *w); - void cftf081(double *a, double *w); - void cftb040(double *a); - void cftx020(double *a); -#ifdef USE_CDFT_THREADS - void cftrec4_th(int n, double *a, int nw, double *w); -#endif /* USE_CDFT_THREADS */ - - if (n > 8) { - if (n > 32) { - cftb1st(n, a, &w[nw - (n >> 2)]); -#ifdef USE_CDFT_THREADS - if (n > CDFT_THREADS_BEGIN_N) { - cftrec4_th(n, a, nw, w); - } else -#endif /* USE_CDFT_THREADS */ - if (n > 512) { - cftrec4(n, a, nw, w); - } else if (n > 128) { - cftleaf(n, 1, a, nw, w); - } else { - cftfx41(n, a, nw, w); - } - bitrv2conj(n, ip, a); - } else if (n == 32) { - cftf161(a, &w[nw - 8]); - bitrv216neg(a); - } else { - cftf081(a, w); - bitrv208neg(a); - } - } else if (n == 8) { - cftb040(a); - } else if (n == 4) { - cftx020(a); - } -} - - -void bitrv2(int n, int *ip, double *a) -{ - int j, j1, k, k1, l, m, nh, nm; - double xr, xi, yr, yi; - - m = 1; - for (l = n >> 2; l > 8; l >>= 2) { - m <<= 1; - } - nh = n >> 1; - nm = 4 * m; - if (l == 8) { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + 2 * ip[m + k]; - k1 = 4 * k + 2 * ip[m + j]; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + 2 * ip[m + k]; - j1 = k1 + 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= 2; - k1 -= nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh + 2; - k1 += nh + 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh - nm; - k1 += 2 * nm - 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - } else { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + ip[m + k]; - k1 = 4 * k + ip[m + j]; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + ip[m + k]; - j1 = k1 + 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - } -} - - -void bitrv2conj(int n, int *ip, double *a) -{ - int j, j1, k, k1, l, m, nh, nm; - double xr, xi, yr, yi; - - m = 1; - for (l = n >> 2; l > 8; l >>= 2) { - m <<= 1; - } - nh = n >> 1; - nm = 4 * m; - if (l == 8) { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + 2 * ip[m + k]; - k1 = 4 * k + 2 * ip[m + j]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + 2 * ip[m + k]; - j1 = k1 + 2; - k1 += nh; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= 2; - k1 -= nh; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh + 2; - k1 += nh + 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh - nm; - k1 += 2 * nm - 2; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - } - } else { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + ip[m + k]; - k1 = 4 * k + ip[m + j]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + ip[m + k]; - j1 = k1 + 2; - k1 += nh; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - j1 += nm; - k1 += nm; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - } - } -} - - -void bitrv216(double *a) -{ - double x1r, x1i, x2r, x2i, x3r, x3i, x4r, x4i, - x5r, x5i, x7r, x7i, x8r, x8i, x10r, x10i, - x11r, x11i, x12r, x12i, x13r, x13i, x14r, x14i; - - x1r = a[2]; - x1i = a[3]; - x2r = a[4]; - x2i = a[5]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x5r = a[10]; - x5i = a[11]; - x7r = a[14]; - x7i = a[15]; - x8r = a[16]; - x8i = a[17]; - x10r = a[20]; - x10i = a[21]; - x11r = a[22]; - x11i = a[23]; - x12r = a[24]; - x12i = a[25]; - x13r = a[26]; - x13i = a[27]; - x14r = a[28]; - x14i = a[29]; - a[2] = x8r; - a[3] = x8i; - a[4] = x4r; - a[5] = x4i; - a[6] = x12r; - a[7] = x12i; - a[8] = x2r; - a[9] = x2i; - a[10] = x10r; - a[11] = x10i; - a[14] = x14r; - a[15] = x14i; - a[16] = x1r; - a[17] = x1i; - a[20] = x5r; - a[21] = x5i; - a[22] = x13r; - a[23] = x13i; - a[24] = x3r; - a[25] = x3i; - a[26] = x11r; - a[27] = x11i; - a[28] = x7r; - a[29] = x7i; -} - - -void bitrv216neg(double *a) -{ - double x1r, x1i, x2r, x2i, x3r, x3i, x4r, x4i, - x5r, x5i, x6r, x6i, x7r, x7i, x8r, x8i, - x9r, x9i, x10r, x10i, x11r, x11i, x12r, x12i, - x13r, x13i, x14r, x14i, x15r, x15i; - - x1r = a[2]; - x1i = a[3]; - x2r = a[4]; - x2i = a[5]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x5r = a[10]; - x5i = a[11]; - x6r = a[12]; - x6i = a[13]; - x7r = a[14]; - x7i = a[15]; - x8r = a[16]; - x8i = a[17]; - x9r = a[18]; - x9i = a[19]; - x10r = a[20]; - x10i = a[21]; - x11r = a[22]; - x11i = a[23]; - x12r = a[24]; - x12i = a[25]; - x13r = a[26]; - x13i = a[27]; - x14r = a[28]; - x14i = a[29]; - x15r = a[30]; - x15i = a[31]; - a[2] = x15r; - a[3] = x15i; - a[4] = x7r; - a[5] = x7i; - a[6] = x11r; - a[7] = x11i; - a[8] = x3r; - a[9] = x3i; - a[10] = x13r; - a[11] = x13i; - a[12] = x5r; - a[13] = x5i; - a[14] = x9r; - a[15] = x9i; - a[16] = x1r; - a[17] = x1i; - a[18] = x14r; - a[19] = x14i; - a[20] = x6r; - a[21] = x6i; - a[22] = x10r; - a[23] = x10i; - a[24] = x2r; - a[25] = x2i; - a[26] = x12r; - a[27] = x12i; - a[28] = x4r; - a[29] = x4i; - a[30] = x8r; - a[31] = x8i; -} - - -void bitrv208(double *a) -{ - double x1r, x1i, x3r, x3i, x4r, x4i, x6r, x6i; - - x1r = a[2]; - x1i = a[3]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x6r = a[12]; - x6i = a[13]; - a[2] = x4r; - a[3] = x4i; - a[6] = x6r; - a[7] = x6i; - a[8] = x1r; - a[9] = x1i; - a[12] = x3r; - a[13] = x3i; -} - - -void bitrv208neg(double *a) -{ - double x1r, x1i, x2r, x2i, x3r, x3i, x4r, x4i, - x5r, x5i, x6r, x6i, x7r, x7i; - - x1r = a[2]; - x1i = a[3]; - x2r = a[4]; - x2i = a[5]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x5r = a[10]; - x5i = a[11]; - x6r = a[12]; - x6i = a[13]; - x7r = a[14]; - x7i = a[15]; - a[2] = x7r; - a[3] = x7i; - a[4] = x3r; - a[5] = x3i; - a[6] = x5r; - a[7] = x5i; - a[8] = x1r; - a[9] = x1i; - a[10] = x6r; - a[11] = x6i; - a[12] = x2r; - a[13] = x2i; - a[14] = x4r; - a[15] = x4i; -} - - -void cftf1st(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, m, mh; - double wn4r, csc1, csc3, wk1r, wk1i, wk3r, wk3i, - wd1r, wd1i, wd3r, wd3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i; - - mh = n >> 3; - m = 2 * mh; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] + a[j2]; - x0i = a[1] + a[j2 + 1]; - x1r = a[0] - a[j2]; - x1i = a[1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j2] = x1r - x3i; - a[j2 + 1] = x1i + x3r; - a[j3] = x1r + x3i; - a[j3 + 1] = x1i - x3r; - wn4r = w[1]; - csc1 = w[2]; - csc3 = w[3]; - wd1r = 1; - wd1i = 0; - wd3r = 1; - wd3i = 0; - k = 0; - for (j = 2; j < mh - 2; j += 4) { - k += 4; - wk1r = csc1 * (wd1r + w[k]); - wk1i = csc1 * (wd1i + w[k + 1]); - wk3r = csc3 * (wd3r + w[k + 2]); - wk3i = csc3 * (wd3i + w[k + 3]); - wd1r = w[k]; - wd1i = w[k + 1]; - wd3r = w[k + 2]; - wd3i = w[k + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] + a[j2]; - x0i = a[j + 1] + a[j2 + 1]; - x1r = a[j] - a[j2]; - x1i = a[j + 1] - a[j2 + 1]; - y0r = a[j + 2] + a[j2 + 2]; - y0i = a[j + 3] + a[j2 + 3]; - y1r = a[j + 2] - a[j2 + 2]; - y1i = a[j + 3] - a[j2 + 3]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 + 2] + a[j3 + 2]; - y2i = a[j1 + 3] + a[j3 + 3]; - y3r = a[j1 + 2] - a[j3 + 2]; - y3i = a[j1 + 3] - a[j3 + 3]; - a[j] = x0r + x2r; - a[j + 1] = x0i + x2i; - a[j + 2] = y0r + y2r; - a[j + 3] = y0i + y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j1 + 2] = y0r - y2r; - a[j1 + 3] = y0i - y2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1r * x0r - wk1i * x0i; - a[j2 + 1] = wk1r * x0i + wk1i * x0r; - x0r = y1r - y3i; - x0i = y1i + y3r; - a[j2 + 2] = wd1r * x0r - wd1i * x0i; - a[j2 + 3] = wd1r * x0i + wd1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3r * x0r + wk3i * x0i; - a[j3 + 1] = wk3r * x0i - wk3i * x0r; - x0r = y1r + y3i; - x0i = y1i - y3r; - a[j3 + 2] = wd3r * x0r + wd3i * x0i; - a[j3 + 3] = wd3r * x0i - wd3i * x0r; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - y0r = a[j0 - 2] + a[j2 - 2]; - y0i = a[j0 - 1] + a[j2 - 1]; - y1r = a[j0 - 2] - a[j2 - 2]; - y1i = a[j0 - 1] - a[j2 - 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 - 2] + a[j3 - 2]; - y2i = a[j1 - 1] + a[j3 - 1]; - y3r = a[j1 - 2] - a[j3 - 2]; - y3i = a[j1 - 1] - a[j3 - 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j0 - 2] = y0r + y2r; - a[j0 - 1] = y0i + y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j1 - 2] = y0r - y2r; - a[j1 - 1] = y0i - y2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1i * x0r - wk1r * x0i; - a[j2 + 1] = wk1i * x0i + wk1r * x0r; - x0r = y1r - y3i; - x0i = y1i + y3r; - a[j2 - 2] = wd1i * x0r - wd1r * x0i; - a[j2 - 1] = wd1i * x0i + wd1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3i * x0r + wk3r * x0i; - a[j3 + 1] = wk3i * x0i - wk3r * x0r; - x0r = y1r + y3i; - x0i = y1i - y3r; - a[j3 - 2] = wd3i * x0r + wd3r * x0i; - a[j3 - 1] = wd3i * x0i - wd3r * x0r; - } - wk1r = csc1 * (wd1r + wn4r); - wk1i = csc1 * (wd1i + wn4r); - wk3r = csc3 * (wd3r - wn4r); - wk3i = csc3 * (wd3i - wn4r); - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0 - 2] + a[j2 - 2]; - x0i = a[j0 - 1] + a[j2 - 1]; - x1r = a[j0 - 2] - a[j2 - 2]; - x1i = a[j0 - 1] - a[j2 - 1]; - x2r = a[j1 - 2] + a[j3 - 2]; - x2i = a[j1 - 1] + a[j3 - 1]; - x3r = a[j1 - 2] - a[j3 - 2]; - x3i = a[j1 - 1] - a[j3 - 1]; - a[j0 - 2] = x0r + x2r; - a[j0 - 1] = x0i + x2i; - a[j1 - 2] = x0r - x2r; - a[j1 - 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2 - 2] = wk1r * x0r - wk1i * x0i; - a[j2 - 1] = wk1r * x0i + wk1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3 - 2] = wk3r * x0r + wk3i * x0i; - a[j3 - 1] = wk3r * x0i - wk3i * x0r; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wn4r * (x0r - x0i); - a[j2 + 1] = wn4r * (x0i + x0r); - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = -wn4r * (x0r + x0i); - a[j3 + 1] = -wn4r * (x0i - x0r); - x0r = a[j0 + 2] + a[j2 + 2]; - x0i = a[j0 + 3] + a[j2 + 3]; - x1r = a[j0 + 2] - a[j2 + 2]; - x1i = a[j0 + 3] - a[j2 + 3]; - x2r = a[j1 + 2] + a[j3 + 2]; - x2i = a[j1 + 3] + a[j3 + 3]; - x3r = a[j1 + 2] - a[j3 + 2]; - x3i = a[j1 + 3] - a[j3 + 3]; - a[j0 + 2] = x0r + x2r; - a[j0 + 3] = x0i + x2i; - a[j1 + 2] = x0r - x2r; - a[j1 + 3] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2 + 2] = wk1i * x0r - wk1r * x0i; - a[j2 + 3] = wk1i * x0i + wk1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3 + 2] = wk3i * x0r + wk3r * x0i; - a[j3 + 3] = wk3i * x0i - wk3r * x0r; -} - - -void cftb1st(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, m, mh; - double wn4r, csc1, csc3, wk1r, wk1i, wk3r, wk3i, - wd1r, wd1i, wd3r, wd3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i; - - mh = n >> 3; - m = 2 * mh; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] + a[j2]; - x0i = -a[1] - a[j2 + 1]; - x1r = a[0] - a[j2]; - x1i = -a[1] + a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[0] = x0r + x2r; - a[1] = x0i - x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - a[j2] = x1r + x3i; - a[j2 + 1] = x1i + x3r; - a[j3] = x1r - x3i; - a[j3 + 1] = x1i - x3r; - wn4r = w[1]; - csc1 = w[2]; - csc3 = w[3]; - wd1r = 1; - wd1i = 0; - wd3r = 1; - wd3i = 0; - k = 0; - for (j = 2; j < mh - 2; j += 4) { - k += 4; - wk1r = csc1 * (wd1r + w[k]); - wk1i = csc1 * (wd1i + w[k + 1]); - wk3r = csc3 * (wd3r + w[k + 2]); - wk3i = csc3 * (wd3i + w[k + 3]); - wd1r = w[k]; - wd1i = w[k + 1]; - wd3r = w[k + 2]; - wd3i = w[k + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] + a[j2]; - x0i = -a[j + 1] - a[j2 + 1]; - x1r = a[j] - a[j2]; - x1i = -a[j + 1] + a[j2 + 1]; - y0r = a[j + 2] + a[j2 + 2]; - y0i = -a[j + 3] - a[j2 + 3]; - y1r = a[j + 2] - a[j2 + 2]; - y1i = -a[j + 3] + a[j2 + 3]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 + 2] + a[j3 + 2]; - y2i = a[j1 + 3] + a[j3 + 3]; - y3r = a[j1 + 2] - a[j3 + 2]; - y3i = a[j1 + 3] - a[j3 + 3]; - a[j] = x0r + x2r; - a[j + 1] = x0i - x2i; - a[j + 2] = y0r + y2r; - a[j + 3] = y0i - y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - a[j1 + 2] = y0r - y2r; - a[j1 + 3] = y0i + y2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2] = wk1r * x0r - wk1i * x0i; - a[j2 + 1] = wk1r * x0i + wk1i * x0r; - x0r = y1r + y3i; - x0i = y1i + y3r; - a[j2 + 2] = wd1r * x0r - wd1i * x0i; - a[j2 + 3] = wd1r * x0i + wd1i * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3] = wk3r * x0r + wk3i * x0i; - a[j3 + 1] = wk3r * x0i - wk3i * x0r; - x0r = y1r - y3i; - x0i = y1i - y3r; - a[j3 + 2] = wd3r * x0r + wd3i * x0i; - a[j3 + 3] = wd3r * x0i - wd3i * x0r; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = -a[j0 + 1] - a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = -a[j0 + 1] + a[j2 + 1]; - y0r = a[j0 - 2] + a[j2 - 2]; - y0i = -a[j0 - 1] - a[j2 - 1]; - y1r = a[j0 - 2] - a[j2 - 2]; - y1i = -a[j0 - 1] + a[j2 - 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 - 2] + a[j3 - 2]; - y2i = a[j1 - 1] + a[j3 - 1]; - y3r = a[j1 - 2] - a[j3 - 2]; - y3i = a[j1 - 1] - a[j3 - 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i - x2i; - a[j0 - 2] = y0r + y2r; - a[j0 - 1] = y0i - y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - a[j1 - 2] = y0r - y2r; - a[j1 - 1] = y0i + y2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2] = wk1i * x0r - wk1r * x0i; - a[j2 + 1] = wk1i * x0i + wk1r * x0r; - x0r = y1r + y3i; - x0i = y1i + y3r; - a[j2 - 2] = wd1i * x0r - wd1r * x0i; - a[j2 - 1] = wd1i * x0i + wd1r * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3] = wk3i * x0r + wk3r * x0i; - a[j3 + 1] = wk3i * x0i - wk3r * x0r; - x0r = y1r - y3i; - x0i = y1i - y3r; - a[j3 - 2] = wd3i * x0r + wd3r * x0i; - a[j3 - 1] = wd3i * x0i - wd3r * x0r; - } - wk1r = csc1 * (wd1r + wn4r); - wk1i = csc1 * (wd1i + wn4r); - wk3r = csc3 * (wd3r - wn4r); - wk3i = csc3 * (wd3i - wn4r); - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0 - 2] + a[j2 - 2]; - x0i = -a[j0 - 1] - a[j2 - 1]; - x1r = a[j0 - 2] - a[j2 - 2]; - x1i = -a[j0 - 1] + a[j2 - 1]; - x2r = a[j1 - 2] + a[j3 - 2]; - x2i = a[j1 - 1] + a[j3 - 1]; - x3r = a[j1 - 2] - a[j3 - 2]; - x3i = a[j1 - 1] - a[j3 - 1]; - a[j0 - 2] = x0r + x2r; - a[j0 - 1] = x0i - x2i; - a[j1 - 2] = x0r - x2r; - a[j1 - 1] = x0i + x2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2 - 2] = wk1r * x0r - wk1i * x0i; - a[j2 - 1] = wk1r * x0i + wk1i * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3 - 2] = wk3r * x0r + wk3i * x0i; - a[j3 - 1] = wk3r * x0i - wk3i * x0r; - x0r = a[j0] + a[j2]; - x0i = -a[j0 + 1] - a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = -a[j0 + 1] + a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i - x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2] = wn4r * (x0r - x0i); - a[j2 + 1] = wn4r * (x0i + x0r); - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3] = -wn4r * (x0r + x0i); - a[j3 + 1] = -wn4r * (x0i - x0r); - x0r = a[j0 + 2] + a[j2 + 2]; - x0i = -a[j0 + 3] - a[j2 + 3]; - x1r = a[j0 + 2] - a[j2 + 2]; - x1i = -a[j0 + 3] + a[j2 + 3]; - x2r = a[j1 + 2] + a[j3 + 2]; - x2i = a[j1 + 3] + a[j3 + 3]; - x3r = a[j1 + 2] - a[j3 + 2]; - x3i = a[j1 + 3] - a[j3 + 3]; - a[j0 + 2] = x0r + x2r; - a[j0 + 3] = x0i - x2i; - a[j1 + 2] = x0r - x2r; - a[j1 + 3] = x0i + x2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2 + 2] = wk1i * x0r - wk1r * x0i; - a[j2 + 3] = wk1i * x0i + wk1r * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3 + 2] = wk3i * x0r + wk3r * x0i; - a[j3 + 3] = wk3i * x0i - wk3r * x0r; -} - - -#ifdef USE_CDFT_THREADS -struct cdft_arg_st { - int n0; - int n; - double *a; - int nw; - double *w; -}; -typedef struct cdft_arg_st cdft_arg_t; - - -void cftrec4_th(int n, double *a, int nw, double *w) -{ - void *cftrec1_th(void *p); - void *cftrec2_th(void *p); - int i, idiv4, m, nthread; - cdft_thread_t th[4]; - cdft_arg_t ag[4]; - - nthread = 2; - idiv4 = 0; - m = n >> 1; - if (n > CDFT_4THREADS_BEGIN_N) { - nthread = 4; - idiv4 = 1; - m >>= 1; - } - for (i = 0; i < nthread; i++) { - ag[i].n0 = n; - ag[i].n = m; - ag[i].a = &a[i * m]; - ag[i].nw = nw; - ag[i].w = w; - if (i != idiv4) { - cdft_thread_create(&th[i], cftrec1_th, &ag[i]); - } else { - cdft_thread_create(&th[i], cftrec2_th, &ag[i]); - } - } - for (i = 0; i < nthread; i++) { - cdft_thread_wait(th[i]); - } -} - - -void *cftrec1_th(void *p) -{ - int cfttree(int n, int j, int k, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftmdl1(int n, double *a, double *w); - int isplt, j, k, m, n, n0, nw; - double *a, *w; - - n0 = ((cdft_arg_t *) p)->n0; - n = ((cdft_arg_t *) p)->n; - a = ((cdft_arg_t *) p)->a; - nw = ((cdft_arg_t *) p)->nw; - w = ((cdft_arg_t *) p)->w; - m = n0; - while (m > 512) { - m >>= 2; - cftmdl1(m, &a[n - m], &w[nw - (m >> 1)]); - } - cftleaf(m, 1, &a[n - m], nw, w); - k = 0; - for (j = n - m; j > 0; j -= m) { - k++; - isplt = cfttree(m, j, k, a, nw, w); - cftleaf(m, isplt, &a[j - m], nw, w); - } - return (void *) 0; -} - - -void *cftrec2_th(void *p) -{ - int cfttree(int n, int j, int k, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftmdl2(int n, double *a, double *w); - int isplt, j, k, m, n, n0, nw; - double *a, *w; - - n0 = ((cdft_arg_t *) p)->n0; - n = ((cdft_arg_t *) p)->n; - a = ((cdft_arg_t *) p)->a; - nw = ((cdft_arg_t *) p)->nw; - w = ((cdft_arg_t *) p)->w; - k = 1; - m = n0; - while (m > 512) { - m >>= 2; - k <<= 2; - cftmdl2(m, &a[n - m], &w[nw - m]); - } - cftleaf(m, 0, &a[n - m], nw, w); - k >>= 1; - for (j = n - m; j > 0; j -= m) { - k++; - isplt = cfttree(m, j, k, a, nw, w); - cftleaf(m, isplt, &a[j - m], nw, w); - } - return (void *) 0; -} -#endif /* USE_CDFT_THREADS */ - - -void cftrec4(int n, double *a, int nw, double *w) -{ - int cfttree(int n, int j, int k, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftmdl1(int n, double *a, double *w); - int isplt, j, k, m; - - m = n; - while (m > 512) { - m >>= 2; - cftmdl1(m, &a[n - m], &w[nw - (m >> 1)]); - } - cftleaf(m, 1, &a[n - m], nw, w); - k = 0; - for (j = n - m; j > 0; j -= m) { - k++; - isplt = cfttree(m, j, k, a, nw, w); - cftleaf(m, isplt, &a[j - m], nw, w); - } -} - - -int cfttree(int n, int j, int k, double *a, int nw, double *w) -{ - void cftmdl1(int n, double *a, double *w); - void cftmdl2(int n, double *a, double *w); - int i, isplt, m; - - if ((k & 3) != 0) { - isplt = k & 1; - if (isplt != 0) { - cftmdl1(n, &a[j - n], &w[nw - (n >> 1)]); - } else { - cftmdl2(n, &a[j - n], &w[nw - n]); - } - } else { - m = n; - for (i = k; (i & 3) == 0; i >>= 2) { - m <<= 2; - } - isplt = i & 1; - if (isplt != 0) { - while (m > 128) { - cftmdl1(m, &a[j - m], &w[nw - (m >> 1)]); - m >>= 2; - } - } else { - while (m > 128) { - cftmdl2(m, &a[j - m], &w[nw - m]); - m >>= 2; - } - } - } - return isplt; -} - - -void cftleaf(int n, int isplt, double *a, int nw, double *w) -{ - void cftmdl1(int n, double *a, double *w); - void cftmdl2(int n, double *a, double *w); - void cftf161(double *a, double *w); - void cftf162(double *a, double *w); - void cftf081(double *a, double *w); - void cftf082(double *a, double *w); - - if (n == 512) { - cftmdl1(128, a, &w[nw - 64]); - cftf161(a, &w[nw - 8]); - cftf162(&a[32], &w[nw - 32]); - cftf161(&a[64], &w[nw - 8]); - cftf161(&a[96], &w[nw - 8]); - cftmdl2(128, &a[128], &w[nw - 128]); - cftf161(&a[128], &w[nw - 8]); - cftf162(&a[160], &w[nw - 32]); - cftf161(&a[192], &w[nw - 8]); - cftf162(&a[224], &w[nw - 32]); - cftmdl1(128, &a[256], &w[nw - 64]); - cftf161(&a[256], &w[nw - 8]); - cftf162(&a[288], &w[nw - 32]); - cftf161(&a[320], &w[nw - 8]); - cftf161(&a[352], &w[nw - 8]); - if (isplt != 0) { - cftmdl1(128, &a[384], &w[nw - 64]); - cftf161(&a[480], &w[nw - 8]); - } else { - cftmdl2(128, &a[384], &w[nw - 128]); - cftf162(&a[480], &w[nw - 32]); - } - cftf161(&a[384], &w[nw - 8]); - cftf162(&a[416], &w[nw - 32]); - cftf161(&a[448], &w[nw - 8]); - } else { - cftmdl1(64, a, &w[nw - 32]); - cftf081(a, &w[nw - 8]); - cftf082(&a[16], &w[nw - 8]); - cftf081(&a[32], &w[nw - 8]); - cftf081(&a[48], &w[nw - 8]); - cftmdl2(64, &a[64], &w[nw - 64]); - cftf081(&a[64], &w[nw - 8]); - cftf082(&a[80], &w[nw - 8]); - cftf081(&a[96], &w[nw - 8]); - cftf082(&a[112], &w[nw - 8]); - cftmdl1(64, &a[128], &w[nw - 32]); - cftf081(&a[128], &w[nw - 8]); - cftf082(&a[144], &w[nw - 8]); - cftf081(&a[160], &w[nw - 8]); - cftf081(&a[176], &w[nw - 8]); - if (isplt != 0) { - cftmdl1(64, &a[192], &w[nw - 32]); - cftf081(&a[240], &w[nw - 8]); - } else { - cftmdl2(64, &a[192], &w[nw - 64]); - cftf082(&a[240], &w[nw - 8]); - } - cftf081(&a[192], &w[nw - 8]); - cftf082(&a[208], &w[nw - 8]); - cftf081(&a[224], &w[nw - 8]); - } -} - - -void cftmdl1(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, m, mh; - double wn4r, wk1r, wk1i, wk3r, wk3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i; - - mh = n >> 3; - m = 2 * mh; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] + a[j2]; - x0i = a[1] + a[j2 + 1]; - x1r = a[0] - a[j2]; - x1i = a[1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j2] = x1r - x3i; - a[j2 + 1] = x1i + x3r; - a[j3] = x1r + x3i; - a[j3 + 1] = x1i - x3r; - wn4r = w[1]; - k = 0; - for (j = 2; j < mh; j += 2) { - k += 4; - wk1r = w[k]; - wk1i = w[k + 1]; - wk3r = w[k + 2]; - wk3i = w[k + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] + a[j2]; - x0i = a[j + 1] + a[j2 + 1]; - x1r = a[j] - a[j2]; - x1i = a[j + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j] = x0r + x2r; - a[j + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1r * x0r - wk1i * x0i; - a[j2 + 1] = wk1r * x0i + wk1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3r * x0r + wk3i * x0i; - a[j3 + 1] = wk3r * x0i - wk3i * x0r; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1i * x0r - wk1r * x0i; - a[j2 + 1] = wk1i * x0i + wk1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3i * x0r + wk3r * x0i; - a[j3 + 1] = wk3i * x0i - wk3r * x0r; - } - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wn4r * (x0r - x0i); - a[j2 + 1] = wn4r * (x0i + x0r); - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = -wn4r * (x0r + x0i); - a[j3 + 1] = -wn4r * (x0i - x0r); -} - - -void cftmdl2(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, kr, m, mh; - double wn4r, wk1r, wk1i, wk3r, wk3i, wd1r, wd1i, wd3r, wd3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, y0r, y0i, y2r, y2i; - - mh = n >> 3; - m = 2 * mh; - wn4r = w[1]; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] - a[j2 + 1]; - x0i = a[1] + a[j2]; - x1r = a[0] + a[j2 + 1]; - x1i = a[1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wn4r * (x2r - x2i); - y0i = wn4r * (x2i + x2r); - a[0] = x0r + y0r; - a[1] = x0i + y0i; - a[j1] = x0r - y0r; - a[j1 + 1] = x0i - y0i; - y0r = wn4r * (x3r - x3i); - y0i = wn4r * (x3i + x3r); - a[j2] = x1r - y0i; - a[j2 + 1] = x1i + y0r; - a[j3] = x1r + y0i; - a[j3 + 1] = x1i - y0r; - k = 0; - kr = 2 * m; - for (j = 2; j < mh; j += 2) { - k += 4; - wk1r = w[k]; - wk1i = w[k + 1]; - wk3r = w[k + 2]; - wk3i = w[k + 3]; - kr -= 4; - wd1i = w[kr]; - wd1r = w[kr + 1]; - wd3i = w[kr + 2]; - wd3r = w[kr + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] - a[j2 + 1]; - x0i = a[j + 1] + a[j2]; - x1r = a[j] + a[j2 + 1]; - x1i = a[j + 1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wk1r * x0r - wk1i * x0i; - y0i = wk1r * x0i + wk1i * x0r; - y2r = wd1r * x2r - wd1i * x2i; - y2i = wd1r * x2i + wd1i * x2r; - a[j] = y0r + y2r; - a[j + 1] = y0i + y2i; - a[j1] = y0r - y2r; - a[j1 + 1] = y0i - y2i; - y0r = wk3r * x1r + wk3i * x1i; - y0i = wk3r * x1i - wk3i * x1r; - y2r = wd3r * x3r + wd3i * x3i; - y2i = wd3r * x3i - wd3i * x3r; - a[j2] = y0r + y2r; - a[j2 + 1] = y0i + y2i; - a[j3] = y0r - y2r; - a[j3 + 1] = y0i - y2i; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] - a[j2 + 1]; - x0i = a[j0 + 1] + a[j2]; - x1r = a[j0] + a[j2 + 1]; - x1i = a[j0 + 1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wd1i * x0r - wd1r * x0i; - y0i = wd1i * x0i + wd1r * x0r; - y2r = wk1i * x2r - wk1r * x2i; - y2i = wk1i * x2i + wk1r * x2r; - a[j0] = y0r + y2r; - a[j0 + 1] = y0i + y2i; - a[j1] = y0r - y2r; - a[j1 + 1] = y0i - y2i; - y0r = wd3i * x1r + wd3r * x1i; - y0i = wd3i * x1i - wd3r * x1r; - y2r = wk3i * x3r + wk3r * x3i; - y2i = wk3i * x3i - wk3r * x3r; - a[j2] = y0r + y2r; - a[j2 + 1] = y0i + y2i; - a[j3] = y0r - y2r; - a[j3 + 1] = y0i - y2i; - } - wk1r = w[m]; - wk1i = w[m + 1]; - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] - a[j2 + 1]; - x0i = a[j0 + 1] + a[j2]; - x1r = a[j0] + a[j2 + 1]; - x1i = a[j0 + 1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wk1r * x0r - wk1i * x0i; - y0i = wk1r * x0i + wk1i * x0r; - y2r = wk1i * x2r - wk1r * x2i; - y2i = wk1i * x2i + wk1r * x2r; - a[j0] = y0r + y2r; - a[j0 + 1] = y0i + y2i; - a[j1] = y0r - y2r; - a[j1 + 1] = y0i - y2i; - y0r = wk1i * x1r - wk1r * x1i; - y0i = wk1i * x1i + wk1r * x1r; - y2r = wk1r * x3r - wk1i * x3i; - y2i = wk1r * x3i + wk1i * x3r; - a[j2] = y0r - y2r; - a[j2 + 1] = y0i - y2i; - a[j3] = y0r + y2r; - a[j3 + 1] = y0i + y2i; -} - - -void cftfx41(int n, double *a, int nw, double *w) -{ - void cftf161(double *a, double *w); - void cftf162(double *a, double *w); - void cftf081(double *a, double *w); - void cftf082(double *a, double *w); - - if (n == 128) { - cftf161(a, &w[nw - 8]); - cftf162(&a[32], &w[nw - 32]); - cftf161(&a[64], &w[nw - 8]); - cftf161(&a[96], &w[nw - 8]); - } else { - cftf081(a, &w[nw - 8]); - cftf082(&a[16], &w[nw - 8]); - cftf081(&a[32], &w[nw - 8]); - cftf081(&a[48], &w[nw - 8]); - } -} - - -void cftf161(double *a, double *w) -{ - double wn4r, wk1r, wk1i, - x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i, - y8r, y8i, y9r, y9i, y10r, y10i, y11r, y11i, - y12r, y12i, y13r, y13i, y14r, y14i, y15r, y15i; - - wn4r = w[1]; - wk1r = w[2]; - wk1i = w[3]; - x0r = a[0] + a[16]; - x0i = a[1] + a[17]; - x1r = a[0] - a[16]; - x1i = a[1] - a[17]; - x2r = a[8] + a[24]; - x2i = a[9] + a[25]; - x3r = a[8] - a[24]; - x3i = a[9] - a[25]; - y0r = x0r + x2r; - y0i = x0i + x2i; - y4r = x0r - x2r; - y4i = x0i - x2i; - y8r = x1r - x3i; - y8i = x1i + x3r; - y12r = x1r + x3i; - y12i = x1i - x3r; - x0r = a[2] + a[18]; - x0i = a[3] + a[19]; - x1r = a[2] - a[18]; - x1i = a[3] - a[19]; - x2r = a[10] + a[26]; - x2i = a[11] + a[27]; - x3r = a[10] - a[26]; - x3i = a[11] - a[27]; - y1r = x0r + x2r; - y1i = x0i + x2i; - y5r = x0r - x2r; - y5i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - y9r = wk1r * x0r - wk1i * x0i; - y9i = wk1r * x0i + wk1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - y13r = wk1i * x0r - wk1r * x0i; - y13i = wk1i * x0i + wk1r * x0r; - x0r = a[4] + a[20]; - x0i = a[5] + a[21]; - x1r = a[4] - a[20]; - x1i = a[5] - a[21]; - x2r = a[12] + a[28]; - x2i = a[13] + a[29]; - x3r = a[12] - a[28]; - x3i = a[13] - a[29]; - y2r = x0r + x2r; - y2i = x0i + x2i; - y6r = x0r - x2r; - y6i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - y10r = wn4r * (x0r - x0i); - y10i = wn4r * (x0i + x0r); - x0r = x1r + x3i; - x0i = x1i - x3r; - y14r = wn4r * (x0r + x0i); - y14i = wn4r * (x0i - x0r); - x0r = a[6] + a[22]; - x0i = a[7] + a[23]; - x1r = a[6] - a[22]; - x1i = a[7] - a[23]; - x2r = a[14] + a[30]; - x2i = a[15] + a[31]; - x3r = a[14] - a[30]; - x3i = a[15] - a[31]; - y3r = x0r + x2r; - y3i = x0i + x2i; - y7r = x0r - x2r; - y7i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - y11r = wk1i * x0r - wk1r * x0i; - y11i = wk1i * x0i + wk1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - y15r = wk1r * x0r - wk1i * x0i; - y15i = wk1r * x0i + wk1i * x0r; - x0r = y12r - y14r; - x0i = y12i - y14i; - x1r = y12r + y14r; - x1i = y12i + y14i; - x2r = y13r - y15r; - x2i = y13i - y15i; - x3r = y13r + y15r; - x3i = y13i + y15i; - a[24] = x0r + x2r; - a[25] = x0i + x2i; - a[26] = x0r - x2r; - a[27] = x0i - x2i; - a[28] = x1r - x3i; - a[29] = x1i + x3r; - a[30] = x1r + x3i; - a[31] = x1i - x3r; - x0r = y8r + y10r; - x0i = y8i + y10i; - x1r = y8r - y10r; - x1i = y8i - y10i; - x2r = y9r + y11r; - x2i = y9i + y11i; - x3r = y9r - y11r; - x3i = y9i - y11i; - a[16] = x0r + x2r; - a[17] = x0i + x2i; - a[18] = x0r - x2r; - a[19] = x0i - x2i; - a[20] = x1r - x3i; - a[21] = x1i + x3r; - a[22] = x1r + x3i; - a[23] = x1i - x3r; - x0r = y5r - y7i; - x0i = y5i + y7r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - x0r = y5r + y7i; - x0i = y5i - y7r; - x3r = wn4r * (x0r - x0i); - x3i = wn4r * (x0i + x0r); - x0r = y4r - y6i; - x0i = y4i + y6r; - x1r = y4r + y6i; - x1i = y4i - y6r; - a[8] = x0r + x2r; - a[9] = x0i + x2i; - a[10] = x0r - x2r; - a[11] = x0i - x2i; - a[12] = x1r - x3i; - a[13] = x1i + x3r; - a[14] = x1r + x3i; - a[15] = x1i - x3r; - x0r = y0r + y2r; - x0i = y0i + y2i; - x1r = y0r - y2r; - x1i = y0i - y2i; - x2r = y1r + y3r; - x2i = y1i + y3i; - x3r = y1r - y3r; - x3i = y1i - y3i; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[2] = x0r - x2r; - a[3] = x0i - x2i; - a[4] = x1r - x3i; - a[5] = x1i + x3r; - a[6] = x1r + x3i; - a[7] = x1i - x3r; -} - - -void cftf162(double *a, double *w) -{ - double wn4r, wk1r, wk1i, wk2r, wk2i, wk3r, wk3i, - x0r, x0i, x1r, x1i, x2r, x2i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i, - y8r, y8i, y9r, y9i, y10r, y10i, y11r, y11i, - y12r, y12i, y13r, y13i, y14r, y14i, y15r, y15i; - - wn4r = w[1]; - wk1r = w[4]; - wk1i = w[5]; - wk3r = w[6]; - wk3i = -w[7]; - wk2r = w[8]; - wk2i = w[9]; - x1r = a[0] - a[17]; - x1i = a[1] + a[16]; - x0r = a[8] - a[25]; - x0i = a[9] + a[24]; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - y0r = x1r + x2r; - y0i = x1i + x2i; - y4r = x1r - x2r; - y4i = x1i - x2i; - x1r = a[0] + a[17]; - x1i = a[1] - a[16]; - x0r = a[8] + a[25]; - x0i = a[9] - a[24]; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - y8r = x1r - x2i; - y8i = x1i + x2r; - y12r = x1r + x2i; - y12i = x1i - x2r; - x0r = a[2] - a[19]; - x0i = a[3] + a[18]; - x1r = wk1r * x0r - wk1i * x0i; - x1i = wk1r * x0i + wk1i * x0r; - x0r = a[10] - a[27]; - x0i = a[11] + a[26]; - x2r = wk3i * x0r - wk3r * x0i; - x2i = wk3i * x0i + wk3r * x0r; - y1r = x1r + x2r; - y1i = x1i + x2i; - y5r = x1r - x2r; - y5i = x1i - x2i; - x0r = a[2] + a[19]; - x0i = a[3] - a[18]; - x1r = wk3r * x0r - wk3i * x0i; - x1i = wk3r * x0i + wk3i * x0r; - x0r = a[10] + a[27]; - x0i = a[11] - a[26]; - x2r = wk1r * x0r + wk1i * x0i; - x2i = wk1r * x0i - wk1i * x0r; - y9r = x1r - x2r; - y9i = x1i - x2i; - y13r = x1r + x2r; - y13i = x1i + x2i; - x0r = a[4] - a[21]; - x0i = a[5] + a[20]; - x1r = wk2r * x0r - wk2i * x0i; - x1i = wk2r * x0i + wk2i * x0r; - x0r = a[12] - a[29]; - x0i = a[13] + a[28]; - x2r = wk2i * x0r - wk2r * x0i; - x2i = wk2i * x0i + wk2r * x0r; - y2r = x1r + x2r; - y2i = x1i + x2i; - y6r = x1r - x2r; - y6i = x1i - x2i; - x0r = a[4] + a[21]; - x0i = a[5] - a[20]; - x1r = wk2i * x0r - wk2r * x0i; - x1i = wk2i * x0i + wk2r * x0r; - x0r = a[12] + a[29]; - x0i = a[13] - a[28]; - x2r = wk2r * x0r - wk2i * x0i; - x2i = wk2r * x0i + wk2i * x0r; - y10r = x1r - x2r; - y10i = x1i - x2i; - y14r = x1r + x2r; - y14i = x1i + x2i; - x0r = a[6] - a[23]; - x0i = a[7] + a[22]; - x1r = wk3r * x0r - wk3i * x0i; - x1i = wk3r * x0i + wk3i * x0r; - x0r = a[14] - a[31]; - x0i = a[15] + a[30]; - x2r = wk1i * x0r - wk1r * x0i; - x2i = wk1i * x0i + wk1r * x0r; - y3r = x1r + x2r; - y3i = x1i + x2i; - y7r = x1r - x2r; - y7i = x1i - x2i; - x0r = a[6] + a[23]; - x0i = a[7] - a[22]; - x1r = wk1i * x0r + wk1r * x0i; - x1i = wk1i * x0i - wk1r * x0r; - x0r = a[14] + a[31]; - x0i = a[15] - a[30]; - x2r = wk3i * x0r - wk3r * x0i; - x2i = wk3i * x0i + wk3r * x0r; - y11r = x1r + x2r; - y11i = x1i + x2i; - y15r = x1r - x2r; - y15i = x1i - x2i; - x1r = y0r + y2r; - x1i = y0i + y2i; - x2r = y1r + y3r; - x2i = y1i + y3i; - a[0] = x1r + x2r; - a[1] = x1i + x2i; - a[2] = x1r - x2r; - a[3] = x1i - x2i; - x1r = y0r - y2r; - x1i = y0i - y2i; - x2r = y1r - y3r; - x2i = y1i - y3i; - a[4] = x1r - x2i; - a[5] = x1i + x2r; - a[6] = x1r + x2i; - a[7] = x1i - x2r; - x1r = y4r - y6i; - x1i = y4i + y6r; - x0r = y5r - y7i; - x0i = y5i + y7r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[8] = x1r + x2r; - a[9] = x1i + x2i; - a[10] = x1r - x2r; - a[11] = x1i - x2i; - x1r = y4r + y6i; - x1i = y4i - y6r; - x0r = y5r + y7i; - x0i = y5i - y7r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[12] = x1r - x2i; - a[13] = x1i + x2r; - a[14] = x1r + x2i; - a[15] = x1i - x2r; - x1r = y8r + y10r; - x1i = y8i + y10i; - x2r = y9r - y11r; - x2i = y9i - y11i; - a[16] = x1r + x2r; - a[17] = x1i + x2i; - a[18] = x1r - x2r; - a[19] = x1i - x2i; - x1r = y8r - y10r; - x1i = y8i - y10i; - x2r = y9r + y11r; - x2i = y9i + y11i; - a[20] = x1r - x2i; - a[21] = x1i + x2r; - a[22] = x1r + x2i; - a[23] = x1i - x2r; - x1r = y12r - y14i; - x1i = y12i + y14r; - x0r = y13r + y15i; - x0i = y13i - y15r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[24] = x1r + x2r; - a[25] = x1i + x2i; - a[26] = x1r - x2r; - a[27] = x1i - x2i; - x1r = y12r + y14i; - x1i = y12i - y14r; - x0r = y13r - y15i; - x0i = y13i + y15r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[28] = x1r - x2i; - a[29] = x1i + x2r; - a[30] = x1r + x2i; - a[31] = x1i - x2r; -} - - -void cftf081(double *a, double *w) -{ - double wn4r, x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i; - - wn4r = w[1]; - x0r = a[0] + a[8]; - x0i = a[1] + a[9]; - x1r = a[0] - a[8]; - x1i = a[1] - a[9]; - x2r = a[4] + a[12]; - x2i = a[5] + a[13]; - x3r = a[4] - a[12]; - x3i = a[5] - a[13]; - y0r = x0r + x2r; - y0i = x0i + x2i; - y2r = x0r - x2r; - y2i = x0i - x2i; - y1r = x1r - x3i; - y1i = x1i + x3r; - y3r = x1r + x3i; - y3i = x1i - x3r; - x0r = a[2] + a[10]; - x0i = a[3] + a[11]; - x1r = a[2] - a[10]; - x1i = a[3] - a[11]; - x2r = a[6] + a[14]; - x2i = a[7] + a[15]; - x3r = a[6] - a[14]; - x3i = a[7] - a[15]; - y4r = x0r + x2r; - y4i = x0i + x2i; - y6r = x0r - x2r; - y6i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - x2r = x1r + x3i; - x2i = x1i - x3r; - y5r = wn4r * (x0r - x0i); - y5i = wn4r * (x0r + x0i); - y7r = wn4r * (x2r - x2i); - y7i = wn4r * (x2r + x2i); - a[8] = y1r + y5r; - a[9] = y1i + y5i; - a[10] = y1r - y5r; - a[11] = y1i - y5i; - a[12] = y3r - y7i; - a[13] = y3i + y7r; - a[14] = y3r + y7i; - a[15] = y3i - y7r; - a[0] = y0r + y4r; - a[1] = y0i + y4i; - a[2] = y0r - y4r; - a[3] = y0i - y4i; - a[4] = y2r - y6i; - a[5] = y2i + y6r; - a[6] = y2r + y6i; - a[7] = y2i - y6r; -} - - -void cftf082(double *a, double *w) -{ - double wn4r, wk1r, wk1i, x0r, x0i, x1r, x1i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i; - - wn4r = w[1]; - wk1r = w[2]; - wk1i = w[3]; - y0r = a[0] - a[9]; - y0i = a[1] + a[8]; - y1r = a[0] + a[9]; - y1i = a[1] - a[8]; - x0r = a[4] - a[13]; - x0i = a[5] + a[12]; - y2r = wn4r * (x0r - x0i); - y2i = wn4r * (x0i + x0r); - x0r = a[4] + a[13]; - x0i = a[5] - a[12]; - y3r = wn4r * (x0r - x0i); - y3i = wn4r * (x0i + x0r); - x0r = a[2] - a[11]; - x0i = a[3] + a[10]; - y4r = wk1r * x0r - wk1i * x0i; - y4i = wk1r * x0i + wk1i * x0r; - x0r = a[2] + a[11]; - x0i = a[3] - a[10]; - y5r = wk1i * x0r - wk1r * x0i; - y5i = wk1i * x0i + wk1r * x0r; - x0r = a[6] - a[15]; - x0i = a[7] + a[14]; - y6r = wk1i * x0r - wk1r * x0i; - y6i = wk1i * x0i + wk1r * x0r; - x0r = a[6] + a[15]; - x0i = a[7] - a[14]; - y7r = wk1r * x0r - wk1i * x0i; - y7i = wk1r * x0i + wk1i * x0r; - x0r = y0r + y2r; - x0i = y0i + y2i; - x1r = y4r + y6r; - x1i = y4i + y6i; - a[0] = x0r + x1r; - a[1] = x0i + x1i; - a[2] = x0r - x1r; - a[3] = x0i - x1i; - x0r = y0r - y2r; - x0i = y0i - y2i; - x1r = y4r - y6r; - x1i = y4i - y6i; - a[4] = x0r - x1i; - a[5] = x0i + x1r; - a[6] = x0r + x1i; - a[7] = x0i - x1r; - x0r = y1r - y3i; - x0i = y1i + y3r; - x1r = y5r - y7r; - x1i = y5i - y7i; - a[8] = x0r + x1r; - a[9] = x0i + x1i; - a[10] = x0r - x1r; - a[11] = x0i - x1i; - x0r = y1r + y3i; - x0i = y1i - y3r; - x1r = y5r + y7r; - x1i = y5i + y7i; - a[12] = x0r - x1i; - a[13] = x0i + x1r; - a[14] = x0r + x1i; - a[15] = x0i - x1r; -} - - -void cftf040(double *a) -{ - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i; - - x0r = a[0] + a[4]; - x0i = a[1] + a[5]; - x1r = a[0] - a[4]; - x1i = a[1] - a[5]; - x2r = a[2] + a[6]; - x2i = a[3] + a[7]; - x3r = a[2] - a[6]; - x3i = a[3] - a[7]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[2] = x1r - x3i; - a[3] = x1i + x3r; - a[4] = x0r - x2r; - a[5] = x0i - x2i; - a[6] = x1r + x3i; - a[7] = x1i - x3r; -} - - -void cftb040(double *a) -{ - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i; - - x0r = a[0] + a[4]; - x0i = a[1] + a[5]; - x1r = a[0] - a[4]; - x1i = a[1] - a[5]; - x2r = a[2] + a[6]; - x2i = a[3] + a[7]; - x3r = a[2] - a[6]; - x3i = a[3] - a[7]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[2] = x1r + x3i; - a[3] = x1i - x3r; - a[4] = x0r - x2r; - a[5] = x0i - x2i; - a[6] = x1r - x3i; - a[7] = x1i + x3r; -} - - -void cftx020(double *a) -{ - double x0r, x0i; - - x0r = a[0] - a[2]; - x0i = a[1] - a[3]; - a[0] += a[2]; - a[1] += a[3]; - a[2] = x0r; - a[3] = x0i; -} - - -void rftfsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr, xi, yr, yi; - - m = n >> 1; - ks = 2 * nc / m; - kk = 0; - for (j = 2; j < m; j += 2) { - k = n - j; - kk += ks; - wkr = 0.5 - c[nc - kk]; - wki = c[kk]; - xr = a[j] - a[k]; - xi = a[j + 1] + a[k + 1]; - yr = wkr * xr - wki * xi; - yi = wkr * xi + wki * xr; - a[j] -= yr; - a[j + 1] -= yi; - a[k] += yr; - a[k + 1] -= yi; - } -} - - -void rftbsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr, xi, yr, yi; - - m = n >> 1; - ks = 2 * nc / m; - kk = 0; - for (j = 2; j < m; j += 2) { - k = n - j; - kk += ks; - wkr = 0.5 - c[nc - kk]; - wki = c[kk]; - xr = a[j] - a[k]; - xi = a[j + 1] + a[k + 1]; - yr = wkr * xr + wki * xi; - yi = wkr * xi - wki * xr; - a[j] -= yr; - a[j + 1] -= yi; - a[k] += yr; - a[k + 1] -= yi; - } -} - - -void dctsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr; - - m = n >> 1; - ks = nc / n; - kk = 0; - for (j = 1; j < m; j++) { - k = n - j; - kk += ks; - wkr = c[kk] - c[nc - kk]; - wki = c[kk] + c[nc - kk]; - xr = wki * a[j] - wkr * a[k]; - a[j] = wkr * a[j] + wki * a[k]; - a[k] = xr; - } - a[m] *= c[0]; -} - - -void dstsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr; - - m = n >> 1; - ks = nc / n; - kk = 0; - for (j = 1; j < m; j++) { - k = n - j; - kk += ks; - wkr = c[kk] - c[nc - kk]; - wki = c[kk] + c[nc - kk]; - xr = wki * a[k] - wkr * a[j]; - a[k] = wkr * a[k] + wki * a[j]; - a[j] = xr; - } - a[m] *= c[0]; -} - Copied: branches/pd-extended/0.41/pd/src/d_fft_fftsg.c (from rev 10495, tags/pd/0.41-4/src/d_fft_fftsg.c) =================================================================== --- branches/pd-extended/0.41/pd/src/d_fft_fftsg.c (rev 0) +++ branches/pd-extended/0.41/pd/src/d_fft_fftsg.c 2009-01-10 02:20:22 UTC (rev 10497) @@ -0,0 +1,3462 @@ +/****************** begin Pd-specific prologue ***********************/ + +/* +This is the file, "fftsg.c" from the OOURA FFT package. The copyright notice +from Ooura's README is: + +Copyright: + Copyright(C) 1996-2001 Takuya OOURA + email: ooura(a)mmm.t.u-tokyo.ac.jp + download: http://momonga.t.u-tokyo.ac.jp/~ooura/fft.html + You may use, copy, modify this code for any purpose and + without fee. You may distribute this ORIGINAL package. + +After the following prologue, the code is exactly Ooura's original, which I +believe the above notice permits me to redistribute. See Ooura's website +for another, more permissive-sounding copyright notice. -MSP +*/ + +/* ---------- Pd interface to OOURA FFT; imitate Mayer API ---------- */ +#include "m_pd.h" +#ifdef MSW +#include <malloc.h> +#else +#include <alloca.h> +#endif + +#define FFTFLT double +void cdft(int, int, double *, int *, double *); +void rdft(int, int, double *, int *, double *); + +int ilog2(int n); + +static int ooura_maxn; +static int *ooura_bitrev; +static int ooura_bitrevsize; +static FFTFLT *ooura_costab; + +static int ooura_init( int n) +{ + n = (1 << ilog2(n)); + if (n < 64) + return (0); + if (n > ooura_maxn) + { + post("init"); + if (ooura_maxn) + { + t_freebytes(ooura_bitrev, ooura_bitrevsize); + t_freebytes(ooura_costab, ooura_maxn * sizeof(FFTFLT) / 2); + } + ooura_bitrevsize = sizeof(int *) * (2 + (1 << (ilog2(n)/2))); + ooura_bitrev = (int *)t_getbytes(ooura_bitrevsize); + ooura_bitrev[0] = 0; + if (!ooura_bitrev) + { + error("out of memory allocating FFT buffer"); + ooura_maxn = 0; + return (0); + } + ooura_costab = (FFTFLT *)t_getbytes(n * sizeof(FFTFLT)/2); + if (!ooura_costab) + { + error("out of memory allocating FFT buffer"); + t_freebytes(ooura_bitrev, ooura_bitrevsize); + ooura_maxn = 0; + return (0); + } + ooura_maxn = n; + ooura_bitrev[0] = 0; + } + return (1); +} + +EXTERN void mayer_fht(t_sample *fz, int n) +{ + post("FHT: not yet implemented"); +} + +EXTERN void mayer_dofft(t_sample *fz1, t_sample *fz2, int n, int sgn) +{ + FFTFLT *buf, *fp3; + int i; + t_sample *fp1, *fp2; + buf = alloca(n * (2 * sizeof(FFTFLT))); + if (!ooura_init(n)) + return; + for (i = 0, fp1 = fz1, fp2 = fz2, fp3 = buf; i < n; i++) + { + fp3[0] = *fp1++; + fp3[1] = *fp2++; + fp3 += 2; + } + cdft(2*n, sgn, buf, ooura_bitrev, ooura_costab); + for (i = 0, fp1 = fz1, fp2 = fz2, fp3 = buf; i < n; i++) + { + *fp1++ = fp3[0]; + *fp2++ = fp3[1]; + fp3 += 2; + } +} + +EXTERN void mayer_fft(int n, t_sample *fz1, t_sample *fz2) +{ + mayer_dofft(fz1, fz2, n, -1); +} + +EXTERN void mayer_ifft(int n, t_sample *fz1, t_sample *fz2) +{ + mayer_dofft(fz1, fz2, n, 1); +} + +EXTERN void mayer_realfft(int n, t_sample *fz) +{ + FFTFLT *buf, *fp3; + int i, nover2 = n/2; + t_sample *fp1, *fp2; + buf = alloca(n * sizeof(FFTFLT)); + if (!ooura_init(n)) + return; + for (i = 0, fp1 = fz, fp3 = buf; i < n; i++, fp1++, fp3++) + buf[i] = fz[i]; + rdft(n, 1, buf, ooura_bitrev, ooura_costab); + fz[0] = buf[0]; + fz[nover2] = buf[1]; + for (i = 1, fp1 = fz+1, fp2 = fz+(n-1), fp3 = buf+2; i < nover2; + i++, fp1++, fp2--, fp3 += 2) + *fp1 = fp3[0], *fp2 = fp3[1]; +} + +EXTERN void mayer_realifft(int n, t_sample *fz) +{ + FFTFLT *buf, *fp3; + int i, nover2 = n/2; + t_sample *fp1, *fp2; + buf = alloca(n * sizeof(FFTFLT)); + if (!ooura_init(n)) + return; + buf[0] = fz[0]; + buf[1] = fz[nover2]; + for (i = 1, fp1 = fz+1, fp2 = fz+(n-1), fp3 = buf+2; i < nover2; + i++, fp1++, fp2--, fp3 += 2) + fp3[0] = *fp1, fp3[1] = *fp2; + rdft(n, -1, buf, ooura_bitrev, ooura_costab); + for (i = 0, fp1 = fz, fp3 = buf; i < n; i++, fp1++, fp3++) + fz[i] = 2*buf[i]; +} + +/****************** end Pd-specific prologue ***********************/ +/* +Fast Fourier/Cosine/Sine Transform + dimension :one + data length :power of 2 + decimation :frequency + radix :split-radix + data :inplace + table :use +functions + cdft: Complex Discrete Fourier Transform + rdft: Real Discrete Fourier Transform + ddct: Discrete Cosine Transform + ddst: Discrete Sine Transform + dfct: Cosine Transform of RDFT (Real Symmetric DFT) + dfst: Sine Transform of RDFT (Real Anti-symmetric DFT) +function prototypes + void cdft(int, int, double *, int *, double *); + void rdft(int, int, double *, int *, double *); + void ddct(int, int, double *, int *, double *); + void ddst(int, int, double *, int *, double *); + void dfct(int, double *, double *, int *, double *); + void dfst(int, double *, double *, int *, double *); +macro definitions + USE_CDFT_PTHREADS : default=not defined + CDFT_THREADS_BEGIN_N : must be >= 512, default=8192 + CDFT_4THREADS_BEGIN_N : must be >= 512, default=65536 + USE_CDFT_WINTHREADS : default=not defined + CDFT_THREADS_BEGIN_N : must be >= 512, default=32768 + CDFT_4THREADS_BEGIN_N : must be >= 512, default=524288 + + +-------- Complex DFT (Discrete Fourier Transform) -------- + [definition] + <case1> + X[k] = sum_j=0^n-1 x[j]*exp(2*pi*i*j*k/n), 0<=k<n + <case2> + X[k] = sum_j=0^n-1 x[j]*exp(-2*pi*i*j*k/n), 0<=k<n + (notes: sum_j=0^n-1 is a summation from j=0 to n-1) + [usage] + <case1> + ip[0] = 0; // first time only + cdft(2*n, 1, a, ip, w); + <case2> + ip[0] = 0; // first time only + cdft(2*n, -1, a, ip, w); + [parameters] + 2*n :data length (int) + n >= 1, n = power of 2 + a[0...2*n-1] :input/output data (double *) + input data + a[2*j] = Re(x[j]), + a[2*j+1] = Im(x[j]), 0<=j<n + output data + a[2*k] = Re(X[k]), + a[2*k+1] = Im(X[k]), 0<=k<n @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10496] branches/pd-extended/0.41/pd/src
by eighthave＠users.sourceforge.net 10 Jan '09

10 Jan '09

Revision: 10496 http://pure-data.svn.sourceforge.net/pure-data/?rev=10496&view=rev Author: eighthave Date: 2009-01-10 02:18:04 +0000 (Sat, 10 Jan 2009) Log Message: ----------- checked all merges of files that were modified in branches/pd-extended/v0-40 but had no conflicts with the 0.41-4 merge. Looks like this should all merge cleanly with no problems. Modified Paths: -------------- branches/pd-extended/0.41/pd/src/g_array.c branches/pd-extended/0.41/pd/src/g_editor.c branches/pd-extended/0.41/pd/src/g_io.c branches/pd-extended/0.41/pd/src/g_readwrite.c branches/pd-extended/0.41/pd/src/g_scalar.c branches/pd-extended/0.41/pd/src/g_text.c branches/pd-extended/0.41/pd/src/m_binbuf.c branches/pd-extended/0.41/pd/src/m_class.c branches/pd-extended/0.41/pd/src/m_glob.c branches/pd-extended/0.41/pd/src/m_sched.c branches/pd-extended/0.41/pd/src/s_audio.c branches/pd-extended/0.41/pd/src/s_loader.c branches/pd-extended/0.41/pd/src/s_midi.c branches/pd-extended/0.41/pd/src/s_midi_alsa.c branches/pd-extended/0.41/pd/src/s_midi_pm.c branches/pd-extended/0.41/pd/src/s_print.c branches/pd-extended/0.41/pd/src/t_tkcmd.c branches/pd-extended/0.41/pd/src/x_arithmetic.c branches/pd-extended/0.41/pd/src/x_connective.c branches/pd-extended/0.41/pd/src/x_list.c branches/pd-extended/0.41/pd/src/x_midi.c branches/pd-extended/0.41/pd/src/x_misc.c branches/pd-extended/0.41/pd/src/x_qlist.c Modified: branches/pd-extended/0.41/pd/src/g_array.c =================================================================== --- branches/pd-extended/0.41/pd/src/g_array.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/g_array.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -395,7 +395,7 @@ int flags = fflags; int saveit = ((flags & 1) != 0); int style = ((flags & 6) >> 1); - float stylewas = template_getfloat( + t_float stylewas = template_getfloat( template_findbyname(x->x_scalar->sc_template), gensym("style"), x->x_scalar->sc_vec, 1); if (deleteit != 0) @@ -450,7 +450,7 @@ else if (style != stylewas) garray_fittograph(x, size, style); template_setfloat(scalartemplate, gensym("style"), - x->x_scalar->sc_vec, (float)style, 0); + x->x_scalar->sc_vec, (t_float)style, 0); garray_setsaveit(x, (saveit != 0)); garray_redraw(x); @@ -462,7 +462,7 @@ void garray_arrayviewlist_new(t_garray *x) { int i, xonset=0, yonset=0, type=0, elemsize=0; - float yval; + t_float yval; char cmdbuf[200]; t_symbol *arraytype; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); @@ -480,7 +480,7 @@ gfxstub_new(&x->x_gobj.g_pd, x, cmdbuf); for (i = 0; i < ARRAYPAGESIZE && i < a->a_n; i++) { - yval = *(float *)(a->a_vec + + yval = *(t_float *)(a->a_vec + elemsize * i + yonset); sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->x_realname->s_name, @@ -495,7 +495,7 @@ t_float fTopItem) { int i, xonset=0, yonset=0, type=0, elemsize=0, topItem; - float yval; + t_float yval; char cmdbuf[200]; t_symbol *arraytype; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); @@ -526,7 +526,7 @@ (i < (page + 1) * ARRAYPAGESIZE && i < a->a_n); i++) { - yval = *(float *)(a->a_vec + \ + yval = *(t_float *)(a->a_vec + \ elemsize * i + yonset); sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n", x->x_realname->s_name, @@ -577,23 +577,23 @@ /* routine to get screen coordinates of a point in an array */ void array_getcoordinate(t_glist *glist, char *elem, int xonset, int yonset, int wonset, int indx, - float basex, float basey, float xinc, + t_float basex, t_float basey, t_float xinc, t_fielddesc *xfielddesc, t_fielddesc *yfielddesc, t_fielddesc *wfielddesc, - float *xp, float *yp, float *wp) + t_float *xp, t_float *yp, t_float *wp) { - float xval, yval, ypix, wpix; + t_float xval, yval, ypix, wpix; if (xonset >= 0) - xval = *(float *)(elem + xonset); + xval = *(t_float *)(elem + xonset); else xval = indx * xinc; if (yonset >= 0) - yval = *(float *)(elem + yonset); + yval = *(t_float *)(elem + yonset); else yval = 0; ypix = glist_ytopixels(glist, basey + fielddesc_cvttocoord(yfielddesc, yval)); if (wonset >= 0) { /* found "w" field which controls linewidth. */ - float wval = *(float *)(elem + wonset); + t_float wval = *(t_float *)(elem + wonset); wpix = glist_ytopixels(glist, basey + fielddesc_cvttocoord(yfielddesc, yval) + fielddesc_cvttocoord(wfielddesc, wval)) - ypix; @@ -607,8 +607,8 @@ *wp = wpix; } -static float array_motion_xcumulative; -static float array_motion_ycumulative; +static t_float array_motion_xcumulative; +static t_float array_motion_ycumulative; static t_fielddesc *array_motion_xfield; static t_fielddesc *array_motion_yfield; static t_glist *array_motion_glist; @@ -619,9 +619,9 @@ static int array_motion_npoints; static int array_motion_elemsize; static int array_motion_altkey; -static float array_motion_initx; -static float array_motion_xperpix; -static float array_motion_yperpix; +static t_float array_motion_initx; +static t_float array_motion_xperpix; +static t_float array_motion_yperpix; static int array_motion_lastx; static int array_motion_fatten; @@ -640,9 +640,9 @@ { t_word *thisword = (t_word *)(((char *)array_motion_wp) + i * array_motion_elemsize); - float xwas = fielddesc_getcoord(array_motion_xfield, + t_float xwas = fielddesc_getcoord(array_motion_xfield, array_motion_template, thisword, 1); - float ywas = (array_motion_yfield ? + t_float ywas = (array_motion_yfield ? fielddesc_getcoord(array_motion_yfield, array_motion_template, thisword, 1) : 0); fielddesc_setcoord(array_motion_xfield, @@ -653,7 +653,7 @@ { if (i == 0) { - float newy = ywas + dy * array_motion_yperpix; + t_float newy = ywas + dy * array_motion_yperpix; if (newy < 0) newy = 0; fielddesc_setcoord(array_motion_yfield, @@ -674,13 +674,13 @@ /* a y-only plot. */ int thisx = array_motion_initx + array_motion_xcumulative + 0.5, x2; int increment, i, nchange; - float newy = array_motion_ycumulative, + t_float newy = array_motion_ycumulative, oldy = fielddesc_getcoord(array_motion_yfield, array_motion_template, (t_word *)(((char *)array_motion_wp) + array_motion_elemsize * array_motion_lastx), 1); - float ydiff = newy - oldy; + t_float ydiff = newy - oldy; if (thisx < 0) thisx = 0; else if (thisx >= array_motion_npoints) thisx = array_motion_npoints - 1; @@ -706,7 +706,7 @@ int scalar_doclick(t_word *data, t_template *template, t_scalar *sc, t_array *ap, struct _glist *owner, - float xloc, float yloc, int xpix, int ypix, + t_float xloc, t_float yloc, int xpix, int ypix, int shift, int alt, int dbl, int doit); /* try clicking on an element of the array as a scalar (if clicking @@ -714,14 +714,14 @@ static int array_doclick_element(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, t_symbol *elemtemplatesym, - float linewidth, float xloc, float xinc, float yloc, + t_float linewidth, t_float xloc, t_float xinc, t_float yloc, t_fielddesc *xfield, t_fielddesc *yfield, t_fielddesc *wfield, int xpix, int ypix, int shift, int alt, int dbl, int doit) { t_canvas *elemtemplatecanvas; t_template *elemtemplate; int elemsize, yonset, wonset, xonset, i, incr, hit; - float xsum; + t_float xsum; if (elemtemplatesym == &s_float) return (0); @@ -735,13 +735,13 @@ else incr = array->a_n / 300; for (i = 0, xsum = 0; i < array->a_n; i += incr) { - float usexloc, useyloc; + t_float usexloc, useyloc; if (xonset >= 0) usexloc = xloc + fielddesc_cvttocoord(xfield, - *(float *)(((char *)(array->a_vec) + elemsize * i) + xonset)); + *(t_float *)(((char *)(array->a_vec) + elemsize * i) + xonset)); else usexloc = xloc + xsum, xsum += xinc; useyloc = yloc + (yonset >= 0 ? fielddesc_cvttocoord(yfield, - *(float *)(((char *)(array->a_vec) + elemsize * i) + yonset)) : 0); + *(t_float *)(((char *)(array->a_vec) + elemsize * i) + yonset)) : 0); if (hit = scalar_doclick( (t_word *)((char *)(array->a_vec) + i * elemsize), @@ -757,7 +757,7 @@ they can be static (look in g_canvas.h for candidates). */ int array_doclick(t_array *array, t_glist *glist, t_scalar *sc, t_array *ap, t_symbol *elemtemplatesym, - float linewidth, float xloc, float xinc, float yloc, float scalarvis, + t_float linewidth, t_float xloc, t_float xinc, t_float yloc, t_float scalarvis, t_fielddesc *xfield, t_fielddesc *yfield, t_fielddesc *wfield, int xpix, int ypix, int shift, int alt, int dbl, int doit) { @@ -769,12 +769,12 @@ &elemtemplate, &elemsize, xfield, yfield, wfield, &xonset, &yonset, &wonset)) { - float best = 100; + t_float best = 100; /* if it has more than 2000 points, just check 1000 of them. */ int incr = (array->a_n <= 2000 ? 1 : array->a_n / 1000); for (i = 0; i < array->a_n; i += incr) { - float pxpix, pypix, pwpix, dx, dy; + t_float pxpix, pypix, pwpix, dx, dy; array_getcoordinate(glist, (char *)(array->a_vec) + i * elemsize, xonset, yonset, wonset, i, xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); @@ -812,7 +812,7 @@ best += 0.001; /* add truncation error margin */ for (i = 0; i < array->a_n; i += incr) { - float pxpix, pypix, pwpix, dx, dy, dy2, dy3; + t_float pxpix, pypix, pwpix, dx, dy, dy2, dy3; array_getcoordinate(glist, (char *)(array->a_vec) + i * elemsize, xonset, yonset, wonset, i, xloc, yloc, xinc, xfield, yfield, wfield, &pxpix, &pypix, &pwpix); @@ -905,7 +905,7 @@ array_motion_ycumulative = fielddesc_getcoord(yfield, array_motion_template, (t_word *)(elem + i * elemsize), 1); - /* *(float *)((elem + elemsize * i) + yonset); */ + /* *(t_float *)((elem + elemsize * i) + yonset); */ } else { @@ -931,7 +931,7 @@ static void array_getrect(t_array *array, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) { - float x1 = 0x7fffffff, y1 = 0x7fffffff, x2 = -0x7fffffff, y2 = -0x7fffffff; + t_float x1 = 0x7fffffff, y1 = 0x7fffffff, x2 = -0x7fffffff, y2 = -0x7fffffff; t_canvas *elemtemplatecanvas; t_template *elemtemplate; int elemsize, yonset, wonset, xonset, i; @@ -946,7 +946,7 @@ else incr = array->a_n / 300; for (i = 0; i < array->a_n; i += incr) { - float pxpix, pypix, pwpix, dx, dy; + t_float pxpix, pypix, pwpix, dx, dy; array_getcoordinate(glist, (char *)(array->a_vec) + i * elemsize, xonset, yonset, wonset, i, 0, 0, 1, @@ -1053,7 +1053,7 @@ chunk = ARRAYWRITECHUNKSIZE; binbuf_addv(b, "si", gensym("#A"), n2); for (i = 0; i < chunk; i++) - binbuf_addv(b, "f", ((float *)(array->a_vec))[n2+i]); + binbuf_addv(b, "f", ((t_word *)(array->a_vec))[n2+i].w_float); binbuf_addv(b, ";"); n2 += chunk; } @@ -1132,7 +1132,7 @@ /* routine that checks if we're just an array of floats and if so returns the goods */ -int garray_getfloatarray(t_garray *x, int *size, t_float **vec) +int garray_getfloatwords(t_garray *x, int *size, t_word **vec) { int yonset, type, elemsize; t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize); @@ -1147,10 +1147,24 @@ return (0); } *size = garray_npoints(x); - *vec = (float *)garray_vec(x); + *vec = (t_word *)garray_vec(x); return (1); } + /* older, non-64-bit safe version, supplied for older externs */ +int garray_getfloatarray(t_garray *x, int *size, t_float **vec) +{ + if (sizeof(t_word) != sizeof(t_float)) + { + static int warned; + if (!warned) + post( + "warning: extern using garray_getfloatarray() won't work in 64-bit version"); + warned = 1; + } + return (garray_getfloatwords(x, size, (t_word **)vec)); +} + /* set the "saveit" flag */ void garray_setsaveit(t_garray *x, int saveit) { @@ -1168,13 +1182,13 @@ if (!array) error("%s: needs floating-point 'y' field", x->x_realname->s_name); else for (i = 0; i < array->a_n; i++) - *((float *)((char *)array->a_vec + *((t_float *)((char *)array->a_vec + elemsize * i) + yonset) = g; garray_redraw(x); } /* sum of Fourier components; called from routines below */ -static void garray_dofo(t_garray *x, int npoints, float dcval, +static void garray_dofo(t_garray *x, int npoints, t_float dcval, int nsin, t_float *vsin, int sineflag) { double phase, phaseincr, fj; @@ -1201,7 +1215,7 @@ else for (j = 0, fj = 0; j < nsin; j++, fj += phase) sum += vsin[j] * cos(fj); - *((float *)((array->a_vec + elemsize * i)) + yonset) + *((t_float *)((array->a_vec + elemsize * i)) + yonset) = sum; } garray_redraw(x); @@ -1270,7 +1284,7 @@ for (i = 0, maxv = 0; i < array->a_n; i++) { - double v = *((float *)(array->a_vec + elemsize * i) + double v = *((t_float *)(array->a_vec + elemsize * i) + yonset); if (v > maxv) maxv = v; @@ -1281,7 +1295,7 @@ { renormer = f / maxv; for (i = 0; i < array->a_n; i++) - *((float *)(array->a_vec + elemsize * i) + yonset) + *((t_float *)(array->a_vec + elemsize * i) + yonset) *= renormer; } garray_redraw(x); @@ -1319,7 +1333,7 @@ if (argc <= 0) return; } for (i = 0; i < argc; i++) - *((float *)(array->a_vec + elemsize * (i + firstindex)) + yonset) + *((t_float *)(array->a_vec + elemsize * (i + firstindex)) + yonset) = atom_getfloat(argv + i); } garray_redraw(x); @@ -1390,7 +1404,7 @@ } for (i = 0; i < nelem; i++) { - if (!fscanf(fd, "%f", ((float *)(array->a_vec + + if (!fscanf(fd, "%f", ((t_float *)(array->a_vec + elemsize * i) + yonset))) { post("%s: read %d elements into table of size %d", @@ -1399,7 +1413,7 @@ } } while (i < nelem) - *((float *)(array->a_vec + + *((t_float *)(array->a_vec + elemsize * i) + yonset) = 0, i++; fclose(fd); garray_redraw(x); @@ -1427,7 +1441,7 @@ for (i = 0; i < array->a_n; i++) { if (fprintf(fd, "%g\n", - *(float *)(((array->a_vec + sizeof(t_word) * i)) + yonset)) < 1) + *(t_float *)(((array->a_vec + sizeof(t_word) * i)) + yonset)) < 1) { post("%s: write error", filename->s_name); break; Modified: branches/pd-extended/0.41/pd/src/g_editor.c =================================================================== --- branches/pd-extended/0.41/pd/src/g_editor.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/g_editor.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -394,7 +394,7 @@ } void canvas_disconnect(t_canvas *x, - float index1, float outno, float index2, float inno) + t_float index1, t_float outno, t_float index2, t_float inno) { t_linetraverser t; t_outconnect *oc; @@ -802,6 +802,17 @@ && (x1 > *x1p)) *x1p = x1, *y1p = y1, *x2p = x2, *y2p = y2, rval = y; } + /* if there are at least two selected objects, we'd prefer + to find a selected one (never mind which) to the one we got. */ + if (x->gl_editor && x->gl_editor->e_selection && + x->gl_editor->e_selection->sel_next && !glist_isselected(x, y)) + { + t_selection *sel; + for (sel = x->gl_editor->e_selection; sel; sel = sel->sel_next) + if (canvas_hitbox(x, sel->sel_what, xpos, ypos, &x1, &y1, &x2, &y2)) + *x1p = x1, *y1p = y1, *x2p = x2, *y2p = y2, + rval = sel->sel_what; + } return (rval); } @@ -902,7 +913,7 @@ { - float xperpix, yperpix, x1, y1, x2, y2, xpix, ypix, xmargin, ymargin; + t_float xperpix, yperpix, x1, y1, x2, y2, xpix, ypix, xmargin, ymargin; int graphme, redraw = 0; xperpix = atom_getfloatarg(0, argc, argv); @@ -976,7 +987,7 @@ /* called from the gui when a popup menu comes back with "properties," "open," or "help." */ -static void canvas_done_popup(t_canvas *x, float which, float xpos, float ypos) +static void canvas_done_popup(t_canvas *x, t_float which, t_float xpos, t_float ypos) { char pathbuf[FILENAME_MAX], namebuf[FILENAME_MAX]; t_gobj *y; @@ -1215,16 +1226,16 @@ { t_linetraverser t; t_outconnect *oc; - float fx = xpos, fy = ypos; + t_float fx = xpos, fy = ypos; t_glist *glist2 = glist_getcanvas(x); linetraverser_start(&t, glist2); while (oc = linetraverser_next(&t)) { - float lx1 = t.tr_lx1, ly1 = t.tr_ly1, + t_float lx1 = t.tr_lx1, ly1 = t.tr_ly1, lx2 = t.tr_lx2, ly2 = t.tr_ly2; - float area = (lx2 - lx1) * (fy - ly1) - + t_float area = (lx2 - lx1) * (fy - ly1) - (ly2 - ly1) * (fx - lx1); - float dsquare = (lx2-lx1) * (lx2-lx1) + (ly2-ly1) * (ly2-ly1); + t_float dsquare = (lx2-lx1) * (lx2-lx1) + (ly2-ly1) * (ly2-ly1); if (area * area >= 50 * dsquare) continue; if ((lx2-lx1) * (fx-lx1) + (ly2-ly1) * (fy-ly1) < 0) continue; if ((lx2-lx1) * (lx2-fx) + (ly2-ly1) * (ly2-fy) < 0) continue; @@ -1520,9 +1531,9 @@ keynum = 0, gotkeysym = gensym("Right"); #endif if (keynumsym->s_thing && down) - pd_float(keynumsym->s_thing, (float)keynum); + pd_float(keynumsym->s_thing, (t_float)keynum); if (keyupsym->s_thing && !down) - pd_float(keyupsym->s_thing, (float)keynum); + pd_float(keyupsym->s_thing, (t_float)keynum); if (keynamesym->s_thing) { t_atom at[2]; @@ -1539,7 +1550,7 @@ if (x->gl_editor->e_grab && x->gl_editor->e_keyfn && keynum) (* x->gl_editor->e_keyfn) - (x->gl_editor->e_grab, (float)keynum); + (x->gl_editor->e_grab, (t_float)keynum); /* if a text editor is open send the key on, as long as it is either "real" (has a key number) or else is an arrow key. */ else if (x->gl_editor->e_textedfor && (keynum @@ -1580,6 +1591,12 @@ else if (!strcmp(gotkeysym->s_name, "Right")) canvas_displaceselection(x, shift ? 10 : 1, 0); } + /* if control key goes up or down, and if we're in edit mode, change + cursor to indicate how the click action changes */ + if (x && keynum == 0 && x->gl_edit && + !strncmp(gotkeysym->s_name, "Control", 7)) + canvas_setcursor(x, down ? + CURSOR_RUNMODE_NOTHING :CURSOR_EDITMODE_NOTHING); } void canvas_motion(t_canvas *x, t_floatarg xpos, t_floatarg ypos, @@ -2411,7 +2428,7 @@ static void canvas_font(t_canvas *x, t_floatarg font, t_floatarg resize, t_floatarg whichresize) { - float realresize, realresx = 1, realresy = 1; + t_float realresize, realresx = 1, realresy = 1; t_canvas *x2 = canvas_getrootfor(x); if (!resize) realresize = 1; else Modified: branches/pd-extended/0.41/pd/src/g_io.c =================================================================== --- branches/pd-extended/0.41/pd/src/g_io.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/g_io.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -295,10 +295,10 @@ t_canvas *x_canvas; t_outlet *x_parentoutlet; int x_bufsize; - t_float *x_buf; /* signal buffer; zero if not a signal */ - t_float *x_endbuf; - t_float *x_empty; /* next to read out of buffer in epilog code */ - t_float *x_write; /* next to write in to buffer */ + t_sample *x_buf; /* signal buffer; zero if not a signal */ + t_sample *x_endbuf; + t_sample *x_empty; /* next to read out of buffer in epilog code */ + t_sample *x_write; /* next to write in to buffer */ int x_hop; /* hopsize */ /* vice versa from the inlet, if we don't block, this holds the parent's outlet signal, valid between the prolog and the dsp setup @@ -376,7 +376,7 @@ t_voutlet *x = (t_voutlet *)(w[1]); t_float *in = (t_float *)(w[2]); int n = (int)(w[3]); - t_float *out = x->x_write, *outwas = out; + t_sample *out = x->x_write, *outwas = out; #if 0 if (tot < 5) post("-in %lx out %lx n %d", in, out, n); if (tot < 5) post("-buf %lx endbuf %lx", x->x_buf, x->x_endbuf); @@ -396,10 +396,10 @@ static t_int *voutlet_doepilog(t_int *w) { t_voutlet *x = (t_voutlet *)(w[1]); - t_float *out = (t_float *)(w[2]); + t_sample *out = (t_sample *)(w[2]); int n = (int)(w[3]); - t_float *in = x->x_empty; + t_sample *in = x->x_empty; if (x->x_updown.downsample != x->x_updown.upsample) out = x->x_updown.s_vec; @@ -416,8 +416,8 @@ { t_voutlet *x = (t_voutlet *)(w[1]); int n = (int)(w[2]); - t_float *in = x->x_empty; - t_float *out = x->x_updown.s_vec; + t_sample *in = x->x_empty; + t_sample *out = x->x_updown.s_vec; #if 0 if (tot < 5) post("outlet in %lx out %lx n %lx", in, out, n), tot++; @@ -510,9 +510,9 @@ if (bufsize < myvecsize) bufsize = myvecsize; if (bufsize != (oldbufsize = x->x_bufsize)) { - t_float *buf = x->x_buf; + t_sample *buf = x->x_buf; t_freebytes(buf, oldbufsize * sizeof(*buf)); - buf = (t_float *)t_getbytes(bufsize * sizeof(*buf)); + buf = (t_sample *)t_getbytes(bufsize * sizeof(*buf)); memset((char *)buf, 0, bufsize * sizeof(*buf)); x->x_bufsize = bufsize; x->x_endbuf = buf + bufsize; @@ -562,7 +562,7 @@ x->x_parentoutlet = canvas_addoutlet(x->x_canvas, &x->x_obj.ob_pd, &s_signal); inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - x->x_endbuf = x->x_buf = (t_float *)getbytes(0); + x->x_endbuf = x->x_buf = (t_sample *)getbytes(0); x->x_bufsize = 0; resample_init(&x->x_updown); Modified: branches/pd-extended/0.41/pd/src/g_readwrite.c =================================================================== --- branches/pd-extended/0.41/pd/src/g_readwrite.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/g_readwrite.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -258,8 +258,7 @@ else if (*format->s_name) error("qlist_read: unknown flag: %s", format->s_name); - if (binbuf_read_via_path(b, filename->s_name, - canvas_getdir(canvas)->s_name, cr)) + if (binbuf_read_via_canvas(b, filename->s_name, canvas, cr)) { pd_error(x, "read failed"); binbuf_free(b); @@ -620,15 +619,15 @@ binbuf_addv(b, "ssfffffffff;", gensym("#X"), gensym("coords"), x->gl_x1, x->gl_y1, x->gl_x2, x->gl_y2, - (float)x->gl_pixwidth, (float)x->gl_pixheight, - (float)((x->gl_hidetext)?2.:1.), - (float)x->gl_xmargin, (float)x->gl_ymargin); + (t_float)x->gl_pixwidth, (t_float)x->gl_pixheight, + (t_float)((x->gl_hidetext)?2.:1.), + (t_float)x->gl_xmargin, (t_float)x->gl_ymargin); /* otherwise write in 0.38-compatible form */ else binbuf_addv(b, "ssfffffff;", gensym("#X"), gensym("coords"), x->gl_x1, x->gl_y1, x->gl_x2, x->gl_y2, - (float)x->gl_pixwidth, (float)x->gl_pixheight, - (float)x->gl_isgraph); + (t_float)x->gl_pixwidth, (t_float)x->gl_pixheight, + (t_float)x->gl_isgraph); } } Modified: branches/pd-extended/0.41/pd/src/g_scalar.c =================================================================== --- branches/pd-extended/0.41/pd/src/g_scalar.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/g_scalar.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -49,7 +49,7 @@ int type = datatypes->ds_type; if (type == DT_FLOAT) { - float f; + t_float f; if (argc) { f = atom_getfloat(argv); @@ -145,7 +145,7 @@ } /* -------------------- widget behavior for scalar ------------ */ -void scalar_getbasexy(t_scalar *x, float *basex, float *basey) +void scalar_getbasexy(t_scalar *x, t_float *basex, t_float *basey) { t_template *template = template_findbyname(x->sc_template); *basex = template_getfloat(template, gensym("x"), x->sc_vec, 0); @@ -160,7 +160,7 @@ t_canvas *templatecanvas = template_findcanvas(template); int x1 = 0x7fffffff, x2 = -0x7fffffff, y1 = 0x7fffffff, y2 = -0x7fffffff; t_gobj *y; - float basex, basey; + t_float basex, basey; scalar_getbasexy(x, &basex, &basey); /* if someone deleted the template canvas, we're just a point */ if (!templatecanvas) @@ -195,45 +195,50 @@ *yp2 = y2; } -static void scalar_select(t_gobj *z, t_glist *owner, int state) +static void scalar_drawselectrect(t_scalar *x, t_glist *glist, int state) { - t_scalar *x = (t_scalar *)z; - t_symbol *templatesym = x->sc_template; - t_template *tmpl; - t_atom at; - t_gpointer gp; - gpointer_init(&gp); - gpointer_setglist(&gp, owner, x); - SETPOINTER(&at, &gp); if (state) { int x1, y1, x2, y2; - if (tmpl = template_findbyname(templatesym)) - template_notify(tmpl, gensym("select"), 1, &at); - gpointer_unset(&gp); - - scalar_getrect(z, owner, &x1, &y1, &x2, &y2); + + scalar_getrect(&x->sc_gobj, glist, &x1, &y1, &x2, &y2); x1--; x2++; y1--; y2++; sys_vgui(".x%lx.c create line %d %d %d %d %d %d %d %d %d %d \ -width 0 -fill $select_color -tags select%lx\n", - glist_getcanvas(owner), x1, y1, x1, y2, x2, y2, x2, y1, x1, y1, + glist_getcanvas(glist), x1, y1, x1, y2, x2, y2, x2, y1, x1, y1, x); } else { - sys_vgui(".x%lx.c delete select%lx\n", glist_getcanvas(owner), x); - if (tmpl = template_findbyname(templatesym)) - template_notify(tmpl, gensym("deselect"), 1, &at); - + sys_vgui(".x%lx.c delete select%lx\n", glist_getcanvas(glist), x); } } +static void scalar_select(t_gobj *z, t_glist *owner, int state) +{ + t_scalar *x = (t_scalar *)z; + t_template *tmpl; + t_symbol *templatesym = x->sc_template; + t_atom at; + t_gpointer gp; + gpointer_init(&gp); + gpointer_setglist(&gp, owner, x); + SETPOINTER(&at, &gp); + if (tmpl = template_findbyname(templatesym)) + template_notify(tmpl, (state ? gensym("select") : gensym("deselect")), + 1, &at); + gpointer_unset(&gp); + scalar_drawselectrect(x, owner, state); +} + static void scalar_displace(t_gobj *z, t_glist *glist, int dx, int dy) { t_scalar *x = (t_scalar *)z; t_symbol *templatesym = x->sc_template; t_template *template = template_findbyname(templatesym); t_symbol *zz; + t_atom at[3]; + t_gpointer gp; int xonset, yonset, xtype, ytype, gotx, goty; if (!template) { @@ -252,12 +257,13 @@ if (goty) *(t_float *)(((char *)(x->sc_vec)) + yonset) += dy * (glist_pixelstoy(glist, 1) - glist_pixelstoy(glist, 0)); + gpointer_init(&gp); + gpointer_setglist(&gp, glist, x); + SETPOINTER(&at[0], &gp); + SETFLOAT(&at[1], (t_float)dx); + SETFLOAT(&at[2], (t_float)dy); + template_notify(template, gensym("displace"), 2, at); scalar_redraw(x, glist); - if (glist_isselected(glist, z)) - { - scalar_select(z, glist, 0); - scalar_select(z, glist, 1); - } } static void scalar_activate(t_gobj *z, t_glist *owner, int state) @@ -277,7 +283,7 @@ t_template *template = template_findbyname(x->sc_template); t_canvas *templatecanvas = template_findcanvas(template); t_gobj *y; - float basex, basey; + t_float basex, basey; scalar_getbasexy(x, &basex, &basey); /* if we don't know how to draw it, make a small rectangle */ if (!templatecanvas) @@ -299,6 +305,11 @@ if (!wb) continue; (*wb->w_parentvisfn)(y, owner, x->sc_vec, template, basex, basey, vis); } + if (glist_isselected(owner, &x->sc_gobj)) + { + scalar_drawselectrect(x, owner, 0); + scalar_drawselectrect(x, owner, 1); + } sys_unqueuegui(x); } @@ -316,14 +327,14 @@ int scalar_doclick(t_word *data, t_template *template, t_scalar *sc, t_array *ap, struct _glist *owner, - float xloc, float yloc, int xpix, int ypix, + t_float xloc, t_float yloc, int xpix, int ypix, int shift, int alt, int dbl, int doit) { int hit = 0; t_canvas *templatecanvas = template_findcanvas(template); t_gobj *y; - float basex = template_getfloat(template, gensym("x"), data, 0); - float basey = template_getfloat(template, gensym("y"), data, 0); + t_float basex = template_getfloat(template, gensym("x"), data, 0); + t_float basey = template_getfloat(template, gensym("y"), data, 0); for (y = templatecanvas->gl_list; y; y = y->g_next) { t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); Modified: branches/pd-extended/0.41/pd/src/g_text.c =================================================================== --- branches/pd-extended/0.41/pd/src/g_text.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/g_text.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -943,7 +943,7 @@ { t_text *x = (t_text *)z; int width, height, iscomment = (x->te_type == T_TEXT); - float x1, y1, x2, y2; + t_float x1, y1, x2, y2; /* for number boxes, we know width and height a priori, and should report them here so that graphs can get swelled to fit. */ Modified: branches/pd-extended/0.41/pd/src/m_binbuf.c =================================================================== --- branches/pd-extended/0.41/pd/src/m_binbuf.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/m_binbuf.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -391,9 +391,6 @@ x->b_n = newsize; } - -#define MSTACKSIZE 2048 - void binbuf_print(t_binbuf *x) { int i, startedpost = 0, newline = 1; @@ -535,13 +532,70 @@ return (gensym(buf2)); } +#define SMALLMSG 5 +#define HUGEMSG 1000 +#ifdef MSW +#include <malloc.h> +#else +#include <alloca.h> +#endif +#if HAVE_ALLOCA +#define ATOMS_ALLOCA(x, n) ((x) = (t_atom *)((n) < HUGEMSG ? \ + alloca((n) * sizeof(t_atom)) : getbytes((n) * sizeof(t_atom)))) +#define ATOMS_FREEA(x, n) ( \ + ((n) < HUGEMSG || (freebytes((x), (n) * sizeof(t_atom)), 0))) +#else +#define ATOMS_ALLOCA(x, n) ((x) = (t_atom *)getbytes((n) * sizeof(t_atom))) +#define ATOMS_FREEA(x, n) (freebytes((x), (n) * sizeof(t_atom))) +#endif + void binbuf_eval(t_binbuf *x, t_pd *target, int argc, t_atom *argv) { - static t_atom mstack[MSTACKSIZE], *msp = mstack, *ems = mstack+MSTACKSIZE; - t_atom *stackwas = msp; + t_atom smallstack[SMALLMSG], *mstack, *msp; t_atom *at = x->b_vec; int ac = x->b_n; - int nargs; + int nargs, maxnargs = 0; + if (ac <= SMALLMSG) + mstack = smallstack; + else + { +#if 1 + /* count number of args in biggest message. The wierd + treatment of "pd_objectmaker" is because when the message + goes out to objectmaker, commas and semis are passed + on as regular args (see below). We're tacitly assuming here + that the pd_objectmaker target can't come up via a named + destination in the message, only because the original "target" + points there. */ + if (target == &pd_objectmaker) + maxnargs = ac; + else + { + int i, j = (target ? 0 : -1); + for (i = 0; i < ac; i++) + { + if (at[i].a_type == A_SEMI) + j = -1; + else if (at[i].a_type == A_COMMA) + j = 0; + else if (++j > maxnargs) + maxnargs = j; + } + } + if (maxnargs <= SMALLMSG) + mstack = smallstack; + else ATOMS_ALLOCA(mstack, maxnargs); +#else + /* just pessimistically allocate enough to hold everything + at once. This turned out to run slower in a simple benchmark + I tried, perhaps because the extra memory allocation + hurt the cache hit rate. */ + maxnargs = ac; + ATOMS_ALLOCA(mstack, maxnargs); +#endif + + } + msp = mstack; while (1) { t_pd *nexttarget; @@ -601,11 +655,6 @@ { t_symbol *s9; if (!ac) goto gotmess; - if (msp >= ems) - { - error("message stack overflow"); - goto broken; - } switch (at->a_type) { case A_SEMI: @@ -671,31 +720,30 @@ gotmess: if (nargs) { - switch (stackwas->a_type) + switch (mstack->a_type) { case A_SYMBOL: - typedmess(target, stackwas->a_w.w_symbol, nargs-1, stackwas+1); + typedmess(target, mstack->a_w.w_symbol, nargs-1, mstack+1); break; case A_BLOB: /* MP 20070106 blob type */ if (nargs == 1) pd_blob(target, stackwas->a_w.w_blob); else pd_list(target, 0, nargs, stackwas); break; case A_FLOAT: - if (nargs == 1) pd_float(target, stackwas->a_w.w_float); - else pd_list(target, 0, nargs, stackwas); + if (nargs == 1) pd_float(target, mstack->a_w.w_float); + else pd_list(target, 0, nargs, mstack); break; } } - msp = stackwas; + msp = mstack; if (!ac) break; target = nexttarget; at++; ac--; } - - return; -broken: - msp = stackwas; +broken: + if (maxnargs > SMALLMSG) + ATOMS_FREEA(mstack, maxnargs); } static int binbuf_doopen(char *s, int mode) @@ -967,7 +1015,7 @@ atom_getfloatarg(2, natom, nextmess), atom_getfloatarg(5, natom, nextmess) - atom_getfloatarg(3, natom, nextmess), - (float)sys_defaultfont); + (t_float)sys_defaultfont); } } if (!strcmp(first, "#P")) @@ -1050,7 +1098,7 @@ } else if (!strcmp(second, "slider")) { - float inc = atom_getfloatarg(7, natom, nextmess); + t_float inc = atom_getfloatarg(7, natom, nextmess); if (inc <= 0) inc = 1; binbuf_addv(newb, "ssffsffffffsssfffffffff;", Modified: branches/pd-extended/0.41/pd/src/m_class.c =================================================================== --- branches/pd-extended/0.41/pd/src/m_class.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/m_class.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -422,7 +422,7 @@ { int offset = (*x)->c_floatsignalin; if (offset > 0) - *(t_sample *)(((char *)x) + offset) = f; + *(t_float *)(((char *)x) + offset) = f; else pd_error(x, "%s: float unexpected for signal input", (*x)->c_name->s_name); @@ -481,12 +481,12 @@ static t_symbol *symhash[HASHSIZE]; -t_symbol *dogensym(char *s, t_symbol *oldsym) +t_symbol *dogensym(const char *s, t_symbol *oldsym) { t_symbol **sym1, *sym2; unsigned int hash1 = 0, hash2 = 0; int length = 0; - char *s2 = s; + const char *s2 = s; while (*s2) { hash1 += *s2; @@ -513,7 +513,7 @@ return (sym2); } -t_symbol *gensym(char *s) +t_symbol *gensym(const char *s) { return(dogensym(s, 0)); } Modified: branches/pd-extended/0.41/pd/src/m_glob.c =================================================================== --- branches/pd-extended/0.41/pd/src/m_glob.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/m_glob.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -49,6 +49,12 @@ } #endif +static void glob_version(t_pd *dummy, float f) +{ + if (f > 0) + error("file format newer than this version of Pd (trying anyway...)"); +} + void max_default(t_pd *x, t_symbol *s, int argc, t_atom *argv) { int i; @@ -113,6 +119,8 @@ class_addmethod(glob_pdobject, (t_method)glob_ping, gensym("ping"), 0); class_addmethod(glob_pdobject, (t_method)glob_savepreferences, gensym("save-preferences"), 0); + class_addmethod(glob_pdobject, (t_method)glob_version, + gensym("version"), A_FLOAT, 0); #ifdef UNIX class_addmethod(glob_pdobject, (t_method)glob_watchdog, gensym("watchdog"), 0); Modified: branches/pd-extended/0.41/pd/src/m_sched.c =================================================================== --- branches/pd-extended/0.41/pd/src/m_sched.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/m_sched.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -9,6 +9,9 @@ #include "m_pd.h" #include "m_imp.h" #include "s_stuff.h" +#ifdef MSW +#include <windows.h> +#endif /* LATER consider making this variable. It's now the LCM of all sample rates we expect to see: 32000, 44100, 48000, 88200, 96000. */ @@ -17,7 +20,8 @@ #define THREAD_LOCKING #include "pthread.h" - +#define SYS_QUIT_QUIT 1 +#define SYS_QUIT_RESTART 2 static int sys_quit; double sys_time; static double sys_time_per_msec = TIMEUNITPERSEC / 1000.; @@ -26,6 +30,11 @@ int sys_usecsincelastsleep(void); int sys_sleepgrain; +void sched_reopenmeplease(void) /* request from s_audio for deferred reopen */ +{ + sys_quit = SYS_QUIT_RESTART; +} + typedef void (*t_clockmethod)(void *client); struct _clock @@ -284,7 +293,7 @@ } if (sched_meterson) { - float inmax, outmax; + t_sample inmax, outmax; sys_getmeters(&inmax, &outmax); indb = 0.5 + rmstodb(inmax); outdb = 0.5 + rmstodb(outmax); @@ -309,7 +318,7 @@ sched_diddsp + (int)(sys_dacsr /(double)sys_schedblocksize); } -void glob_meters(void *dummy, float f) +void glob_meters(void *dummy, t_float f) { if (f == 0) sys_getmeters(0, 0); @@ -328,18 +337,26 @@ void dsp_tick(void); -static int sched_usedacs = 1; +static int sched_useaudio = SCHED_AUDIO_POLL; static double sched_referencerealtime, sched_referencelogicaltime; double sys_time_per_dsp_tick; -void sched_set_using_dacs(int flag) +void sched_set_using_audio(int flag) { - sched_usedacs = flag; - if (!flag) + sched_useaudio = flag; + if (flag == SCHED_AUDIO_NONE) { sched_referencerealtime = sys_getrealtime(); sched_referencelogicaltime = clock_getlogicaltime(); } + if (flag == SCHED_AUDIO_CALLBACK && + sched_useaudio != SCHED_AUDIO_CALLBACK) + sys_quit = SYS_QUIT_RESTART; + if (flag != SCHED_AUDIO_CALLBACK && + sched_useaudio == SCHED_AUDIO_CALLBACK) + post("sorry, can't turn off callbacks yet; restart Pd"); + /* not right yet! */ + sys_time_per_dsp_tick = (TIMEUNITPERSEC) * ((double)sys_schedblocksize) / sys_dacsr; } @@ -387,7 +404,7 @@ will now sleep. */ int (*sys_idlehook)(void); -int m_scheduler( void) +static void m_pollingscheduler( void) { int idlecount = 0; sys_time_per_dsp_tick = (TIMEUNITPERSEC) * @@ -398,7 +415,7 @@ #endif sys_clearhist(); - if (sys_sleepgrain < 1000) + if (sys_sleepgrain < 100) sys_sleepgrain = sys_schedadvance/4; if (sys_sleepgrain < 100) sys_sleepgrain = 100; @@ -412,7 +429,7 @@ sys_addhist(0); waitfortick: - if (sched_usedacs) + if (sched_useaudio != SCHED_AUDIO_NONE) { #ifdef THREAD_LOCKING /* T.Grill - send_dacs may sleep -> @@ -435,6 +452,11 @@ if (!(idlecount & 31)) { static double idletime; + if (sched_useaudio != SCHED_AUDIO_POLL) + { + bug("m_pollingscheduler\n"); + return; + } /* on 32nd idle, start a clock watch; every 32 ensuing idles, check it */ if (idlecount == 32) @@ -443,7 +465,7 @@ { post("audio I/O stuck... closing audio\n"); sys_close_audio(); - sched_set_using_dacs(0); + sched_set_using_audio(SCHED_AUDIO_NONE); goto waitfortick; } } @@ -477,7 +499,6 @@ { sched_pollformeters(); sys_reportidle(); - #ifdef THREAD_LOCKING sys_unlock(); /* unlock while we idle */ #endif @@ -491,21 +512,62 @@ #ifdef THREAD_LOCKING sys_lock(); #endif - sys_addhist(5); sched_didnothing++; - } } #ifdef THREAD_LOCKING sys_unlock(); #endif +} +void sched_audio_callbackfn(void) +{ + sys_setmiditimediff(0, 1e-6 * sys_schedadvance); + sys_addhist(1); + sched_tick(sys_time + sys_time_per_dsp_tick); + sys_addhist(2); + sys_pollmidiqueue(); + sys_addhist(3); + sys_pollgui(); + sys_addhist(5); + sched_pollformeters(); + sys_addhist(0); +} + +static void m_callbackscheduler(void) +{ + sys_initmidiqueue(); + while (!sys_quit) + { +#ifdef MSW + Sleep(1000); +#else + sleep(1); +#endif + if (sys_idlehook) + sys_idlehook(); + } +} + +int m_mainloop(void) +{ + while (sys_quit != SYS_QUIT_QUIT) + { + if (sched_useaudio == SCHED_AUDIO_CALLBACK) + m_callbackscheduler(); + else m_pollingscheduler(); + if (sys_quit == SYS_QUIT_RESTART) + { + sys_quit = 0; + sys_close_audio(); + sys_reopen_audio(); + } + } return (0); } - /* ------------ thread locking ------------------- */ #ifdef THREAD_LOCKING @@ -536,5 +598,5 @@ void sys_exit(void) { - sys_quit = 1; + sys_quit = SYS_QUIT_QUIT; } Modified: branches/pd-extended/0.41/pd/src/s_audio.c =================================================================== --- branches/pd-extended/0.41/pd/src/s_audio.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/s_audio.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -32,7 +32,7 @@ #define DEVDESCSIZE 80 static void audio_getdevs(char *indevlist, int *nindevs, - char *outdevlist, int *noutdevs, int *canmulti, + char *outdevlist, int *noutdevs, int *canmulti, int *cancallback, int maxndev, int devdescsize); /* these are set in this file when opening audio, but then may be reduced, @@ -42,14 +42,14 @@ int sys_advance_samples; /* scheduler advance in samples */ int sys_blocksize = 0; /* audio I/O block size in sample frames */ int sys_audioapi = API_DEFAULT; - +int sys_audioapiopened = -1; /* save last API opened for later closing */ static int sys_meters; /* true if we're metering */ -static float sys_inmax; /* max input amplitude */ -static float sys_outmax; /* max output amplitude */ +static t_sample sys_inmax; /* max input amplitude */ +static t_sample sys_outmax; /* max output amplitude */ /* exported variables */ int sys_schedadvance; /* scheduler advance in microseconds */ -float sys_dacsr; +t_float sys_dacsr; t_sample *sys_soundout; t_sample *sys_soundin; @@ -68,7 +68,13 @@ static int audio_audiochoutdev[MAXAUDIOOUTDEV]; static int audio_rate; static int audio_advance; +static int audio_callback; +static int audio_callback_is_open; /* reflects true actual state */ +static int audio_nextinchans, audio_nextoutchans; +void sched_audio_callbackfn(void); +void sched_reopenmeplease(void); + static int audio_isopen(void) { return (audio_state && @@ -79,7 +85,7 @@ void sys_get_audio_params( int *pnaudioindev, int *paudioindev, int *chindev, int *pnaudiooutdev, int *paudiooutdev, int *choutdev, - int *prate, int *padvance) + int *prate, int *padvance, int *pcallback) { int i; *pnaudioindev = audio_naudioindev; @@ -92,12 +98,13 @@ choutdev[i] = audio_audiochoutdev[i]; *prate = audio_rate; *padvance = audio_advance; + *pcallback = audio_callback; } void sys_save_audio_params( int naudioindev, int *audioindev, int *chindev, int naudiooutdev, int *audiooutdev, int *choutdev, - int rate, int advance) + int rate, int advance, int callback) { int i; audio_naudioindev = naudioindev; @@ -110,6 +117,7 @@ audio_audiochoutdev[i] = choutdev[i]; audio_rate = rate; audio_advance = advance; + audio_callback = callback; } /* init routines for any API which needs to set stuff up before @@ -135,18 +143,18 @@ { int nblk; int inbytes = (chin ? chin : 2) * - (DEFDACBLKSIZE*sizeof(float)); + (DEFDACBLKSIZE*sizeof(t_sample)); int outbytes = (chout ? chout : 2) * - (DEFDACBLKSIZE*sizeof(float)); + (DEFDACBLKSIZE*sizeof(t_sample)); if (sys_soundin) freebytes(sys_soundin, (sys_inchannels? sys_inchannels : 2) * - (DEFDACBLKSIZE*sizeof(float))); + (DEFDACBLKSIZE*sizeof(t_sample))); if (sys_soundout) freebytes(sys_soundout, (sys_outchannels? sys_outchannels : 2) * - (DEFDACBLKSIZE*sizeof(float))); + (DEFDACBLKSIZE*sizeof(t_sample))); sys_inchannels = chin; sys_outchannels = chout; sys_dacsr = sr; @@ -154,10 +162,10 @@ if (sys_advance_samples < 3 * DEFDACBLKSIZE) sys_advance_samples = 3 * DEFDACBLKSIZE; - sys_soundin = (t_float *)getbytes(inbytes); + sys_soundin = (t_sample *)getbytes(inbytes); memset(sys_soundin, 0, inbytes); - sys_soundout = (t_float *)getbytes(outbytes); + sys_soundout = (t_sample *)getbytes(outbytes); memset(sys_soundout, 0, outbytes); if (sys_verbose) @@ -168,14 +176,14 @@ /* ----------------------- public routines ----------------------- */ - /* open audio devices (after cleaning up the specified device and channel - vectors). The audio devices are "zero based" (i.e. "0" means the first - one.) We also save the cleaned-up device specification so that we - can later re-open audio and/or show the settings on a dialog window. */ + /* set audio device settings (after cleaning up the specified device and + channel vectors). The audio devices are "zero based" (i.e. "0" means the + first one.) We can later re-open audio and/or show the settings on a\ + dialog window. */ -void sys_open_audio(int naudioindev, int *audioindev, int nchindev, +void sys_set_audio_settings(int naudioindev, int *audioindev, int nchindev, int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev, - int *choutdev, int rate, int advance, int enable) + int *choutdev, int rate, int advance, int callback) { int i, *ip; int defaultchannels = SYS_DEFAULTCH; @@ -184,17 +192,13 @@ int realinchans[MAXAUDIOINDEV], realoutchans[MAXAUDIOOUTDEV]; char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; - int indevs = 0, outdevs = 0, canmulti = 0; + int indevs = 0, outdevs = 0, canmulti = 0, cancallback = 0; audio_getdevs(indevlist, &indevs, outdevlist, &outdevs, &canmulti, - MAXNDEV, DEVDESCSIZE); - + &cancallback, MAXNDEV, DEVDESCSIZE); if (sys_externalschedlib) { return; } - /* if we're already open close it */ - if (sys_inchannels || sys_outchannels) - sys_close_audio(); if (rate < 1) rate = DEFAULTSRATE; @@ -322,73 +326,12 @@ outchans += choutdev[i]; nrealoutdev++; } - /* if no input or output devices seem to have been specified, - this really means just disable audio, which we now do. */ - if (!inchans && !outchans) - enable = 0; sys_schedadvance = advance * 1000; - sys_setchsr(inchans, outchans, rate); sys_log_error(ERR_NOTHING); - if (enable) - { -#ifdef USEAPI_PORTAUDIO - if (sys_audioapi == API_PORTAUDIO) - { - int blksize = (sys_blocksize ? sys_blocksize : 64); - pa_open_audio(inchans, outchans, rate, sys_soundin, sys_soundout, - blksize, sys_advance_samples/blksize, - (naudiooutdev > 0 ? audioindev[0] : 0), - (naudiooutdev > 0 ? audiooutdev[0] : 0)); - } -else -#endif -#ifdef USEAPI_JACK - if (sys_audioapi == API_JACK) - jack_open_audio((nrealindev > 0 ? realinchans[0] : 0), - (nrealoutdev > 0 ? realoutchans[0] : 0), rate); - - else -#endif -#ifdef USEAPI_OSS - if (sys_audioapi == API_OSS) - oss_open_audio(nrealindev, realindev, nrealindev, realinchans, - nrealoutdev, realoutdev, nrealoutdev, realoutchans, rate); - else -#endif -#ifdef USEAPI_ALSA - /* for alsa, only one device is supported; it may - be open for both input and output. */ - if (sys_audioapi == API_ALSA) - alsa_open_audio(nrealindev, audioindev, nrealindev, realinchans, - nrealoutdev, audiooutdev, nrealoutdev, realoutchans, rate); - else -#endif -#ifdef USEAPI_SGI - if (sys_audioapi == API_SGI) - { - xtern int sgi_open_audio(int nindev, int *indev, int nchin, - int *chin, int noutdev, int *outdev, int nchout, int *chout, - int rate); - sgi_open_audio(naudioindev, audioindev, nchindev, chindev, - naudiooutdev, audiooutdev, nchoutdev, choutdev, rate); - } - else -#endif -#ifdef USEAPI_MMIO - if (sys_audioapi == API_MMIO) - mmio_open_audio(nrealindev, audioindev, nrealindev, realinchans, - nrealoutdev, audiooutdev, nrealoutdev, realoutchans, rate); - else -#endif - post("unknown audio API specified"); - } - sys_save_audio_params(naudioindev, audioindev, chindev, - naudiooutdev, audiooutdev, choutdev, sys_dacsr, advance); - if (sys_inchannels == 0 && sys_outchannels == 0) - enable = 0; - audio_state = enable; - sys_vgui("set pd_whichapi %d\n", (audio_isopen() ? sys_audioapi : 0)); - sched_set_using_dacs(enable); + audio_nextinchans = inchans; + audio_nextoutchans = outchans; + sys_save_audio_params(nrealindev, realindev, realinchans, + nrealoutdev, realoutdev, realoutchans, rate, advance, callback); } void sys_close_audio(void) @@ -400,40 +343,36 @@ if (!audio_isopen()) return; #ifdef USEAPI_PORTAUDIO - if (sys_audioapi == API_PORTAUDIO) + if (sys_audioapiopened == API_PORTAUDIO) pa_close_audio(); else #endif #ifdef USEAPI_JACK - if (sys_audioapi == API_JACK) + if (sys_audioapiopened == API_JACK) jack_close_audio(); else #endif #ifdef USEAPI_OSS - if (sys_audioapi == API_OSS) + if (sys_audioapiopened == API_OSS) oss_close_audio(); else #endif #ifdef USEAPI_ALSA - if (sys_audioapi == API_ALSA) + if (sys_audioapiopened == API_ALSA) alsa_close_audio(); else #endif -#ifdef USEAPI_SGI - if (sys_audioapi == API_SGI) - { - extern void sgi_close_audio(void); - sgi_close_audio(); - } - else -#endif #ifdef USEAPI_MMIO - if (sys_audioapi == API_MMIO) + if (sys_audioapiopened == API_MMIO) mmio_close_audio(); else #endif - post("sys_close_audio: unknown API %d", sys_audioapi); + post("sys_close_audio: unknown API %d", sys_audioapiopened); sys_inchannels = sys_outchannels = 0; + sys_audioapiopened = -1; + sched_set_using_audio(SCHED_AUDIO_NONE); + audio_state = 0; + audio_callback_is_open = 0; } /* open audio using whatever parameters were last used */ @@ -441,11 +380,73 @@ { int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV]; int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; - int rate, advance; + int rate, advance, callback, outcome = 0; sys_get_audio_params(&naudioindev, audioindev, chindev, - &naudiooutdev, audiooutdev, choutdev, &rate, &advance); - sys_open_audio(naudioindev, audioindev, naudioindev, chindev, - naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, advance, 1); + &naudiooutdev, audiooutdev, choutdev, &rate, &advance, &callback); + sys_setchsr(audio_nextinchans, audio_nextoutchans, rate); + if (!naudioindev && !naudiooutdev) + { + sched_set_using_audio(SCHED_AUDIO_NONE); + return; + } +#ifdef USEAPI_PORTAUDIO + if (sys_audioapi == API_PORTAUDIO) + { + int blksize = (sys_blocksize ? sys_blocksize : 64); + outcome = pa_open_audio((naudioindev > 0 ? chindev[0] : 0), + (naudiooutdev > 0 ? choutdev[0] : 0), rate, sys_soundin, + sys_soundout, blksize, sys_advance_samples/blksize, + (naudioindev > 0 ? audioindev[0] : 0), + (naudiooutdev > 0 ? audiooutdev[0] : 0), + (callback ? sched_audio_callbackfn : 0)); + } + else +#endif +#ifdef USEAPI_JACK + if (sys_audioapi == API_JACK) + outcome = jack_open_audio((naudioindev > 0 ? chindev[0] : 0), + (naudioindev > 0 ? choutdev[0] : 0), rate); + + else +#endif +#ifdef USEAPI_OSS + if (sys_audioapi == API_OSS) + outcome = oss_open_audio(naudioindev, audioindev, naudioindev, + chindev, naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate); + else +#endif +#ifdef USEAPI_ALSA + /* for alsa, only one device is supported; it may + be open for both input and output. */ + if (sys_audioapi == API_ALSA) + outcome = alsa_open_audio(naudioindev, audioindev, naudioindev, + chindev, naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate); + else +#endif +#ifdef USEAPI_MMIO + if (sys_audioapi == API_MMIO) + outcome = mmio_open_audio(naudioindev, audioindev, naudioindev, + chindev, naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate); + else +#endif + post("unknown audio API specified"); + if (outcome) /* failed */ + { + audio_state = 0; + sched_set_using_audio(SCHED_AUDIO_NONE); + sys_audioapiopened = -1; + audio_callback_is_open = 0; + } + else + { + /* fprintf(stderr, "started w/callback %d\n", callback); */ + audio_state = 1; + sched_set_using_audio( + (callback ? SCHED_AUDIO_CALLBACK : SCHED_AUDIO_POLL)); + sys_audioapiopened = sys_audioapi; + audio_callback_is_open = callback; + } + sys_vgui("set pd_whichapi %d\n", (outcome == 0 ? sys_audioapi : 0)); } int sys_send_dacs(void) @@ -453,11 +454,11 @@ if (sys_meters) { int i, n; - float maxsamp; + t_sample maxsamp; for (i = 0, n = sys_inchannels * DEFDACBLKSIZE, maxsamp = sys_inmax; i < n; i++) { - float f = sys_soundin[i]; + t_sample f = sys_soundin[i]; if (f > maxsamp) maxsamp = f; else if (-f > maxsamp) maxsamp = -f; } @@ -465,7 +466,7 @@ for (i = 0, n = sys_outchannels * DEFDACBLKSIZE, maxsamp = sys_outmax; i < n; i++) { - float f = sys_soundout[i]; + t_sample f = sys_soundout[i]; if (f > maxsamp) maxsamp = f; else if (-f > maxsamp) maxsamp = -f; } @@ -492,14 +493,6 @@ return (alsa_send_dacs()); else #endif -#ifdef USEAPI_SGI - if (sys_audioapi == API_SGI) - { - extern int sgi_send_dacs(void); - return (sgi_send_dacs()); - } - else -#endif #ifdef USEAPI_MMIO if (sys_audioapi == API_MMIO) return (mmio_send_dacs()); @@ -509,7 +502,7 @@ return (0); } -float sys_getsr(void) +t_float sys_getsr(void) { return (sys_dacsr); } @@ -524,7 +517,7 @@ return (sys_inchannels); } -void sys_getmeters(float *inmax, float *outmax) +void sys_getmeters(t_sample *inmax, t_sample *outmax) { if (inmax) { @@ -542,15 +535,17 @@ } static void audio_getdevs(char *indevlist, int *nindevs, - char *outdevlist, int *noutdevs, int *canmulti, + char *outdevlist, int *noutdevs, int *canmulti, int *cancallback, int maxndev, int devdescsize) { audio_init(); + *cancallback = 0; /* may be overridden by specific API implementation */ #ifdef USEAPI_PORTAUDIO if (sys_audioapi == API_PORTAUDIO) { pa_getdevs(indevlist, nindevs, outdevlist, noutdevs, canmulti, maxndev, devdescsize); + *cancallback = 1; } else #endif @@ -578,17 +573,6 @@ } else #endif -#ifdef USEAPI_SGI - if (sys_audioapi == API_SGI) - { - extern void sgi_getdevs(char *indevlist, int *nindevs, - char *outdevlist, int *noutdevs, int *canmulti, - int maxndev, int devdescsize); - sgi_getdevs(indevlist, nindevs, outdevlist, noutdevs, canmulti, - maxndev, devdescsize); - } - else -#endif #ifdef USEAPI_MMIO if (sys_audioapi == API_MMIO) { @@ -614,10 +598,10 @@ static void sys_listaudiodevs(void ) { char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; - int nindevs = 0, noutdevs = 0, i, canmulti = 0; + int nindevs = 0, noutdevs = 0, i, canmulti = 0, cancallback = 0; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, - MAXNDEV, DEVDESCSIZE); + &cancallback, MAXNDEV, DEVDESCSIZE); if (!nindevs) post("no audio input devices found"); @@ -656,26 +640,26 @@ audioinchan1, audioinchan2, audioinchan3, audioinchan4, audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4; - int rate, advance; + int rate, advance, callback; /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; - int nindevs = 0, noutdevs = 0, canmulti = 0, i; + int nindevs = 0, noutdevs = 0, canmulti = 0, cancallback = 0, i; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, - MAXNDEV, DEVDESCSIZE); + &cancallback, MAXNDEV, DEVDESCSIZE); sys_gui("global audio_indevlist; set audio_indevlist {}\n"); for (i = 0; i < nindevs; i++) - sys_vgui("lappend audio_indevlist \"%s\"\n", + sys_vgui("lappend audio_indevlist {%s}\n", indevlist + i * DEVDESCSIZE); sys_gui("global audio_outdevlist; set audio_outdevlist {}\n"); for (i = 0; i < noutdevs; i++) - sys_vgui("lappend audio_outdevlist \"%s\"\n", + sys_vgui("lappend audio_outdevlist {%s}\n", outdevlist + i * DEVDESCSIZE); sys_get_audio_params(&naudioindev, audioindev, chindev, - &naudiooutdev, audiooutdev, choutdev, &rate, &advance); + &naudiooutdev, audiooutdev, choutdev, &rate, &advance, &callback); /* post("naudioindev %d naudiooutdev %d longform %f", naudioindev, naudiooutdev, flongform); */ @@ -702,16 +686,18 @@ "pdtk_audio_dialog %%s \ %d %d %d %d %d %d %d %d \ %d %d %d %d %d %d %d %d \ -%d %d %d %d\n", +%d %d %d %d %d\n", audioindev1, audioindev2, audioindev3, audioindev4, audioinchan1, audioinchan2, audioinchan3, audioinchan4, audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, - rate, advance, canmulti, (flongform != 0)); + rate, advance, canmulti, (cancallback ? callback : -1), + (flongform != 0)); gfxstub_deleteforkey(0); gfxstub_new(&glob_pdobject, (void *)glob_audio_properties, buf); } +extern int pa_foo; /* new values from dialog window */ void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv) { @@ -724,7 +710,7 @@ /* the new values the dialog came back with: */ int newrate = atom_getintarg(16, argc, argv); int newadvance = atom_getintarg(17, argc, argv); - int statewas; + int newcallback = atom_getintarg(18, argc, argv); for (i = 0; i < 4; i++) { @@ -756,11 +742,17 @@ noutdev++; } } - - sys_close_audio(); - sys_open_audio(nindev, newaudioindev, nindev, newaudioinchan, + + if (newcallback < 0) + newcallback = 0; + if (!audio_callback_is_open && !newcallback) + sys_close_audio(); + sys_set_audio_settings(nindev, newaudioindev, nindev, newaudioinchan, noutdev, newaudiooutdev, noutdev, newaudiooutchan, - newrate, newadvance, 1); + newrate, newadvance, (newcallback >= 0 ? newcallback : 0)); + if (!audio_callback_is_open && !newcallback) + sys_reopen_audio(); + else sched_reopenmeplease(); } void sys_listdevs(void ) @@ -785,12 +777,6 @@ sys_listaudiodevs(); else #endif -#ifdef USEAPI_SGI - extern void sgi_listaudiodevs(void); - if (sys_audioapi == API_SGI) - sgi_listaudiodevs(); - else -#endif #ifdef USEAPI_MMIO if (sys_audioapi == API_MMIO) sys_listaudiodevs(); @@ -843,8 +829,6 @@ else if (audio_isopen()) { sys_close_audio(); - audio_state = 0; - sched_set_using_dacs(0); } } @@ -859,12 +843,8 @@ else { if (audio_isopen()) - { sys_close_audio(); - sched_set_using_dacs(0); - } } - audio_state = onoff; } void sys_get_audio_apis(char *buf) @@ -891,10 +871,7 @@ #else sprintf(buf + strlen(buf), "{portaudio %d} ", API_PORTAUDIO); #endif -#ifdef USEAPI_SGI - sprintf(buf + strlen(buf), "{SGI %d} ", API_SGI); n++; #endif -#endif n++; #endif #ifdef USEAPI_JACK @@ -904,7 +881,6 @@ /* then again, if only one API (or none) we don't offer any choice. */ if (n < 2) strcpy(buf, "{}"); - } #ifdef USEAPI_ALSA Modified: branches/pd-extended/0.41/pd/src/s_loader.c =================================================================== --- branches/pd-extended/0.41/pd/src/s_loader.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/s_loader.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -28,6 +28,9 @@ #endif #include "m_pd.h" #include "s_stuff.h" +#ifdef _MSC_VER /* This is only for Microsoft's compiler, not cygwin, e.g. */ +#define snprintf sprintf_s +#endif typedef void (*t_xxx)(void); @@ -43,7 +46,7 @@ static char sys_dllextent[] = ".b_i386", sys_dllextent2[] = ".pd_freebsd"; #endif #ifdef __linux__ -#ifdef __ia64__ +#ifdef __x86_64__ static char sys_dllextent[] = ".l_ia64", sys_dllextent2[] = ".pd_linux"; #else static char sys_dllextent[] = ".l_i386", sys_dllextent2[] = ".pd_linux"; @@ -132,7 +135,7 @@ symname[i] = 0; if (hexmunge) { - memmove(symname+6, symname, strlen(symname+1)); + memmove(symname+6, symname, strlen(symname)+1); strncpy(symname, "setup_", 6); } else strcat(symname, "_setup"); @@ -243,3 +246,37 @@ return ok; } +int sys_run_scheduler(const char *externalschedlibname, + const char *sys_extraflagsstring) +{ + typedef int (*t_externalschedlibmain)(const char *); + t_externalschedlibmain externalmainfunc; + char filename[MAXPDSTRING]; + snprintf(filename, sizeof(filename), "%s.%s", externalschedlibname, + sys_dllextent); + sys_bashfilename(filename, filename); +#ifdef MSW + { + HINSTANCE ntdll = LoadLibrary(filename); + if (!ntdll) + { + post("%s: couldn't load external scheduler lib ", filename); + return (0); + } + externalmainfunc = + (t_externalschedlibmain)GetProcAddress(ntdll, "main"); + } +#else + { + void *dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); + if (!dlobj) + { + post("%s: %s", filename, dlerror()); + return (0); + } + externalmainfunc = (t_externalschedlibmain)dlsym(dlobj, + "pd_extern_sched"); + } +#endif + return((*externalmainfunc)(sys_extraflagsstring)); +} Modified: branches/pd-extended/0.41/pd/src/s_midi.c =================================================================== --- branches/pd-extended/0.41/pd/src/s_midi.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/s_midi.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -245,6 +245,20 @@ sys_queuemidimess(portno, 1, 0xf8, 0,0); } +void outmidi_byte(int portno, int value) +{ +#ifdef USEAPI_ALSA + if (sys_midiapi == API_ALSA) + { + sys_alsa_putmidibyte(portno, value); + } + else +#endif + { + sys_putmidibyte(portno, value); + } +} + /* ------------------------- MIDI input queue handling ------------------ */ typedef struct midiparser { @@ -664,12 +678,12 @@ sys_gui("global midi_indevlist; set midi_indevlist {none}\n"); for (i = 0; i < nindevs; i++) - sys_vgui("lappend midi_indevlist \"%s\"\n", + sys_vgui("lappend midi_indevlist {%s}\n", indevlist + i * DEVDESCSIZE); sys_gui("global midi_outdevlist; set midi_outdevlist {none}\n"); for (i = 0; i < noutdevs; i++) - sys_vgui("lappend midi_outdevlist \"%s\"\n", + sys_vgui("lappend midi_outdevlist {%s}\n", outdevlist + i * DEVDESCSIZE); sys_get_midi_params(&nindev, midiindev, &noutdev, midioutdev); Modified: branches/pd-extended/0.41/pd/src/s_midi_alsa.c =================================================================== --- branches/pd-extended/0.41/pd/src/s_midi_alsa.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/s_midi_alsa.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -51,8 +51,16 @@ int client; int i; snd_seq_client_info_t *alsainfo; + /* do we want to connect pd automatically with other devices ?; see below! */ + /* LATER: think about a flag to enable/disable automatic connection + * (sometimes it could be a pain) + */ + int autoconnect = 1; alsa_nmidiin = 0; alsa_nmidiout = 0; + + if (nmidiout == 0 && nmidiin == 0) return; + if(nmidiin>MAXMIDIINDEV ) { post("midi input ports reduced to maximum %d", MAXMIDIINDEV); @@ -77,25 +85,28 @@ post("couldn't open alsa sequencer"); return; } - for (i=0;i<nmidiout;i++) + for (i=0;i<nmidiin;i++) { int port; sprintf(portname,"Pure Data Midi-In %d",i+1); - port = snd_seq_create_simple_port(midi_handle,portname,SND_SEQ_PORT_CAP_WRITE |SND_SEQ_PORT_CAP_SUBS_WRITE , SND_SEQ_PORT_TYPE_APPLICATION); + port = snd_seq_create_simple_port(midi_handle,portname, + SND_SEQ_PORT_CAP_WRITE |SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_APPLICATION); alsa_midiinfd[i] = port; if (port < 0) goto error; } - for (i=0;i<nmidiin;i++) + for (i=0;i<nmidiout;i++) { int port; sprintf(portname,"Pure Data Midi-Out %d",i+1); - port = snd_seq_create_simple_port(midi_handle,portname, SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_READ, SND_SEQ_PORT_TYPE_APPLICATION); + port = snd_seq_create_simple_port(midi_handle,portname, + SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, + SND_SEQ_PORT_TYPE_APPLICATION); alsa_midioutfd[i] = port; if (port < 0) goto error; } - if (nmidiout == 0 && nmidiin == 0) return; snd_seq_client_info_malloc(&alsainfo); snd_seq_get_client_info(midi_handle,alsainfo); snd_seq_client_info_set_name(alsainfo,"Pure Data"); @@ -107,8 +118,67 @@ snd_midi_event_new(20,&midiev); alsa_nmidiout = nmidiout; alsa_nmidiin = nmidiin; + + /* JMZ: connect all available devices to pd */ + if (autoconnect) + { + + snd_seq_client_info_t *cinfo; + snd_seq_port_info_t *pinfo; + + snd_seq_port_subscribe_t *subs; + snd_seq_addr_t other, topd, frompd; + /* since i don't know how to connect multiple ports + * (connect everything to each port, modulo,...), + * i only fully connect where we have only one single port + */ + if(alsa_nmidiin) + { + topd.client =client; + topd.port =alsa_midiinfd[0]; + } + if(alsa_nmidiout) + { + frompd.client =client; + frompd.port =alsa_midioutfd[0]; + } + + snd_seq_port_subscribe_alloca(&subs); + + snd_seq_client_info_alloca(&cinfo); + snd_seq_port_info_alloca(&pinfo); + snd_seq_client_info_set_client(cinfo, -1); + while (snd_seq_query_next_client(midi_handle, cinfo) >= 0) + { + /* reset query info */ + int client_id=snd_seq_client_info_get_client(cinfo); + + if((SND_SEQ_CLIENT_SYSTEM != client_id)&&(client != client_id)) + { /* skipping port 0 and ourself */ + snd_seq_port_info_set_client(pinfo, client_id); + snd_seq_port_info_set_port(pinfo, -1); + while (snd_seq_query_next_port(midi_handle, pinfo) >= 0) + { + other.client=client_id; + other.port =snd_seq_port_info_get_port(pinfo); + if(1==alsa_nmidiin) /* only autoconnect 1st port */ + { + snd_seq_port_subscribe_set_sender(subs, &other); + snd_seq_port_subscribe_set_dest(subs, &topd); + snd_seq_subscribe_port(midi_handle, subs); + } + if(1==alsa_nmidiout) /* only autoconnect 1st port */ + { + snd_seq_port_subscribe_set_sender(subs, &frompd); + snd_seq_port_subscribe_set_dest(subs, &other); + snd_seq_subscribe_port(midi_handle, subs); + } + } + } + } + } return; - error: + error: sys_setalarm(1000000); post("couldn't open alsa MIDI output device"); return; @@ -173,10 +243,8 @@ { // repack into 1 byte char and put somewhere to point at unsigned char data = (unsigned char)byte; - unsigned char *dataptr = malloc(1); - memcpy(dataptr,&byte,1); - snd_seq_ev_set_sysex(&ev,1,dataptr); //...set_variable *should* have worked but didn't + snd_seq_ev_set_sysex(&ev,1,&data); //...set_variable *should* have worked but didn't snd_seq_ev_set_direct(&ev); snd_seq_ev_set_subs(&ev); snd_seq_ev_set_source(&ev,alsa_midioutfd[portno]); Modified: branches/pd-extended/0.41/pd/src/s_midi_pm.c =================================================================== --- branches/pd-extended/0.41/pd/src/s_midi_pm.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/s_midi_pm.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -23,7 +23,6 @@ #include "portaudio.h" #include "portmidi.h" #include "porttime.h" -#include "pminternal.h" static PmStream *mac_midiindevlist[MAXMIDIINDEV]; static PmStream *mac_midioutdevlist[MAXMIDIOUTDEV]; @@ -142,7 +141,7 @@ writemidi4(mac_midioutdevlist[portno], byte, 0, 0, 0); else if (byte == 0xf0) { - mess[0] = 0xf7; + mess[0] = 0xf0; nbytes = 1; sysex = 1; } @@ -211,6 +210,38 @@ } } +/* this is non-zero if we are in the middle of transmitting sysex */ + +int nd_sysex_mode=0; + +/* send in 4 bytes of sysex data. if one of the bytes is 0xF7 (sysex end) stop and unset nd_sysex_mode */ +void nd_sysex_inword(int midiindev, int status, int data1, int data2, int data3) +{ + if (nd_sysex_mode) { + sys_midibytein(midiindev, status); + if (status == 0xF7) + nd_sysex_mode = 0; + } + + if (nd_sysex_mode) { + sys_midibytein(midiindev, data1); + if (data1 == 0xF7) + nd_sysex_mode = 0; + } + + if (nd_sysex_mode) { + sys_midibytein(midiindev, data2); + if (data2 == 0xF7) + nd_sysex_mode = 0; + } + + if (nd_sysex_mode) { + sys_midibytein(midiindev, data3); + if (data3 == 0xF7) + nd_sysex_mode = 0; + } +} + void sys_poll_midi(void) { int i, nmess; @@ -223,6 +254,7 @@ int status = Pm_MessageStatus(buffer.message); int data1 = Pm_MessageData1(buffer.message); int data2 = Pm_MessageData2(buffer.message); + int data3 = ((buffer.message >> 24) & 0xFF); int msgtype = (status >> 4) - 8; switch (msgtype) { @@ -241,8 +273,12 @@ sys_midibytein(i, data1); break; case 7: - sys_midibytein(i, status); + nd_sysex_mode=1; + nd_sysex_inword(i, status, data1, data2, data3); break; + default: + if (nd_sysex_mode) + nd_sysex_inword(i, status, data1, data2, data3); } } } Modified: branches/pd-extended/0.41/pd/src/s_print.c =================================================================== --- branches/pd-extended/0.41/pd/src/s_print.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/s_print.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -83,7 +83,7 @@ } } -void postfloat(float f) +void postfloat(t_float f) { char buf[80]; t_atom a; @@ -118,7 +118,7 @@ int i; if(level>sys_verbose)return; dopost("verbose("); - postfloat((float)level); + postfloat((t_float)level); dopost("):"); va_start(ap, fmt); Modified: branches/pd-extended/0.41/pd/src/t_tkcmd.c =================================================================== --- branches/pd-extended/0.41/pd/src/t_tkcmd.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/t_tkcmd.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -429,6 +429,7 @@ #endif #ifdef HAVE_UNISTD_H + sprintf(cmdbuf, "\"%s\" -guiport %d\n", pdbuf, portno); childpid = fork(); if (childpid < 0) { @@ -438,7 +439,6 @@ } else if (!childpid) /* we're the child */ { - sprintf(cmdbuf, "\"%s\" -guiport %d\n", pdbuf, portno); #ifdef DEBUGCONNECT fprintf(debugfd, "%s", cmdbuf); fflush(debugfd); @@ -639,19 +639,11 @@ { const char *argv = Tcl_GetVar(interp, "argv", 0); int portno, argno = 0; - /* argument passing seems to be different in MSW as opposed to - unix-likes. Here we check if we got sent a "port number" as an - argument. If so. we're to connect to a previously running pd (i.e., - pd got started first). If not, we start Pd from here. */ -#ifdef MSW if (argv && (portno = atoi(argv)) > 1) -#else - char *firstspace; - if (argv && (firstspace = strchr(argv, ' ')) && (portno = atoi(firstspace)) > 1) -#endif pdgui_setsock(portno); #ifdef DEBUGCONNECT - debugfd = fopen("/Users/msp/bratwurst", "w"); + pd_portno = portno; + debugfd = fopen("/tmp/bratwurst", "w"); fprintf(debugfd, "turning stderr back on\n"); fflush(debugfd); dup2(fileno(debugfd), 2); Modified: branches/pd-extended/0.41/pd/src/x_arithmetic.c =================================================================== --- branches/pd-extended/0.41/pd/src/x_arithmetic.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/x_arithmetic.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -575,8 +575,8 @@ static void tan_float(t_object *x, t_float f) { - float c = cosf(f); - float t = (c == 0 ? 0 : sinf(f)/c); + t_float c = cosf(f); + t_float t = (c == 0 ? 0 : sinf(f)/c); outlet_float(x->ob_outlet, t); } @@ -599,15 +599,12 @@ typedef struct _atan2 { t_object x_ob; - float x_f; + t_float x_f; } t_atan2; static void *atan2_new(void) { t_atan2 *x = (t_atan2 *)pd_new(atan2_class); - static int warned; - if (!warned) - post("warning: atan2 inlets switched from Pd 0.37 to 0.38"), warned=1; floatinlet_new(&x->x_ob, &x->x_f); x->x_f = 0; outlet_new(&x->x_ob, &s_float); @@ -616,7 +613,7 @@ static void atan2_float(t_atan2 *x, t_float f) { - float r = (f == 0 && x->x_f == 0 ? 0 : atan2f(f, x->x_f)); + t_float r = (f == 0 && x->x_f == 0 ? 0 : atan2f(f, x->x_f)); outlet_float(x->x_ob.ob_outlet, r); } @@ -631,7 +628,7 @@ static void sqrt_float(t_object *x, t_float f) { - float r = (f > 0 ? sqrtf(f) : 0); + t_float r = (f > 0 ? sqrtf(f) : 0); outlet_float(x->ob_outlet, r); } @@ -646,7 +643,7 @@ static void log_float(t_object *x, t_float f) { - float r = (f > 0 ? logf(f) : -1000); + t_float r = (f > 0 ? logf(f) : -1000); outlet_float(x->ob_outlet, r); } @@ -663,7 +660,7 @@ #define MAXLOG 87.3365 static void exp_float(t_object *x, t_float f) { - float g; + t_float g; if (f > MAXLOG) f = MAXLOG; g = expf(f); outlet_float(x->ob_outlet, g); @@ -690,9 +687,9 @@ typedef struct _clip { t_object x_ob; - float x_f1; - float x_f2; - float x_f3; + t_float x_f1; + t_float x_f2; + t_float x_f3; } t_clip; static void *clip_new(t_floatarg f1, t_floatarg f2) Modified: branches/pd-extended/0.41/pd/src/x_connective.c =================================================================== --- branches/pd-extended/0.41/pd/src/x_connective.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/x_connective.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -506,7 +506,7 @@ int nelement; if (x->x_type == A_FLOAT) { - float f; + t_float f; if (!argc) return; f = atom_getfloat(argv); for (nelement = x->x_nelement, e = x->x_vec; nelement--; e++) @@ -1056,7 +1056,7 @@ typedef struct _spigot { t_object x_obj; - float x_state; + t_float x_state; } t_spigot; static void *spigot_new(t_floatarg f) @@ -1117,7 +1117,7 @@ { t_object x_ob; t_outlet *x_out2; - float x_y; + t_float x_y; } t_moses; static void *moses_new(t_floatarg f) @@ -1173,6 +1173,8 @@ static void until_float(t_until *x, t_float f) { + if (f < 0) + f = 0; x->x_run = 1; x->x_count = f; while (x->x_run && x->x_count) Modified: branches/pd-extended/0.41/pd/src/x_list.c =================================================================== --- branches/pd-extended/0.41/pd/src/x_list.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/x_list.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -54,6 +54,7 @@ { t_pd l_pd; /* object to point inlets to */ int l_n; /* number of items */ + int l_npointer; /* number of pointers */ t_listelem *l_vec; /* pointer to items */ } t_alist; @@ -99,7 +100,7 @@ static void alist_init(t_alist *x) { x->l_pd = alist_class; - x->l_n = 0; + x->l_n = x->l_npointer = 0; x->l_vec = 0; } @@ -126,11 +127,16 @@ return; } x->l_n = argc; + x->l_npointer = 0; for (i = 0; i < argc; i++) { x->l_vec[i].l_a = argv[i]; if (x->l_vec[i].l_a.a_type == A_POINTER) + { + x->l_npointer++; gpointer_copy(x->l_vec[i].l_a.a_w.w_gpointer, &x->l_vec[i].l_p); + x->l_vec[i].l_a.a_w.w_gpointer = &x->l_vec[i].l_p; + } } } @@ -145,12 +151,17 @@ return; } x->l_n = argc+1; + x->l_npointer = 0; SETSYMBOL(&x->l_vec[0].l_a, s); for (i = 0; i < argc; i++) { x->l_vec[i+1].l_a = argv[i]; if (x->l_vec[i+1].l_a.a_type == A_POINTER) + { + x->l_npointer++; gpointer_copy(x->l_vec[i+1].l_a.a_w.w_gpointer, &x->l_vec[i+1].l_p); + x->l_vec[i].l_a.a_w.w_gpointer = &x->l_vec[i].l_p; + } } } @@ -161,6 +172,29 @@ to[i] = x->l_vec[i].l_a; } + +static void alist_clone(t_alist *x, t_alist *y) +{ + int i; + y->l_pd = alist_class; + y->l_n = x->l_n; + y->l_npointer = x->l_npointer; + if (!(y->l_vec = (t_listelem *)getbytes(y->l_n * sizeof(*y->l_vec)))) + { + y->l_n = 0; + error("list_alloc: out of memory"); + } + else for (i = 0; i < x->l_n; i++) + { + y->l_vec[i].l_a = x->l_vec[i].l_a; + if (y->l_vec[i].l_a.a_type == A_POINTER) + { + gpointer_copy(y->l_vec[i].l_a.a_w.w_gpointer, &y->l_vec[i].l_p); + y->l_vec[i].l_a.a_w.w_gpointer = &y->l_vec[i].l_p; + } + } +} + static void alist_setup(void) { alist_class = class_new(gensym("list inlet"), @@ -196,8 +230,19 @@ int n, outc = x->x_alist.l_n + argc; ATOMS_ALLOCA(outv, outc); atoms_copy(argc, argv, outv); - alist_toatoms(&x->x_alist, outv+argc); - outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + if (x->x_alist.l_npointer) + { + t_alist y; + alist_clone(&x->x_alist, &y); + alist_toatoms(&y, outv+argc); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + alist_clear(&y); + } + else + { + alist_toatoms(&x->x_alist, outv+argc); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + } ATOMS_FREEA(outv, outc); } @@ -209,8 +254,19 @@ ATOMS_ALLOCA(outv, outc); SETSYMBOL(outv, s); atoms_copy(argc, argv, outv + 1); - alist_toatoms(&x->x_alist, outv + 1 + argc); - outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + if (x->x_alist.l_npointer) + { + t_alist y; + alist_clone(&x->x_alist, &y); + alist_toatoms(&y, outv + 1 + argc); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + alist_clear(&y); + } + else + { + alist_toatoms(&x->x_alist, outv + 1 + argc); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + } ATOMS_FREEA(outv, outc); } @@ -255,22 +311,46 @@ t_atom *outv; int n, outc = x->x_alist.l_n + argc; ATOMS_ALLOCA(outv, outc); - alist_toatoms(&x->x_alist, outv); atoms_copy(argc, argv, outv + x->x_alist.l_n); - outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + if (x->x_alist.l_npointer) + { + t_alist y; + alist_clone(&x->x_alist, &y); + alist_toatoms(&y, outv); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + alist_clear(&y); + } + else + { + alist_toatoms(&x->x_alist, outv); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + } ATOMS_FREEA(outv, outc); } + + static void list_prepend_anything(t_list_prepend *x, t_symbol *s, int argc, t_atom *argv) { t_atom *outv; int n, outc = x->x_alist.l_n + argc + 1; ATOMS_ALLOCA(outv, outc); - alist_toatoms(&x->x_alist, outv); SETSYMBOL(outv + x->x_alist.l_n, s); atoms_copy(argc, argv, outv + x->x_alist.l_n + 1); - outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + if (x->x_alist.l_npointer) + { + t_alist y; + alist_clone(&x->x_alist, &y); + alist_toatoms(&y, outv); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + alist_clear(&y); + } + else + { + alist_toatoms(&x->x_alist, outv); + outlet_list(x->x_obj.ob_outlet, &s_list, outc, outv); + } ATOMS_FREEA(outv, outc); } @@ -408,13 +488,13 @@ static void list_length_list(t_list_length *x, t_symbol *s, int argc, t_atom *argv) { - outlet_float(x->x_obj.ob_outlet, (float)argc); + outlet_float(x->x_obj.ob_outlet, (t_float)argc); } static void list_length_anything(t_list_length *x, t_symbol *s, int argc, t_atom *argv) { - outlet_float(x->x_obj.ob_outlet, (float)argc+1); + outlet_float(x->x_obj.ob_outlet, (t_float)argc+1); } static void list_length_setup(void) Modified: branches/pd-extended/0.41/pd/src/x_midi.c =================================================================== --- branches/pd-extended/0.41/pd/src/x_midi.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/x_midi.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -12,7 +12,9 @@ void outmidi_aftertouch(int portno, int channel, int value); void outmidi_polyaftertouch(int portno, int channel, int pitch, int value); void outmidi_mclk(int portno); +void outmidi_byte(int portno, int value); + /* ----------------------- midiin and sysexin ------------------------- */ static t_symbol *midiin_sym, *sysexin_sym; @@ -32,8 +34,8 @@ x->x_outlet1 = outlet_new(&x->x_obj, &s_float); x->x_outlet2 = outlet_new(&x->x_obj, &s_float); pd_bind(&x->x_obj.ob_pd, midiin_sym); -#ifndef __linux__ - pd_error(x, "midiin: works under Linux only"); +#ifdef WIN32 + pd_error(x, "midiin: windows: not supported"); #endif return (x); } @@ -55,8 +57,8 @@ x->x_outlet1 = outlet_new(&x->x_obj, &s_float); x->x_outlet2 = outlet_new(&x->x_obj, &s_float); pd_bind(&x->x_obj.ob_pd, sysexin_sym); -#ifndef __linux__ - pd_error(x, "sysexin: works under Linux only"); +#ifdef WIN32 + pd_error(x, "sysexin: windows: not supported"); #endif return (x); } @@ -133,9 +135,9 @@ static void notein_list(t_notein *x, t_symbol *s, int argc, t_atom *argv) { - float pitch = atom_getfloatarg(0, argc, argv); - float velo = atom_getfloatarg(1, argc, argv); - float channel = atom_getfloatarg(2, argc, argv); + t_float pitch = atom_getfloatarg(0, argc, argv); + t_float velo = atom_getfloatarg(1, argc, argv); + t_float channel = atom_getfloatarg(2, argc, argv); if (x->x_channel != 0) { if (channel != x->x_channel) return; @@ -274,8 +276,8 @@ static void pgmin_list(t_pgmin *x, t_symbol *s, int argc, t_atom *argv) { - float value = atom_getfloatarg(0, argc, argv); - float channel = atom_getfloatarg(1, argc, argv); + t_float value = atom_getfloatarg(0, argc, argv); + t_float channel = atom_getfloatarg(1, argc, argv); if (x->x_channel != 0) { if (channel != x->x_channel) return; @@ -540,8 +542,8 @@ static void midiclkin_list(t_midiclkin *x, t_symbol *s, int argc, t_atom *argv) { - float value = atom_getfloatarg(0, argc, argv); - float count = atom_getfloatarg(1, argc, argv); + t_float value = atom_getfloatarg(0, argc, argv); + t_float count = atom_getfloatarg(1, argc, argv); outlet_float(x->x_outlet2, count); outlet_float(x->x_outlet1, value); } @@ -564,9 +566,9 @@ void inmidi_clk(double timing) { - static float prev = 0; - static float count = 0; - float cur,diff; + static t_float prev = 0; + static t_float count = 0; + t_float cur,diff; if (midiclkin_sym->s_thing) { @@ -615,8 +617,8 @@ static void midirealtimein_list(t_midirealtimein *x, t_symbol *s, int argc, t_atom *argv) { - float portno = atom_getfloatarg(0, argc, argv); - float byte = atom_getfloatarg(1, argc, argv); + t_float portno = atom_getfloatarg(0, argc, argv); + t_float byte = atom_getfloatarg(1, argc, argv); outlet_float(x->x_outlet2, portno); outlet_float(x->x_outlet1, byte); @@ -674,7 +676,7 @@ static void midiout_float(t_midiout *x, t_floatarg f) { - sys_putmidibyte(x->x_portno - 1, f); + outmidi_byte(x->x_portno - 1, f); } static void midiout_setup(void) @@ -1058,7 +1060,7 @@ typedef struct voice { - float v_pitch; + t_float v_pitch; int v_used; unsigned long v_serial; } t_voice; @@ -1068,14 +1070,14 @@ t_object x_obj; int x_n; t_voice *x_vec; - float x_vel; + t_float x_vel; t_outlet *x_pitchout; t_outlet *x_velout; unsigned long x_serial; int x_steal; } t_poly; -static void *poly_new(float fnvoice, float fsteal) +static void *poly_new(t_float fnvoice, t_float fsteal) { int i, n = fnvoice; t_poly *x = (t_poly *)pd_new(poly_class); Modified: branches/pd-extended/0.41/pd/src/x_misc.c =================================================================== --- branches/pd-extended/0.41/pd/src/x_misc.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/x_misc.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -29,8 +29,11 @@ #endif #if defined (__APPLE__) || defined (__FreeBSD__) -#define HZ CLK_TCK +#define CLOCKHZ CLK_TCK #endif +#if defined (__linux__) +#define CLOCKHZ sysconf(_SC_CLK_TCK) +#endif /* -------------------------- random ------------------------------ */ /* this is strictly homebrew and untested. */ @@ -74,7 +77,7 @@ outlet_float(x->x_obj.ob_outlet, nval); } -static void random_seed(t_random *x, float f, float glob) +static void random_seed(t_random *x, t_float f, t_float glob) { x->x_state = f; } @@ -292,16 +295,16 @@ static void cputime_bang2(t_cputime *x) { #ifdef HAVE_UNISTD_H - float elapsedcpu; + t_float elapsedcpu; struct tms newcputime; times(&newcputime); elapsedcpu = 1000 * ( newcputime.tms_utime + newcputime.tms_stime - - x->x_setcputime.tms_utime - x->x_setcputime.tms_stime) / HZ; + x->x_setcputime.tms_utime - x->x_setcputime.tms_stime) / CLOCKHZ; outlet_float(x->x_obj.ob_outlet, elapsedcpu); #endif #ifdef MSW - float elapsedcpu; + t_float elapsedcpu; FILETIME ignorethis, ignorethat; LARGE_INTEGER usertime, kerneltime; BOOL retval; Modified: branches/pd-extended/0.41/pd/src/x_qlist.c =================================================================== --- branches/pd-extended/0.41/pd/src/x_qlist.c 2009-01-10 01:15:48 UTC (rev 10495) +++ branches/pd-extended/0.41/pd/src/x_qlist.c 2009-01-10 02:18:04 UTC (rev 10496) @@ -22,9 +22,9 @@ void *x_binbuf; int x_onset; /* playback position */ t_clock *x_clock; - float x_tempo; + t_float x_tempo; double x_whenclockset; - float x_clockdelay; + t_float x_clockdelay; t_symbol *x_dir; t_canvas *x_canvas; int x_reentered; @@ -104,7 +104,8 @@ if (ap->a_type != A_SYMBOL) continue; else if (!(target = ap->a_w.w_symbol->s_thing)) { - error("qlist: %s: no such object", ap->a_w.w_symbol->s_name); + pd_error(x, "qlist: %s: no such object", + ap->a_w.w_symbol->s_name); continue; } ap++; @@ -184,10 +185,10 @@ if (!strcmp(format->s_name, "cr")) cr = 1; else if (*format->s_name) - error("qlist_read: unknown flag: %s", format->s_name); + pd_error(x, "qlist_read: unknown flag: %s", format->s_name); if (binbuf_read_via_canvas(x->x_binbuf, filename->s_name, x->x_canvas, cr)) - error("%s: read failed", filename->s_name); + pd_error(x, "%s: read failed", filename->s_name); x->x_onset = 0x7fffffff; x->x_reentered = 1; } @@ -201,9 +202,9 @@ if (!strcmp(format->s_name, "cr")) cr = 1; else if (*format->s_name) - error("qlist_read: unknown flag: %s", format->s_name); + pd_error(x, "qlist_read: unknown flag: %s", format->s_name); if (binbuf_write(x->x_binbuf, buf, "", cr)) - error("%s: write failed", filename->s_name); + pd_error(x, "%s: write failed", filename->s_name); } static void qlist_print(t_qlist *x) @@ -214,14 +215,14 @@ static void qlist_tempo(t_qlist *x, t_float f) { - float newtempo; + t_float newtempo; if (f < 1e-20) f = 1e-20; else if (f > 1e20) f = 1e20; newtempo = 1./f; if (x->x_whenclockset != 0) { - float elapsed = clock_gettimesince(x->x_whenclockset); - float left = x->x_clockdelay - elapsed; + t_float elapsed = clock_gettimesince(x->x_whenclockset); + t_float left = x->x_clockdelay - elapsed; if (left < 0) left = 0; left *= newtempo / x->x_tempo; clock_delay(x->x_clock, left); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10495] branches/pd-extended/0.41/pd
by eighthave＠users.sourceforge.net 10 Jan '09

10 Jan '09

Revision: 10495 http://pure-data.svn.sourceforge.net/pure-data/?rev=10495&view=rev Author: eighthave Date: 2009-01-10 01:15:48 +0000 (Sat, 10 Jan 2009) Log Message: ----------- merging in the easy changes from 0.41-4, these are all the changes that have no conflicts at all Modified Paths: -------------- branches/pd-extended/0.41/pd/doc/1.manual/x1.htm branches/pd-extended/0.41/pd/doc/1.manual/x2.htm branches/pd-extended/0.41/pd/doc/1.manual/x3.htm branches/pd-extended/0.41/pd/doc/1.manual/x5.htm branches/pd-extended/0.41/pd/doc/3.audio.examples/E07.evenodd.pd branches/pd-extended/0.41/pd/doc/3.audio.examples/E10.complex.FM.pd branches/pd-extended/0.41/pd/doc/3.audio.examples/H04.filter.sweep.pd branches/pd-extended/0.41/pd/doc/3.audio.examples/H05.filter.floyd.pd branches/pd-extended/0.41/pd/doc/3.audio.examples/I07.phase.vocoder.pd branches/pd-extended/0.41/pd/doc/3.audio.examples/J01.even.odd.pd branches/pd-extended/0.41/pd/extra/expr~/makefile branches/pd-extended/0.41/pd/extra/expr~/vexp_if.c branches/pd-extended/0.41/pd/extra/makefile branches/pd-extended/0.41/pd/extra/sigmund~/sigmund~-help.pd branches/pd-extended/0.41/pd/extra/sigmund~/sigmund~.c branches/pd-extended/0.41/pd/portmidi/README.txt branches/pd-extended/0.41/pd/portmidi/pm_common/pminternal.h branches/pd-extended/0.41/pd/portmidi/pm_common/pmutil.c branches/pd-extended/0.41/pd/portmidi/pm_common/pmutil.h branches/pd-extended/0.41/pd/portmidi/pm_common/portmidi.c branches/pd-extended/0.41/pd/portmidi/pm_common/portmidi.h branches/pd-extended/0.41/pd/portmidi/pm_linux/README_LINUX.txt branches/pd-extended/0.41/pd/portmidi/pm_linux/pmlinux.c branches/pd-extended/0.41/pd/portmidi/pm_linux/pmlinuxalsa.c branches/pd-extended/0.41/pd/portmidi/pm_mac/pmmacosxcm.c branches/pd-extended/0.41/pd/portmidi/pm_win/README_WIN.txt branches/pd-extended/0.41/pd/portmidi/pm_win/copy-dll.bat branches/pd-extended/0.41/pd/portmidi/pm_win/pm_dll.dsp branches/pd-extended/0.41/pd/portmidi/pm_win/pmwin.c branches/pd-extended/0.41/pd/portmidi/pm_win/pmwinmm.c branches/pd-extended/0.41/pd/portmidi/porttime/porttime.h branches/pd-extended/0.41/pd/portmidi/porttime/ptlinux.c branches/pd-extended/0.41/pd/portmidi/porttime/ptmacosx_cf.c branches/pd-extended/0.41/pd/portmidi/porttime/ptmacosx_mach.c branches/pd-extended/0.41/pd/src/CHANGELOG.txt branches/pd-extended/0.41/pd/src/d_arithmetic.c branches/pd-extended/0.41/pd/src/d_ctl.c branches/pd-extended/0.41/pd/src/d_dac.c branches/pd-extended/0.41/pd/src/d_delay.c branches/pd-extended/0.41/pd/src/d_fft.c branches/pd-extended/0.41/pd/src/d_fft_mayer.c branches/pd-extended/0.41/pd/src/d_filter.c branches/pd-extended/0.41/pd/src/d_global.c branches/pd-extended/0.41/pd/src/d_math.c branches/pd-extended/0.41/pd/src/d_misc.c branches/pd-extended/0.41/pd/src/d_osc.c branches/pd-extended/0.41/pd/src/d_resample.c branches/pd-extended/0.41/pd/src/d_ugen.c branches/pd-extended/0.41/pd/src/g_all_guis.h branches/pd-extended/0.41/pd/src/g_canvas.h branches/pd-extended/0.41/pd/src/g_traversal.c branches/pd-extended/0.41/pd/src/m_pd.h branches/pd-extended/0.41/pd/src/makefile.in branches/pd-extended/0.41/pd/src/makefile.nt branches/pd-extended/0.41/pd/src/notes.txt branches/pd-extended/0.41/pd/src/s_audio_alsa.c branches/pd-extended/0.41/pd/src/s_audio_mmio.c branches/pd-extended/0.41/pd/src/s_audio_oss.c branches/pd-extended/0.41/pd/src/s_audio_pa.c branches/pd-extended/0.41/pd/src/s_audio_pablio.c branches/pd-extended/0.41/pd/src/s_stuff.h branches/pd-extended/0.41/pd/src/x_acoustics.c branches/pd-extended/0.41/pd/src/x_time.c Added Paths: ----------- branches/pd-extended/0.41/pd/doc/4.data.structures/14.partialtracer.pd branches/pd-extended/0.41/pd/portaudio/include/ branches/pd-extended/0.41/pd/portaudio/include/pa_asio.h branches/pd-extended/0.41/pd/portaudio/include/pa_jack.h branches/pd-extended/0.41/pd/portaudio/include/pa_linux_alsa.h branches/pd-extended/0.41/pd/portaudio/include/pa_mac_core.h branches/pd-extended/0.41/pd/portaudio/include/pa_win_wmme.h branches/pd-extended/0.41/pd/portaudio/include/portaudio.h branches/pd-extended/0.41/pd/portaudio/src/ branches/pd-extended/0.41/pd/portaudio/src/common/ branches/pd-extended/0.41/pd/portaudio/src/common/pa_allocation.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_allocation.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_converters.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_converters.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_cpuload.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_cpuload.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_debugprint.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_debugprint.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_dither.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_dither.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_endianness.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_front.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_hostapi.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_process.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_process.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_ringbuffer.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_ringbuffer.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_skeleton.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_stream.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_stream.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_trace.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_trace.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_types.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_util.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/alsa/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/alsa/pa_linux_alsa.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/iasiothiscallresolver.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/pa_asio.cpp branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/notes.txt branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/jack/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/jack/pa_jack.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/low_latency_tip.txt branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/pa_unix_oss.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/recplay.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/wmme/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/wmme/pa_win_wmme.c branches/pd-extended/0.41/pd/portaudio/src/os/ branches/pd-extended/0.41/pd/portaudio/src/os/mac_osx/ branches/pd-extended/0.41/pd/portaudio/src/os/mac_osx/pa_mac_hostapis.c branches/pd-extended/0.41/pd/portaudio/src/os/unix/ branches/pd-extended/0.41/pd/portaudio/src/os/unix/pa_unix_hostapis.c branches/pd-extended/0.41/pd/portaudio/src/os/unix/pa_unix_util.c branches/pd-extended/0.41/pd/portaudio/src/os/unix/pa_unix_util.h branches/pd-extended/0.41/pd/portaudio/src/os/win/ branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_win_hostapis.c branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_win_util.c branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_x86_plain_converters.c branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_x86_plain_converters.h branches/pd-extended/0.41/pd/portmidi/CHANGELOG.txt branches/pd-extended/0.41/pd/portmidi/license.txt branches/pd-extended/0.41/pd/src/d_fft_fftsg.c branches/pd-extended/0.41/pd/src/d_fft_fftw.c branches/pd-extended/0.41/pd/src/d_fftsg_h.c Removed Paths: ------------- branches/pd-extended/0.41/pd/bin/nada branches/pd-extended/0.41/pd/extra/pique/pique.c.old branches/pd-extended/0.41/pd/obj/nada branches/pd-extended/0.41/pd/portaudio/LICENSE.txt branches/pd-extended/0.41/pd/portaudio/README.txt branches/pd-extended/0.41/pd/portaudio/V19-devel-readme.txt branches/pd-extended/0.41/pd/portaudio/include/pa_asio.h branches/pd-extended/0.41/pd/portaudio/include/pa_jack.h branches/pd-extended/0.41/pd/portaudio/include/pa_linux_alsa.h branches/pd-extended/0.41/pd/portaudio/include/pa_mac_core.h branches/pd-extended/0.41/pd/portaudio/include/pa_win_wmme.h branches/pd-extended/0.41/pd/portaudio/include/portaudio.h branches/pd-extended/0.41/pd/portaudio/pa_asio/ branches/pd-extended/0.41/pd/portaudio/pa_common/ branches/pd-extended/0.41/pd/portaudio/pa_dll_switch/ branches/pd-extended/0.41/pd/portaudio/pa_jack/ branches/pd-extended/0.41/pd/portaudio/pa_linux_alsa/ branches/pd-extended/0.41/pd/portaudio/pa_mac/ branches/pd-extended/0.41/pd/portaudio/pa_mac_core/ branches/pd-extended/0.41/pd/portaudio/pa_unix/ branches/pd-extended/0.41/pd/portaudio/pa_unix_oss/ branches/pd-extended/0.41/pd/portaudio/pa_win/ branches/pd-extended/0.41/pd/portaudio/pa_win_ds/ branches/pd-extended/0.41/pd/portaudio/pa_win_wdmks/ branches/pd-extended/0.41/pd/portaudio/pa_win_wmme/ branches/pd-extended/0.41/pd/portaudio/pablio/ branches/pd-extended/0.41/pd/portaudio/src/common/ branches/pd-extended/0.41/pd/portaudio/src/common/pa_allocation.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_allocation.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_converters.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_converters.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_cpuload.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_cpuload.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_debugprint.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_debugprint.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_dither.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_dither.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_endianness.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_front.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_hostapi.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_process.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_process.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_ringbuffer.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_ringbuffer.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_skeleton.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_stream.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_stream.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_trace.c branches/pd-extended/0.41/pd/portaudio/src/common/pa_trace.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_types.h branches/pd-extended/0.41/pd/portaudio/src/common/pa_util.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/alsa/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/alsa/pa_linux_alsa.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/iasiothiscallresolver.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/asio/pa_asio.cpp branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/notes.txt branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h branches/pd-extended/0.41/pd/portaudio/src/hostapi/jack/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/jack/pa_jack.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/low_latency_tip.txt branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/pa_unix_oss.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/oss/recplay.c branches/pd-extended/0.41/pd/portaudio/src/hostapi/wmme/ branches/pd-extended/0.41/pd/portaudio/src/hostapi/wmme/pa_win_wmme.c branches/pd-extended/0.41/pd/portaudio/src/os/ branches/pd-extended/0.41/pd/portaudio/src/os/mac_osx/ branches/pd-extended/0.41/pd/portaudio/src/os/mac_osx/pa_mac_hostapis.c branches/pd-extended/0.41/pd/portaudio/src/os/unix/ branches/pd-extended/0.41/pd/portaudio/src/os/unix/pa_unix_hostapis.c branches/pd-extended/0.41/pd/portaudio/src/os/unix/pa_unix_util.c branches/pd-extended/0.41/pd/portaudio/src/os/unix/pa_unix_util.h branches/pd-extended/0.41/pd/portaudio/src/os/win/ branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_win_hostapis.c branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_win_util.c branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_x86_plain_converters.c branches/pd-extended/0.41/pd/portaudio/src/os/win/pa_x86_plain_converters.h branches/pd-extended/0.41/pd/portmidi/Makefile branches/pd-extended/0.41/pd/portmidi/pm_test/ branches/pd-extended/0.41/pd/portmidi/portmidi.dsp branches/pd-extended/0.41/pd/portmidi/portmidi.dsw branches/pd-extended/0.41/pd/src/d_fft_fftsg.c branches/pd-extended/0.41/pd/src/d_fft_fftw.c branches/pd-extended/0.41/pd/src/d_fftsg_h.c branches/pd-extended/0.41/pd/src/makefile.irix branches/pd-extended/0.41/pd/src/s_audio_sgi.c branches/pd-extended/0.41/pd/src/s_midi_sgi.c Property Changed: ---------------- branches/pd-extended/0.41/pd/extra/ branches/pd-extended/0.41/pd/portmidi/ branches/pd-extended/0.41/pd/src/ Modified: branches/pd-extended/0.41/pd/doc/1.manual/x1.htm =================================================================== --- branches/pd-extended/0.41/pd/doc/1.manual/x1.htm 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/1.manual/x1.htm 2009-01-10 01:15:48 UTC (rev 10495) @@ -102,21 +102,19 @@ <P> At least three video processing packages are available for Pd. The oldest is Framestein, by Juha Vehvilainen. This runs on Windows only: <A href="http://framestein.org"> http://framestein.org </A>. - -<P> The newer <A> href="http://zwizwa.fartit.com/pd/pdp/overview.html"> PDP -<A> library, by Tom Schouten, and its extension <A +The newer PDP +library, by Tom Schouten, and its extension <A href="http://ydegoyon.free.fr/pidip.html"> PiDiP </A> by Yves Degoyon, run well -in linux and has been ported to Windows and MacOS. Video is extremely fast in -PDP, but is currently limited to 240x320 resolution. - -<P> Mathieu Bouchard has written <A href=http://artengine.ca/gridflow/> +in linux and have been ported to Windows and MacOS. +Mathieu Bouchard has written <A href=http://artengine.ca/gridflow/> Gridflow </A>, which runs on linux and MacOSX. The mathematical operators are more powerful than in PDP, and the design makes smarter use of cache behavior in modern CPUs. -All this and much more is described in detail at the -<A href="http://puredata.info/community/projects/convention04/"> -first Pd Convention </A>. +<P> the Pd extended package, maintained by Hans-Christof Steiner, can be +downloaded from the <A href=http://sourceforge.net/projects/pure-data/> Pd's +sourceforge site </A>. All this and much more is described in detail on <A +href="http://puredata.info/"> http://puredata.info/</A>. <P> @@ -125,14 +123,8 @@ <a href="http://www.crca.ucsd.edu/~msp"> Miller Puckette's home page</a><br> <a href="http://gige.epy.co.at/"> Guenter Geiger's home page</a><br> <a href="http://www.danks.org/mark"> Mark Dank's home page</a><br> -<a href="http://wonk.epy.co.at">Pd page on Wonk (Klaus)</a><br> <a href="http://iem.kug.ac.at/~zmoelnig/index.html"> Johannes M Zmoelnig</a><br> -<a href="http://iem.kug.ac.at/~math/pd/"> Norbert Math's Pd page</a> <br> -<a href="http://iem.kug.ac.at/pdwiki/"> -Nicolas Lhommet's WikiWikiWeb page for Pd</a><br> -<a href="http://iem.kug.ac.at/pdb/"> Norbert's searchable list of all known -Pd objects</a><br> <a href="http://suita.chopin.edu.pl/~czaja/miXed/externs/xeq.html"> Krzysztof Czaja's MIDI file support </a><br> <a href="http://www.davesabine.com/media/puredata.asp?action=pddp"> @@ -142,7 +134,7 @@ Fernando Pablo Lopez's augmented Pd RPMs from Planet CCRMA</a><br> <a href="http://suita.chopin.edu.pl/~czaja/miXed/externs/cyclone.html"> Cyclone - Krzysztof Czaja's Max compatibility library</a><br> -On-line book project: +On-line book: <A HREF="http://www.crca.ucsd.edu/~msp/techniques.htm" <I> Theory and Techniques of Electronic Music </I> <br> Modified: branches/pd-extended/0.41/pd/doc/1.manual/x2.htm =================================================================== --- branches/pd-extended/0.41/pd/doc/1.manual/x2.htm 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/1.manual/x2.htm 2009-01-10 01:15:48 UTC (rev 10495) @@ -25,7 +25,7 @@ such as how to generate time-varying sounds that don't click or fold over, try the on-line book, <A HREF="http://www.crca.ucsd.edu/~msp/techniques.htm" -<I> Theory and Techniques of Electronic Music </I>. +<I> Theory and Techniques of Electronic Music </I></A>. <H3> <A name=s1> 2.1 overview </A> </H3> Modified: branches/pd-extended/0.41/pd/doc/1.manual/x3.htm =================================================================== --- branches/pd-extended/0.41/pd/doc/1.manual/x3.htm 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/1.manual/x3.htm 2009-01-10 01:15:48 UTC (rev 10495) @@ -17,12 +17,11 @@ <BR><BR> </P> -<P>Pd runs under Irix, Microsoft Windows, Linux, and MacOS 10.2 (Jaguar). -How to get Pd up and running depends on your operating system, -but the overall strategy is the same. -You must first get and install it, and -then untangle whatever problems arise in handling audio and MIDI input -and output, and finally get Pd to meet its real-time obligations reliably. +<P>Pd runs under Microsoft Windows, Linux, and MacOS (10.2 or later). How to +get Pd up and running depends on your operating system, but the overall strategy +is the same. You must first get and install it, and then untangle whatever +problems arise in handling audio and MIDI input and output, and finally get Pd +to meet its real-time obligations reliably. <P> Installation instructions are platform-specfic; the following four sections @@ -145,10 +144,9 @@ give you a separate inlet to specify which of the open MIDI port numbers you want. -<P> System exclusive MIDI message input and output is theoretically supported -in version 0.37 but does not work correctly on windows, even in 0.38. +<P> System exclusive MIDI message input and output are theoretically supported +but does not work uniformly across all operating systems.. - <H3> <A name=s1.1> 3.2. Installing Pd in Microsoft Windows </A> </H3> <P> Pd should work under any version of Windows since 95. You can download as @@ -211,32 +209,17 @@ recent problems; if you have found a new problem you're welcome to post it to the list.) -<P> If you're running RedHat or Mandrake you might want to use RPM to install -Pd. For other linux distributions, download the "tar.gz" version and compile -Pd. +<P> Pd is available via the package systems for some linux distributions, +but not always in the most recent version possible. It's relatively easy to +compile your own copy of Pd and that is the approach described here. -<H4> Getting Pd as an RPM </H4> - -<P> Download Pd, perhaps from - <a href="http://www.crca.ucsd.edu/~msp/software.html"> - http://www.crca.ucsd.edu/~msp/software.html</A> , -to a file such as "pd-0.33-0.i386.rpm". -Open a "shell" window, cd to -the directory containing the file, and type the command, -<PRE> - rpm -i pd-0.33-0.i386.rpm -</PRE> - -<P> (substituting the real file name.) Then you should be able to type "pd" -to a shell and watch the Pd main window appear. - <H4> Getting Pd as a .tar.gz </H4> <P> Before you start, you might want to check that you have the resources Pd needs. The main things you need are the C compiler, X windows (including -the X development package for Pd to link against) and TK. If you're running -Redhat or Mandrake 7.x or up, I think these are all present by default. -The RedHat X client developer "RPM" package is called XFree86-devel. +the X development package for Pd to link against) and TK. It's almost +always enough to load "tcl-devel" and "tk-devel" packages using yum or +apt-get. <P> Download Pd, perhaps from @@ -254,7 +237,6 @@ <P> <BR> ./configure -<BR> make depend <BR> make </P> @@ -410,16 +392,9 @@ possibly so that you can get the newest version before it shows up compiled for Mac OS X. -<P> To be able to compile Pd, you must have installed Tcl/Tk -specifically in -/Applications/Wish Shell.app -and /Library/Frameworks/Tk.framework and /Library/Frameworks/Tcl.framework. +<P> To be able to compile Pd, you must have Tcl/Tk installed in the standard +places. I think this is true fro all reasoably recent releases of OSX. -<P> First download and install TK for OSX. I get it from: -<A href=http://tcltkaqua.sourceforge.net/> -http://tcltkaqua.sourceforge.net/. </A> - - <P> Then, just as for linux, just unload pd-whatever.tar.gz into a directory such as ~/pd-0.36-0, cd to pd-0.36-0/src, type "./configure" and "make". Then type ~/pd-0.36-0/bin/pd to a shell and enjoy! @@ -446,109 +421,6 @@ MIDI interface installed. I've seen this done with Midisport devices and I think you just download the OSX driver and follow directions. -<H3> <A name=s1.4> 3.5. Installing Pd in IRIX (SGI machines) </A> </H3> - -<P> (NOTE: as of release 0.35 I haven't had an IRIX machine to compile -Pd on. Soeren Bovbjerg has kindly compiled 0.35 and 0.36 for IRIX; -you can find these at -<A href="http://www.cvmt.dk/~sb/"> http://www.cvmt.dk/~sb/ </A>.) - -<P> Download Pd, which will be a "tar.Z" file. You can unpack this by -typing "zcat [name].tar.Z | tar xf -" to a shell. This creates a directory -named "pd". - -<P> -Starting with release 0.25, Pd should come in "n32" and "o32" versions. -"o32" is the default and will run on IRIX 5.x and up. "n32" runs faster, -but only on 6.x and up. Also, "externs" have to be updated for n32. The -"pd" executable (bin/pd in the distribution) is a symbolic link to either -"pd-o32" or "pd-n32." - -<P> NOTE: "externs" appear to be broken in the N32 version... I'm not sure -how long this has been true. If you want to use external objects, you have -to use the O32 version. - -<P> -If for example you put Pd in ~, the executable program -will be ~/pd/bin/pd. The program looks at its command line to -figure out where it is, so it's best to invoke Pd by its full pathname. -You should always invoke Pd from a Unix shell because many important -messages appear on the standard error. - -<P> -The simplest way to invoke Pd is to -make an alias in your ".cshrc" file (assuming you use the "c" shell) such as: -</P> -<PRE> - - alias pd ~/pd/bin/pd - -</PRE> -<P>(assuming your Pd distribution landed in ~, for example). - -<P> -Pd will open the "default" audio input and output devices, without regard -for whether they are in sync or not. This will be bad if they aren't; use -the "-noadc" or "-nodac" flag to disable either the input or output. Pd is -supposed to handle up to 8 channels of audio in and/or out. (But at least -one user had to recompile Pd on his Onyx to get 8 channels working.) - -<P> -As to MIDI, Pd simply attempts to open all available MIDI devices for input and -output, which is probably very bad on anything more recent than my Indy. If -any MIDI ports fail to open either for input or output, all MIDI is disabled. - -<P> Pd has not been fixed to request real-time priority from Irix; it will -compete with all other processes on your machine for CPU time. - -<H4> Audio and MIDI in IRIX </H4> - -<P> -Pd takes command line arguments to set the number of input and output channels -and the sample rate. These don't affect the SGI's audio settings, which you -have to set separately using the "audio panel." Pd does detect the audio -sample rate if you don't specify one on the command line. - -<P> -On SGI machines, you have to work to get MIDI running. Before you start Pd, verify -that least one MIDI port is configured open. Pd opens the FIRST MIDI port -that's open. You might want to get rid of the "software" MIDI port if you're -running 6.x. On Indys, the usual practice is to open serial port number 2 -because some systems configure port 1 as "console" by default. You can use the -GUI if you want, or else just type -<PRE> - - startmidi -d /dev/ttyd2 - -</PRE> - -<P>to get port 2 speaking MIDI, and - -<PRE> - - stopmidi - -</PRE> - -<P>to stop it. You can test whether MIDI is configured by typing, - -<PRE> - - ps -dafe | grep midi - -</PRE> - -<P>and looking for "startmidi" processes. - -<P> -It's a good idea to connect your serial port to your MIDI interface before -typing the "startmidi" command, not afterward, at least in 5.x. We use the -Opcode Studio 3 interface but in principle any Mac-compatible one should work. - -<P> -The O2 apparently has RS232 ports, not RS422. I think SGI's web site says -something about how to deal with this. - <H3> <A name=s4> 3.6. Preferences and startup options </A> </H3> <P> Pd's behavior may be customized to instruct it where to find files, which @@ -639,13 +511,12 @@ -listdev -- list audio and MIDI devices (linux specific audio:) --frags <n> -- specify number of audio fragments (defeats audiobuf) --fragsize <n> -- specify log of fragment size ('blocksize' is better...) -oss -- use ALSA audio drivers -alsa -- use ALSA audio drivers -pa -- use portaudio (experimental version 19) --alsadev <n> ----- obsolete: use -audiodev --32bit ---- (probably obsolete) -- use 32 bit OSS extension +-alsadev <n> -- obsolete: use -audiodev +-32bit -- (probably obsolete) -- use 32 bit OSS extension +-alsaadd <dev> -- add a device to the ALSA device list (Windows specific audio:) -mmio -- use MMIO drivers and API @@ -658,6 +529,7 @@ -nomidiin -- suppress MIDI input -nomidiout -- suppress MIDI output -nomidi -- suppress MIDI input and output +-alsamidi -- use ALSA midi API general flags: -path <path> -- add to file search path @@ -678,6 +550,7 @@ -send "msg..." -- send a message at startup (after patches are loaded) -rt or -realtime -- use real-time priority (needs root privilege) -nrt -- don't use real-time priority +-nosleep -- never relinquish CPU (only for multiprocessors!) </PRE> Modified: branches/pd-extended/0.41/pd/doc/1.manual/x5.htm =================================================================== --- branches/pd-extended/0.41/pd/doc/1.manual/x5.htm 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/1.manual/x5.htm 2009-01-10 01:15:48 UTC (rev 10495) @@ -20,13 +20,70 @@ <H3> <A name="s2"> 5.1. release notes </A> </H3> -<P> ------------------ 0.40-2 -------------------------- +<P> ------------------ 0.41-3,4 --------------------------- -<P> Fixed byte order problem in tabosc4~ on Intel Macs. +<P> 2 fixes for PC: no bonk~, and the audio device selection +dialogs didn't show all the devices. -<P> Fixed error in "list length" when fed a non-list message (now converts to -list and then reports length.) +<P> ------------------ 0.41-2 ---------------------------- +<P> More bug fixes: large netsends dropping messages, and crash bug when turning +DSP on and off repeatedly in MS windows + +<P> ------------------ 0.41-1 ---------------------------- + +<P> Fixed a startup problem for Mac OSX 10.5.1 (other platforms should not be affected) + +<P> ------------------ 0.41 ---------------------------- + +<P> Pd may be compiled in 64 bit address spaces; this is well tested on +linux and at least seems to work on Microsoft and MacOS. On linux, in fact, +if you compile Pd in a 64-bit version of the OS it's automatically in the +64 bit address space. + +<P> In linux, a "-nosleep" flag causes Pd to poll instead of sleeping as it +waits for dac and adc; this is useful on multiprocessors when you don't mind +having Pd occupy 100% of one processor and want to get latency as low as +possible. (If you don't use this, latency on multiprocessors - Intel Core 2 at +least - is much worse for some reason than it is on uniprocessors.) It's +"experimental" but I use it every day. + +<P> added an experimental callback scheduler. This might reduce latency in +MacOS and/or Microsoft, although I haven't seen that actually happen yet. + +<P> removed limitation on huge messages from text files; this prevented long +"data" arrays from reloading from disk correctly. + +<P> fixed crash bug closing patches with open GOPs. + +<P> changed selection strategy so that, right after duplicating a collection +of objects, clicking tends to select an already-selected object. + +<P> the cursor changes slightly more apprpriately when switching between edit +to run modes. + +<P> got really confused about the proper role of "declare 'path" in abstractions; +for the moment they are ignored. I the future, it may be worthwhile to allow +them but to have them act only locally to the abstraction; but this might mean +a lot more computation overhead when opening files. + +<P> limited window sizes to that of the screen (otherwise, on Mac OS, it's +impossible to resize them.) + +<P> fixed "startup" dialogs to allow unlimited "path" and "lib" entries + +<P> started, but didn't finish, the process of getting Pd to compile with +t_float as 64 bits. This would slow Pd down but improve tabread4~'s accuracy. + +<P> made IEM Guis respect "-font" flag and friends. New startup flags: +"-font-face" (badly named); "-font-size" sysnonym of "-font". (Large patch from +HC). + +<P> String overflow protection here and there. + +<P> migrated to ".net" compiler ("VC 2005", a free download). + + <P> ------------------ 0.40-1 -------------------------- <P> Fixed "declare" which wasn't working properly yet in 0.40-0, and Modified: branches/pd-extended/0.41/pd/doc/3.audio.examples/E07.evenodd.pd =================================================================== --- branches/pd-extended/0.41/pd/doc/3.audio.examples/E07.evenodd.pd 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/3.audio.examples/E07.evenodd.pd 2009-01-10 01:15:48 UTC (rev 10495) @@ -38,11 +38,11 @@ #X text 299 152 <--transpose; #N canvas 0 0 538 208 make-table 0; #X obj 38 71 loadbang; -#X text 16 11 This patch loads a sequence of pitches into E07. The +#X text 16 11 This patch loads a sequence of pitches into array1. The values are floating-point \, so we could use microtones (60.5 \, for example) if we wish.; -#X msg 38 99 \; E07 0 55 56 57 55 57 61 55 61 63 57 63 \; E07 -yticks 36 12 1 \; E07 ylabel 12 36 48 60 72 84 96; +#X msg 38 99 \; array1 0 55 56 57 55 57 61 55 61 63 57 63 \; array1 +yticks 36 12 1 \; array1 ylabel 12 36 48 60 72 84 96; #X connect 0 0 2 0; #X restore 527 195 pd make-table; #X obj 176 50 sel 0; Modified: branches/pd-extended/0.41/pd/doc/3.audio.examples/E10.complex.FM.pd =================================================================== --- branches/pd-extended/0.41/pd/doc/3.audio.examples/E10.complex.FM.pd 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/3.audio.examples/E10.complex.FM.pd 2009-01-10 01:15:48 UTC (rev 10495) @@ -43,7 +43,7 @@ #X text 273 232 toggle to graph repeatedly; #X text 262 212 bang to graph once; #X obj 16 494 t b f; -#X obj 19 295 tabwrite~ E10-spectrum; +#X obj 19 295 tabwrite~ E10-signal; #X obj 208 295 tabwrite~ E10-spectrum; #X text 72 536 set carrier multiplier and modulation multipliers after fundamental; Modified: branches/pd-extended/0.41/pd/doc/3.audio.examples/H04.filter.sweep.pd =================================================================== --- branches/pd-extended/0.41/pd/doc/3.audio.examples/H04.filter.sweep.pd 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/3.audio.examples/H04.filter.sweep.pd 2009-01-10 01:15:48 UTC (rev 10495) @@ -1,4 +1,4 @@ -#N canvas 360 22 557 528 12; +#N canvas 360 15 553 524 12; #X floatatom 44 146 5 0 150 0 - #0-pitch -; #X text 126 9 SWEEPING FILTERS; #X obj 44 193 phasor~; @@ -43,30 +43,6 @@ "vcf~" instead of "bp~". The vcf~ module takes an audio signal to set center frequency. (Q is still set by messages though.) Vcf is computationally somewhat more expensive than bp~.; -#N canvas 0 22 612 404 conversion-tables 0; -#N canvas 0 22 450 300 graph2 0; -#X array mtof 130 float 1; -#A 0 8.1758 8.66196 9.17702 9.72272 10.3009 10.9134 11.5623 12.2499 -12.9783 13.75 14.5676 15.4339 16.3516 17.3239 18.354 19.4454 20.6017 -21.8268 23.1247 24.4997 25.9565 27.5 29.1352 30.8677 32.7032 34.6478 -36.7081 38.8909 41.2034 43.6535 46.2493 48.9994 51.9131 55 58.2705 -61.7354 65.4064 69.2957 73.4162 77.7817 82.4069 87.3071 92.4986 97.9989 -103.826 110 116.541 123.471 130.813 138.591 146.832 155.563 164.814 -174.614 184.997 195.998 207.652 220 233.082 246.942 261.626 277.183 -293.665 311.127 329.628 349.228 369.994 391.995 415.305 440 466.164 -493.883 523.251 554.365 587.33 622.254 659.255 698.456 739.989 783.991 -830.609 880 932.328 987.767 1046.5 1108.73 1174.66 1244.51 1318.51 -1396.91 1479.98 1567.98 1661.22 1760 1864.66 1975.53 2093 2217.46 2349.32 -2489.02 2637.02 2793.83 2959.96 3135.96 3322.44 3520 3729.31 3951.07 -4186.01 4434.92 4698.64 4978.03 5274.04 5587.65 5919.91 6271.93 6644.88 -7040 7458.62 7902.13 8372.02 8869.84 9397.27 9956.06 10548.1 11175.3 -11839.8 12543.9 13289.8 14080; -#X coords 0 12000 130 0 200 100 1; -#X restore 309 225 graph; -#X text 319 333 ------ 130 samples ------; -#X text 518 318 0; -#X text 520 218 12000; -#X restore 168 463 pd conversion-tables; #X connect 0 0 21 0; #X connect 2 0 8 0; #X connect 3 0 9 0; Modified: branches/pd-extended/0.41/pd/doc/3.audio.examples/H05.filter.floyd.pd =================================================================== --- branches/pd-extended/0.41/pd/doc/3.audio.examples/H05.filter.floyd.pd 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/3.audio.examples/H05.filter.floyd.pd 2009-01-10 01:15:48 UTC (rev 10495) @@ -1,31 +1,30 @@ -#N canvas 288 109 559 650 12; -#N canvas 0 22 604 396 conversion-tables 0; -#N canvas 0 22 450 300 graph1 0; +#N canvas 708 41 555 646 12; +#N canvas 0 0 600 392 conversion-tables 0; +#N canvas 0 0 450 300 graph1 0; #X array dbtorms 123 float 1; #A 0 0 0 1.25893e-05 1.41254e-05 1.58489e-05 1.77828e-05 1.99526e-05 2.23872e-05 2.51189e-05 2.81838e-05 3.16228e-05 3.54813e-05 3.98107e-05 4.46684e-05 5.01187e-05 5.62341e-05 6.30957e-05 7.07946e-05 7.94328e-05 -8.91251e-05 0.0001 0.000112202 0.000125893 0.000141254 0.000158489 -0.000177828 0.000199526 0.000223872 0.000251189 0.000281838 0.000316228 -0.000354813 0.000398107 0.000446684 0.000501187 0.000562341 0.000630957 -0.000707946 0.000794328 0.000891251 0.001 0.00112202 0.00125893 0.00141254 -0.00158489 0.00177828 0.00199526 0.00223872 0.00251189 0.00281838 0.00316228 -0.00354813 0.00398107 0.00446684 0.00501187 0.00562341 0.00630957 0.00707946 -0.00794328 0.00891251 0.01 0.0112202 0.0125893 0.0141254 0.0158489 -0.0177828 0.0199526 0.0223872 0.0251189 0.0281838 0.0316228 0.0354813 -0.0398107 0.0446684 0.0501187 0.0562341 0.0630957 0.0707946 0.0794328 -0.0891251 0.1 0.112202 0.125893 0.141254 0.158489 0.177828 0.199526 -0.223872 0.251189 0.281838 0.316228 0.354813 0.398107 0.446684 0.501187 -0.562341 0.630957 0.707946 0.794328 0.891251 1 1.12202 1.25893 1.41254 -1.58489 1.77828 1.99526 2.23872 2.51189 2.81838 3.16228 3.54813 3.98107 -4.46684 5.01187 5.62341 6.30957 7.07946 7.94328 8.91251 10 11.2202 -12.5893; +8.91251e-05 1e-04 0.000112202 0.000125893 0.000141254 0.000158489 0.000177828 +0.000199526 0.000223872 0.000251189 0.000281838 0.000316228 0.000354813 +0.000398107 0.000446684 0.000501187 0.000562341 0.000630957 0.000707946 +0.000794328 0.000891251 0.001 0.00112202 0.00125893 0.00141254 0.00158489 +0.00177828 0.00199526 0.00223872 0.00251189 0.00281838 0.00316228 0.00354813 +0.00398107 0.00446684 0.00501187 0.00562341 0.00630957 0.00707946 0.00794328 +0.00891251 0.01 0.0112202 0.0125893 0.0141254 0.0158489 0.0177828 0.0199526 +0.0223872 0.0251189 0.0281838 0.0316228 0.0354813 0.0398107 0.0446684 +0.0501187 0.0562341 0.0630957 0.0707946 0.0794328 0.0891251 0.1 0.112202 +0.125893 0.141254 0.158489 0.177828 0.199526 0.223872 0.251189 0.281838 +0.316228 0.354813 0.398107 0.446684 0.501187 0.562341 0.630957 0.707946 +0.794328 0.891251 1 1.12202 1.25893 1.41254 1.58489 1.77828 1.99526 +2.23872 2.51189 2.81838 3.16228 3.54813 3.98107 4.46684 5.01187 5.62341 +6.30957 7.07946 7.94328 8.91251 10 11.2202 12.5893; #X coords 0 10 123 0 200 100 1; #X restore 302 48 graph; #X text 504 141 0; #X text 506 41 10; #X text 321 151 ------ 123 samples ------; -#N canvas 0 22 450 300 graph2 0; +#N canvas 0 0 450 300 graph2 0; #X array mtof 130 float 1; #A 0 8.1758 8.66196 9.17702 9.72272 10.3009 10.9134 11.5623 12.2499 12.9783 13.75 14.5676 15.4339 16.3516 17.3239 18.354 19.4454 20.6017 @@ -66,7 +65,7 @@ #X obj 55 145 + 1; #X obj 22 217 mtof; #X obj 55 169 mod 8; -#N canvas 0 22 450 300 graph1 0; +#N canvas 0 0 450 300 graph1 0; #X array \$0-array1 8 float 2; #X coords 0 96 8 36 200 100 1; #X restore 340 144 graph; @@ -75,9 +74,9 @@ #X text 107 147 sequencer for; #X text 122 164 8 note loop; #X obj 16 576 output~; -#X obj 22 104 tgl 15 0 empty \$0-metro empty 0 -6 0 8 -262144 -1 -1 -0 1; -#N canvas 876 177 379 259 startup 0; +#X obj 22 104 tgl 15 0 empty \$1-metro empty 0 -6 0 8 -262144 -1 -1 +1 1; +#N canvas 876 177 375 255 startup 0; #X obj 22 24 loadbang; #X obj 22 48 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; Modified: branches/pd-extended/0.41/pd/doc/3.audio.examples/I07.phase.vocoder.pd =================================================================== --- branches/pd-extended/0.41/pd/doc/3.audio.examples/I07.phase.vocoder.pd 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/3.audio.examples/I07.phase.vocoder.pd 2009-01-10 01:15:48 UTC (rev 10495) @@ -1,8 +1,8 @@ -#N canvas 425 33 744 599 12; +#N canvas 164 25 744 599 12; #X floatatom 494 315 5 0 0 0 - transpo-set -; #X floatatom 167 383 3 0 0 0 - speed-set -; #X floatatom 55 385 7 0 0 0 - location-set -; -#N canvas 90 42 821 693 fft-analysis 0; +#N canvas 199 40 821 693 fft-analysis 0; #X obj 51 477 *~; #X obj 18 477 *~; #X obj 18 499 -~; @@ -39,7 +39,7 @@ #X obj 97 425 q8_rsqrt~; #N canvas 139 105 1006 799 read-windows 0; #X obj 18 693 *~; -#X obj 340 448 r window-size; +#X obj 364 448 r window-size; #X obj 156 300 f; #X obj 102 91 r window-size; #X obj 102 139 /; @@ -60,14 +60,14 @@ #X text 188 394 reading location (samples); #X obj 51 597 / 4; #X obj 288 245 * 0.01; -#X floatatom 340 498 7 0 0 0 - - -; -#X obj 340 474 *; -#X obj 499 365 r transpo; -#X obj 499 387 * 0.01; -#X obj 501 408 + 69; -#X obj 502 429 mtof; -#X obj 502 451 / 440; -#X obj 375 474 t b f; +#X floatatom 364 498 7 0 0 0 - - -; +#X obj 364 474 *; +#X obj 502 347 r transpo; +#X obj 502 369 * 0.01; +#X obj 504 390 + 69; +#X obj 505 411 mtof; +#X obj 505 433 / 440; +#X obj 399 474 t b f; #X obj 19 719 outlet~; #X obj 195 720 outlet~; #X obj 218 664 tabreceive~ \$0-hann; @@ -77,7 +77,7 @@ #X obj 768 508 r speed; #X msg 768 532 set \$1; #X obj 768 557 s speed-set; -#X text 411 498 stretched window size (samples); +#X text 432 498 stretched window size (samples); #X obj 877 507 r transpo; #X msg 877 533 set \$1; #X obj 877 558 s transpo-set; @@ -123,8 +123,8 @@ #X obj 845 684 r auto; #X obj 730 685 r no-detune; #X msg 730 707 \; detune 0; -#X text 326 275 loop to precess the location according; -#X text 325 291 to the "speed" parameter.; +#X text 321 280 loop to precess the location according; +#X text 320 296 to the "speed" parameter.; #X text 611 31 if location changes \, update number box; #X text 610 50 in main window via "location-set" \, but; #X text 613 69 taking care to limit frequency of updates.; @@ -136,6 +136,14 @@ #X text 496 527 "rewind" control takes us; #X text 499 545 to a location depending on; #X text 499 564 stretched window size.; +#X obj 593 457 t b f; +#X obj 617 395 samplerate~; +#X obj 593 348 r \$0-insamprate; +#X obj 593 418 /; +#X obj 505 455 * 1; +#X text 494 312 desired transposition and sample; +#X text 494 329 rate correction for soundfile; +#X obj 593 370 t f b; #X connect 0 0 30 0; #X connect 1 0 23 0; #X connect 2 0 11 0; @@ -171,7 +179,7 @@ #X connect 25 0 26 0; #X connect 26 0 27 0; #X connect 27 0 28 0; -#X connect 28 0 29 0; +#X connect 28 0 99 0; #X connect 29 0 23 0; #X connect 29 1 23 1; #X connect 32 0 5 1; @@ -216,6 +224,14 @@ #X connect 77 0 75 0; #X connect 79 0 78 0; #X connect 80 0 81 0; +#X connect 95 0 99 0; +#X connect 95 1 99 1; +#X connect 96 0 98 1; +#X connect 97 0 102 0; +#X connect 98 0 95 0; +#X connect 99 0 29 0; +#X connect 102 0 98 0; +#X connect 102 1 96 0; #X restore 109 133 pd read-windows; #X obj 137 543 tabsend~ prev-imag; #X obj 136 567 tabsend~ prev-real; @@ -347,11 +363,11 @@ #X connect 54 0 21 0; #X restore 55 480 pd fft-analysis; #N canvas 260 23 647 768 phase-tables 0; -#N canvas 0 0 450 300 graph2 0; +#N canvas 0 0 450 300 (subpatch) 0; #X array prev-imag 4096 float 0; #X coords 0 1000 4096 -1000 400 300 1; #X restore 169 326 graph; -#N canvas 0 0 450 300 graph3 0; +#N canvas 0 0 450 300 (subpatch) 0; #X array prev-real 4096 float 0; #X coords 0 500 4096 -500 400 300 1; #X restore 170 17 graph; @@ -362,9 +378,9 @@ #X text 389 359 normal; #X obj 56 517 output~; #N canvas 0 110 565 454 hann-window 0; -#N canvas 0 0 450 300 graph1 0; -#X array \$0-hann 1024 float 0; -#X coords 0 1 1023 0 300 100 1; +#N canvas 0 0 450 300 (subpatch) 0; +#X array \$0-hann 4096 float 0; +#X coords 0 1 4095 0 300 100 1; #X restore 82 311 graph; #X obj 378 165 osc~; #X obj 378 190 *~ -0.5; @@ -412,9 +428,9 @@ #X connect 19 1 18 0; #X restore 440 528 pd hann-window; #N canvas 388 86 694 447 insample 0; -#N canvas 0 0 450 300 graph1 0; -#X array \$0-sample 160161 float 0; -#X coords 0 1 160160 -1 400 150 1; +#N canvas 0 0 450 300 (subpatch) 0; +#X array \$0-sample 82301 float 0; +#X coords 0 1 82300 -1 400 150 1; #X restore 281 135 graph; #X obj 28 133 r read-sample; #X obj 28 184 unpack s f; @@ -433,12 +449,12 @@ #X obj 28 381 * 1000; #X obj 28 404 s \$0-samp-msec; #X obj 66 357 r \$0-insamprate; -#X obj 29 70 hip~ 5; -#X obj 29 46 adc~ 1; +#X obj 37 68 hip~ 5; +#X obj 37 44 adc~ 1; #X obj 29 9 inlet; -#X obj 91 46 samplerate~; +#X obj 99 44 samplerate~; #X obj 29 93 tabwrite~ \$0-sample; -#X obj 91 70 s \$0-insamprate; +#X obj 99 68 s \$0-insamprate; #X msg 285 383 \; read-sample ../sound/voice.wav; #X obj 276 20 inlet; #X obj 276 42 openpanel; @@ -463,7 +479,7 @@ #X connect 18 0 22 0; #X connect 19 0 18 0; #X connect 20 0 21 0; -#X connect 20 0 19 0; +#X connect 20 0 22 0; #X connect 21 0 23 0; #X connect 25 0 26 0; #X connect 26 0 27 0; @@ -485,7 +501,6 @@ #X obj 262 408 s rewind; #X msg 345 336 200; #X msg 345 358 100; -#X msg 345 380 20; #X text 386 335 contract; #X text 390 380 expand; #X obj 493 407 s lock; @@ -527,6 +542,7 @@ #X obj 535 460 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X text 466 458 file ->; +#X msg 345 380 20; #X connect 0 0 5 0; #X connect 1 0 21 0; #X connect 2 0 20 0; @@ -536,13 +552,13 @@ #X connect 14 0 16 0; #X connect 15 0 16 0; #X connect 17 0 11 0; -#X connect 19 0 29 0; +#X connect 19 0 28 0; #X connect 22 0 23 0; -#X connect 24 0 49 0; -#X connect 25 0 49 0; -#X connect 26 0 49 0; -#X connect 39 0 43 0; -#X connect 40 0 43 0; -#X connect 41 0 43 0; -#X connect 42 0 43 0; -#X connect 53 0 11 1; +#X connect 24 0 48 0; +#X connect 25 0 48 0; +#X connect 38 0 42 0; +#X connect 39 0 42 0; +#X connect 40 0 42 0; +#X connect 41 0 42 0; +#X connect 52 0 11 1; +#X connect 54 0 48 0; Modified: branches/pd-extended/0.41/pd/doc/3.audio.examples/J01.even.odd.pd =================================================================== --- branches/pd-extended/0.41/pd/doc/3.audio.examples/J01.even.odd.pd 2009-01-09 17:23:55 UTC (rev 10494) +++ branches/pd-extended/0.41/pd/doc/3.audio.examples/J01.even.odd.pd 2009-01-10 01:15:48 UTC (rev 10495) @@ -40,7 +40,7 @@ #X text 95 350 output level; #X text 100 308 for difference; #X text 157 77 <-- click to graph; -#X msg 148 97 \; pd dsp 1; +#X msg 148 97 \; pd DSP 1; #X obj 138 247 tabwrite~ \$0-difference; #X obj 138 270 tabwrite~ \$0-sum; #X obj 138 138 tabwrite~ \$0-phasor; Added: branches/pd-extended/0.41/pd/doc/4.data.structures/14.partialtracer.pd =================================================================== --- branches/pd-extended/0.41/pd/doc/4.data.structures/14.partialtracer.pd (rev 0) +++ branches/pd-extended/0.41/pd/doc/4.data.structures/14.partialtracer.pd 2009-01-10 01:15:48 UTC (rev 10495) @@ -0,0 +1,2640 @@ +#N struct peak-template float x float y float amp float ampreal float +ampimag float used; +#N struct trace-template float x float y float voiceno array bazoo +point-template; +#N struct point-template float y float amp; +#N canvas 50 62 913 595 12; +#X declare -path lib; +#X floatatom 777 72 0 0 0 0 - - -; +#N canvas 516 98 663 557 (subpatch) 0; +#X obj 103 108 outlet; +#X msg 101 80 set \$1; +#X obj 103 57 r osc-amp; +#X connect 1 0 0 0; +#X connect 2 0 1 0; +#X restore 777 52 pd; +#X obj 781 99 s osc-amp; +#X obj 121 513 pack 0 100; +#X obj 122 533 line~; +#X obj 121 493 dbtorms; +#X obj 122 573 *~; +#X floatatom 811 225 0 0 0 0 - - -; +#X msg 668 269 0; +#X floatatom 737 225 0 0 0 0 - - -; +#X floatatom 838 290 0 0 0 0 - - -; +#X floatatom 647 71 0 0 0 0 - - -; +#N canvas 516 98 663 555 (subpatch) 0; +#X obj 103 108 outlet; +#X msg 101 80 set \$1; +#X obj 103 57 r grain-amp; +#X connect 1 0 0 0; +#X connect 2 0 1 0; +#X restore 647 51 pd; +#N canvas 168 244 589 236 peak-template 0; +#X obj 81 52 filledpolygon 3 3 3 0 0 0 amp 0 0; +#X obj 74 10 struct peak-template float x float y float amp float ampreal +float ampimag float used; +#X restore 417 525 pd peak-template; +#N canvas 0 0 600 386 peak-list 0; +#X scalar peak-template 15.9467 330 -253.674 -0.0844134 0.146416 0 +\;; +#X scalar peak-template 8.09598 330 -245.031 -0.108977 0.0532605 0 +\;; +#X scalar peak-template 21.9063 330 -199.607 0.00667672 -0.0201446 +0 \;; +#X scalar peak-template 31.1714 330 -199.12 -0.0160738 -0.0132465 0 +\;; +#X scalar peak-template 37.8022 330 -186.266 0.0101767 -0.00762841 +0 \;; +#X scalar peak-template 45.3485 330 -173.243 0.00456202 0.00622276 +0 \;; +#X scalar peak-template 220.731 330 -164.961 0.00271994 0.00491236 +0 \;; +#X scalar peak-template 55.8179 330 -162.658 -0.00364487 -0.00362429 +0 \;; +#X scalar peak-template 214.238 330 -156.636 0.00401102 0.000744068 +0 \;; +#X scalar peak-template 230.388 330 -142.193 -0.00175354 -0.00155481 +0 \;; +#X scalar peak-template 205.698 330 -136.685 -0.000451968 -0.00184241 +0 \;; +#X scalar peak-template 236.854 330 -132.195 -0.000800401 -0.00138174 +0 \;; +#X scalar peak-template 70.1927 330 -129.01 0.000948857 -0.00104714 +0 \;; +#X scalar peak-template 60.6268 330 -128.771 -0.000107766 -0.00139602 +0 \;; +#X scalar peak-template 199.238 330 -125.184 -5.5269e-05 -0.00121886 +0 \;; +#X scalar peak-template 102.284 330 -124.713 -0.000952367 -0.000727166 +0 \;; +#X scalar peak-template 244.654 330 -122.402 0.00059125 -0.000923529 +0 \;; +#X scalar peak-template 183.608 330 -113.564 -0.000686308 0.000373077 +0 \;; +#X scalar peak-template 190.466 330 -112.684 -0.000702548 0.000277037 +0 \;; +#X scalar peak-template 84.4082 330 -115.848 0.000835569 -0.000170076 +0 \;; +#X scalar peak-template 110.158 330 -115.091 -0.000114203 -0.000820379 +0 \;; +#X scalar peak-template 174.392 330 -107.624 0.000512748 0.000351938 +0 \;; +#X scalar peak-template 80.1102 330 -113.14 0.000618534 0.000456133 +0 \;; +#X scalar peak-template 141.065 330 -111.26 -0.000159838 0.000696955 +0 \;; +#X scalar peak-template 145.025 330 -112.295 4.48536e-05 -0.000742662 +0 \;; +#X scalar peak-template 163.713 330 -114.302 -0.000229612 -0.000770083 +0 \;; +#X scalar peak-template 256.421 330 -108.415 -0.000640719 2.18195e-05 +0 \;; +#X scalar peak-template 95.2051 330 -107.09 -0.000515788 0.000324372 +0 \;; +#X scalar peak-template 165.648 330 -114.439 -1.60569e-06 -0.000807809 +0 \;; +#X scalar peak-template 89.2754 330 -106.473 -0.000464049 -0.000372468 +0 \;; +#X scalar peak-template 132.642 330 -104.089 0.000416856 -0.000348003 +0 \;; +#X scalar peak-template 153.158 330 -103.434 0.000512355 0.000133827 +0 \;; +#X scalar peak-template 251.197 330 -100.22 0.000392843 -0.000254521 +0 \;; +#X scalar peak-template 347.16 330 -85.9684 3.49439e-05 -0.000268635 +0 \;; +#X scalar peak-template 330.571 330 -82.4952 4.08495e-05 0.000233548 +0 \;; +#X scalar peak-template 405.095 330 -88.7124 7.36761e-05 0.000291825 +0 \;; +#X scalar peak-template 262.479 330 -85.5605 -0.000191953 0.000185144 +0 \;; +#X scalar peak-template 339.087 330 -74.6482 -0.000174823 1.47393e-05 +0 \;; +#X scalar peak-template 120.042 330 -83.9036 0.000143925 0.000204734 +0 \;; +#X scalar peak-template 358.272 330 -78.8 8.69116e-05 0.000186489 0 +\;; +#X scalar peak-template 354.205 330 -73.5409 0.000146517 -8.24945e-05 +0 \;; +#X scalar peak-template 126.537 330 -77.5044 0.000190048 -4.69769e-05 +0 \;; +#X scalar peak-template 294.253 330 -71.6206 0.000148961 4.69971e-05 +0 \;; +#X scalar peak-template 321.286 330 -67.3834 0.00013192 -1.48824e-05 +0 \;; +#X scalar peak-template 275.468 330 -75.9748 -0.000131166 0.000129904 +0 \;; +#X scalar peak-template 311.823 330 -71.1847 -0.000103525 -0.000113481 +0 \;; +#X scalar peak-template 421.5 330 -79.8282 -1.07796e-05 -0.000213756 +0 \;; +#X scalar peak-template 303.301 330 -72.7543 -0.000115625 0.000115095 +0 \;; +#X scalar peak-template 117.451 330 -81.3611 0.000223316 4.0704e-05 +0 \;; +#X scalar peak-template 412.706 330 -75.2429 -0.000111227 0.000140877 +0 \;; +#X restore 289 433 pd peak-list; +#N canvas 127 256 695 457 trace-list 0; +#X scalar trace-template 0 0 30 \; -178.597 75.8502 \; \;; +#X scalar trace-template 0 0 29 \; -229.903 71.1492 \; \;; +#X scalar trace-template 0 0 28 \; -233.736 71.4227 \; \;; +#X scalar trace-template 0 0 27 \; -272.754 69.7491 \; \;; +#X scalar trace-template 0 0 26 \; -275.183 68.5407 \; \;; +#X scalar trace-template 0 0 25 \; -260.42 64.3633 \; \;; +#X scalar trace-template 0 0 24 \; -248.116 63.7381 \; \;; +#X scalar trace-template 0 0 23 \; -373.264 57.4964 \; \;; +#X scalar trace-template 0 0 22 \; -392.315 57.9334 \; \;; +#X scalar trace-template 0 0 21 \; -378.663 56.0813 \; \;; +#X scalar trace-template 0 0 20 \; -394.99 55.355 \; -394.979 57.9994 +\; -394.692 58.3019 \; -394.055 55.6905 \; -393.509 57.2162 \; -393.313 +56.7831 \; -393.855 50.9753 \; -394.993 39.0975 \; -395.055 24.2536 +\; \;; +#X scalar trace-template 0 0 19 \; -288.634 54.0192 \; -288.108 60.622 +\; -286.337 61.8614 \; -284.364 60.5135 \; -281.444 60.3517 \; -283.746 +54.7079 \; -284.294 52.282 \; -285.597 48.8974 \; -281.649 43.0502 +\; -282.587 35.4036 \; -279.777 43.7534 \; \;; +#X scalar trace-template 0 0 18 \; -300.544 54.1258 \; -299.278 58.8648 +\; -299.216 58.2397 \; -296.312 57.8306 \; -295.205 54.3912 \; -295.477 +48.1962 \; -291.309 47.7167 \; -289.404 45.3609 \; -292.975 34.8937 +\; -289.967 36.8729 \; \;; +#X scalar trace-template 0 0 17 \; -115.062 48.9992 \; \;; +#X scalar trace-template 0 0 16 \; -376.72 51.721 \; \;; +#X scalar trace-template 0 0 15 \; -375.565 49.8036 \; \;; +#X scalar trace-template 0 0 14 \; -388.582 53.2474 \; -388.502 57.3223 +\; -388.781 58.902 \; \;; +#X scalar trace-template 0 0 13 \; -418.195 52.3851 \; \;; +#X scalar trace-template 0 0 12 \; -370.125 54.9532 \; -370.478 58.1001 +\; -371.281 56.6915 \; -371.081 53.6248 \; -372.225 47.1432 \; -372.062 +34.7728 \; -371.006 32.7245 \; -371.056 25.9836 \; -371.476 20.8532 +\; -371.801 28.7417 \; \;; +#X scalar trace-template 0 0 11 \; -429.809 52.9756 \; -429.914 53.8303 +\; -429.869 53.3552 \; -429.815 49.6912 \; -429.742 43.0007 \; -430.073 +35.2616 \; -430.181 32.62 \; -430.621 32.4132 \; -431.137 31.2221 \; +\;; +#X scalar trace-template 0 0 10 \; -426.681 51.0897 \; -426.457 54.0308 +\; -426.292 56.6707 \; -426.289 53.7061 \; -426.295 46.8967 \; -426.44 +39.6391 \; -426.282 34.3685 \; -426.196 28.1082 \; -426.237 23.4197 +\; -426.092 30.4057 \; -426.081 52.0416 \; -426.487 58.7551 \; -426.618 +60.5526 \; -426.661 57.6203 \; -427.199 51.8828 \; \;; +#X scalar trace-template 0 0 9 \; -424.673 51.8353 \; -424.67 53.514 +\; -424.524 55.5399 \; -424.52 53.0089 \; -424.539 45.0279 \; -424.484 +36.3715 \; -424.181 34.5071 \; -424.018 31.5072 \; -424.283 25.7397 +\; -424.442 31.5626 \; \;; +#X scalar trace-template 0 0 8 \; -414.084 52.3259 \; -414.108 48.0801 +\; \;; +#X scalar trace-template 0 0 7 \; -428.192 50.9732 \; -428.116 53.9501 +\; -428.026 55.1471 \; -428.035 52.035 \; -428.005 44.5716 \; -428.316 +38.1777 \; -428.632 35.3351 \; -428.812 33.818 \; -429.036 27.6838 +\; \;; +#X scalar trace-template 0 0 6 \; -419.2 50.7626 \; -419.053 53.4971 +\; -418.775 55.5048 \; -418.956 51.3585 \; \;; +#X scalar trace-template 0 0 5 \; -423.09 51.8425 \; -422.7 54.2622 +\; -422.701 56.1942 \; -422.708 54.3654 \; -422.653 46.1241 \; \;; +#X scalar trace-template 0 0 4 \; -420.044 52.2358 \; -420.812 57.7638 +\; -420.855 57.8337 \; -420.714 53.5302 \; -420.893 42.0117 \; \;; +#X scalar trace-template 0 0 3 \; -428.993 50.7295 \; \;; +#X scalar trace-template 0 0 2 \; -416.029 50.2177 \; -416.487 50.4521 +\; -416.57 49.4765 \; -417.172 47.8461 \; \;; +#X scalar trace-template 0 0 1 \; -431.811 50.1489 \; -431.663 52.6158 +\; -431.511 52.5178 \; -431.461 47.3717 \; \;; +#X scalar trace-template 10 0 30 \; -177.255 85.914 \; \;; +#X scalar trace-template 10 0 29 \; -222.137 82.414 \; \;; +#X scalar trace-template 10 0 28 \; -270.989 73.3696 \; \;; +#X scalar trace-template 10 0 27 \; -250.2 72.8322 \; \;; +#X scalar trace-template 10 0 26 \; -373.893 62.6477 \; \;; +#X scalar trace-template 10 0 25 \; -391.667 59.7047 \; \;; +#X scalar trace-template 10 0 24 \; -295.292 56.5033 \; \;; +#X scalar trace-template 10 0 23 \; -369.952 57.2814 \; \;; +#X scalar trace-template 10 0 22 \; -379.088 54.1776 \; \;; +#X scalar trace-template 10 0 21 \; -393.187 56.5381 \; \;; +#X scalar trace-template 10 0 17 \; -389.956 56.1425 \; -389.639 61.4149 +\; -390.281 59.474 \; -390.556 61.3031 \; -391.617 54.3448 \; -391.91 +46.6189 \; -392.178 30.8388 \; \;; +#X scalar trace-template 10 0 16 \; -378.098 54.956 \; -378.642 50.3408 +\; -380.048 47.8017 \; -381.045 44.6683 \; -381.26 40.8197 \; -380.935 +33.4849 \; -381.055 21.4396 \; \;; +#X scalar trace-template 10 0 15 \; -366.577 57.1938 \; -366.355 52.5488 +\; -367.999 47.3516 \; -367.601 43.1288 \; -367.175 43.9925 \; -367.652 +38.4755 \; -367.174 27.6634 \; -366.832 26.3882 \; -366.999 44.2129 +\; \;; +#X scalar trace-template 10 0 13 \; -397.396 54.9437 \; -397.442 51.002 +\; -397.902 44.9888 \; -398.89 45.2213 \; -399.354 39.2694 \; -399.673 +30.6487 \; -399.564 20.6945 \; \;; +#X scalar trace-template 10 0 3 \; -385.81 54.0228 \; -387.042 53.9845 +\; -387.031 57.3174 \; -387.604 56.4156 \; -388.633 53.5605 \; -389.727 +49.2615 \; -389.337 37.6639 \; \;; +#X scalar trace-template 15 0 8 \; -173.741 86.2259 \; -172.451 85.6459 +\; -172.122 84.957 \; -171.836 84.091 \; -170.844 82.2424 \; -168.694 +78.3126 \; -162.509 72.9198 \; -153.742 66.4187 \; -147.937 66.0821 +\; \;; +#X scalar trace-template 20 0 30 \; -219.7 85.5829 \; \;; +#X scalar trace-template 20 0 29 \; -246.771 72.917 \; \;; +#X scalar trace-template 20 0 28 \; -266.652 71.9766 \; \;; +#X scalar trace-template 20 0 27 \; -258.839 63.8992 \; \;; +#X scalar trace-template 20 0 26 \; -389.349 59.4568 \; \;; +#X scalar trace-template 20 0 25 \; -390.855 56.6162 \; \;; +#X scalar trace-template 20 0 24 \; -277.737 58.9911 \; \;; +#X scalar trace-template 20 0 23 \; -392.304 59.3156 \; \;; +#X scalar trace-template 20 0 22 \; -395.275 52.9352 \; \;; +#X scalar trace-template 20 0 21 \; -396.343 52.1418 \; \;; +#X scalar trace-template 20 0 14 \; -354.863 51.5756 \; -354.398 48.7338 +\; -353.855 45.305 \; -354.267 37.1391 \; -354.35 26.9248 \; \;; +#X scalar trace-template 25 0 6 \; -219.622 86.3607 \; -218.681 85.9033 +\; -216.414 83.7364 \; -215.028 78.748 \; -213.28 72.8731 \; -219.219 +58.1946 \; -223.055 55.0234 \; -222.75 56.8182 \; -221.836 54.6951 +\; -208.169 62.4937 \; -215.467 62.0638 \; \;; +#X scalar trace-template 25 0 2 \; -246.756 70.9643 \; -242.506 68.0581 +\; \;; +#X scalar trace-template 25 0 1 \; -266.715 70.4533 \; -265.207 68.1829 +\; -265.46 62.1885 \; -268.066 51.5565 \; -267.044 42.725 \; -260.587 +51.9219 \; -261.276 56.2304 \; -259.335 56.1205 \; -261.722 49.962 +\; -264.065 56.9697 \; -263.789 66.2467 \; -264.859 73.5061 \; -265.3 +79.2527 \; -265.278 82.2911 \; -264.892 82.9032 \; -264.44 82.4271 +\; -264.101 81.3044 \; -263.889 78.2536 \; -264.814 72.5629 \; -265.295 +66.8389 \; -264.135 64.6203 \; -262.329 67.3229 \; -261.009 73.3983 +\; -259.863 78.6312 \; -259.232 81.7459 \; -258.632 81.0427 \; -256.712 +76.2963 \; -256.001 66.4938 \; -252.245 51.86 \; \;; +#X scalar trace-template 30 0 30 \; -390.328 52.7497 \; \;; +#X scalar trace-template 30 0 29 \; -390.962 56.7101 \; \;; +#X scalar trace-template 30 0 28 \; -277.856 51.8683 \; \;; +#X scalar trace-template 30 0 27 \; -387.594 50.7624 \; \;; +#X scalar trace-template 30 0 26 \; -393.141 50.049 \; \;; +#X scalar trace-template 30 0 25 \; -358.321 46.0483 \; \;; +#X scalar trace-template 30 0 24 \; -395.747 43.5341 \; \;; +#X scalar trace-template 30 0 23 \; -303.86 46.4658 \; \;; +#X scalar trace-template 30 0 22 \; -396.318 45.881 \; \;; +#X scalar trace-template 30 0 21 \; -362.737 43.4719 \; \;; +#X scalar trace-template 30 0 5 \; -384.568 43.5356 \; -384.194 30.6808 +\; -385.267 24.0572 \; \;; +#X scalar trace-template 30 0 4 \; -385.219 44.157 \; \;; +#X scalar trace-template 40 0 30 \; -237.332 58.5194 \; \;; +#X scalar trace-template 40 0 29 \; -257.238 52.2246 \; \;; +#X scalar trace-template 40 0 28 \; -19.0623 44.7978 \; \;; +#X scalar trace-template 40 0 27 \; -304.446 34.2777 \; \;; +#X scalar trace-template 40 0 26 \; -388.724 35.0512 \; \;; +#X scalar trace-template 40 0 25 \; -334.4 31.6579 \; \;; +#X scalar trace-template 40 0 24 \; -319.866 30.9914 \; \;; +#X scalar trace-template 40 0 23 \; -338.311 32.2715 \; \;; +#X scalar trace-template 40 0 22 \; -393.575 24.7233 \; \;; +#X scalar trace-template 40 0 21 \; -339.408 30.5127 \; \;; +#X scalar trace-template 40 0 4 \; -386.166 27.6566 \; -386.766 31.3263 +\; \;; +#X scalar trace-template 40 0 2 \; -430.885 31.1719 \; \;; +#X scalar trace-template 50 0 30 \; -421 56.3466 \; \;; +#X scalar trace-template 50 0 29 \; -264.847 53.6838 \; \;; +#X scalar trace-template 50 0 28 \; -421.257 55.0182 \; \;; +#X scalar trace-template 50 0 27 \; -269.989 51.2158 \; \;; +#X scalar trace-template 50 0 26 \; -238.93 50.1848 \; \;; +#X scalar trace-template 50 0 25 \; -418.971 48.5286 \; \;; +#X scalar trace-template 50 0 24 \; -422.979 48.6356 \; \;; +#X scalar trace-template 50 0 23 \; -245.646 49.4283 \; \;; +#X scalar trace-template 50 0 22 \; -438.174 47.4592 \; \;; +#X scalar trace-template 50 0 21 \; -417.144 47.8156 \; \;; +#X scalar trace-template 50 0 20 \; -407.716 43.3816 \; \;; +#X scalar trace-template 50 0 17 \; -411.457 41.7079 \; -411.512 52.5085 +\; -411.69 56.9082 \; -411.742 56.2765 \; -411.979 52.1759 \; -412.008 +46.0737 \; -412.169 47.619 \; \;; +#X scalar trace-template 50 0 16 \; -416.971 50.5251 \; -417.138 52.704 +\; -417.069 58.7902 \; -417.003 61.1312 \; -416.966 58.82 \; -416.961 +52.5157 \; -417.236 49.747 \; -417.912 56.8315 \; -418.513 62.7486 +\; -418.17 61.314 \; -417.951 61.5061 \; -417.638 63.3445 \; -417.877 +57.9737 \; -417.698 48.2822 \; -417.603 34.0703 \; -416.884 50.6039 +\; -417.22 56.216 \; -417.165 62.0785 \; -416.898 59.6827 \; -416.447 +60.5608 \; -415.947 56.4858 \; -416.762 44.1861 \; -416.444 28.6808 +\; -416.12 36.9948 \; -416.288 39.7098 \; -416.039 51.587 \; -415.91 +60.8295 \; -415.653 62.6536 \; -415.637 62.2841 \; -415.675 58.3963 +\; -416.285 54.3105 \; -416.236 47.9931 \; -416.477 49.5554 \; -416.581 +50.9119 \; -416.958 48.3262 \; -417.189 44.8682 \; -417.233 42.9628 +\; -416.895 39.4128 \; -417.015 39.7827 \; -417.193 45.1731 \; -417.127 +47.915 \; -417.135 48.04 \; -417.046 45.7988 \; \;; +#X scalar trace-template 50 0 14 \; -384.209 43.4706 \; \;; +#X scalar trace-template 50 0 13 \; -415.377 45.0738 \; \;; +#X scalar trace-template 50 0 11 \; -362.118 40.7761 \; \;; +#X scalar trace-template 50 0 7 \; -415.694 41.525 \; \;; +#X scalar trace-template 50 0 5 \; -413.756 32.8279 \; \;; +#X scalar trace-template 55 0 18 \; -434.14 61.6804 \; -434.127 63.4068 +\; -434.024 58.7671 \; -433.914 51.1161 \; \;; +#X scalar trace-template 55 0 12 \; -173.739 60.5656 \; -144.161 69.4998 +\; -141.521 70.9921 \; -153.395 67.3502 \; -181.225 79.4629 \; -184.127 +82.7255 \; -185.056 86.5003 \; -186.402 87.3275 \; -187.438 86.6406 +\; -187.668 85.5721 \; -188.058 84.9302 \; -188.972 84.8486 \; -190.095 +85.0972 \; -190.655 85.1499 \; -189.974 84.5325 \; -188.321 83.4295 +\; -186.34 82.5024 \; -184.483 82.0689 \; -183.426 82.0504 \; -183.138 +81.8153 \; -181.084 80.7145 \; -179.709 79.1797 \; -178.702 78.1305 +\; -176.704 77.6588 \; -176.081 77.6331 \; -178.177 80.2102 \; -179.009 +82.0776 \; -178.095 83.8582 \; -178.173 84.6683 \; \;; +#X scalar trace-template 55 0 9 \; -373.904 61.2384 \; -373.626 62.1937 +\; -373.235 61.1049 \; -373.008 59.2238 \; -373.055 54.5849 \; -372.977 +48.1706 \; \;; +#X scalar trace-template 55 0 4 \; -424.138 59.2787 \; -424.135 64.8735 +\; -424.111 65.7174 \; -423.961 61.6143 \; -423.78 54.8912 \; -423.62 +53.318 \; -423.054 61.2422 \; -423.154 63.2193 \; -422.938 64.219 \; +-422.74 67.6091 \; -422.513 69.7151 \; -423.047 63.5746 \; -423.209 +57.0594 \; -422.563 39.6624 \; \;; +#X scalar trace-template 55 0 3 \; -376.041 59.9483 \; -376.199 64.4825 +\; -376.306 67.458 \; -376.333 66.5075 \; -376.338 60.4943 \; -376.206 +57.3832 \; -375.804 59.9496 \; -375.543 62.4423 \; -375.819 61.1527 +\; -376.344 58.1566 \; -376.801 55.8334 \; -376.698 50.494 \; -376.431 +43.72 \; -376.086 39.8355 \; -376.221 41.783 \; -377.015 49.4479 \; +-375.895 57.3082 \; \;; +#X scalar trace-template 55 0 2 \; -400.022 60.3848 \; -399.944 60.2498 +\; -399.955 56.0402 \; -400.635 52.0128 \; -400.334 50.1185 \; -400.346 +52.6953 \; \;; +#X scalar trace-template 60 0 30 \; -422.127 61.6178 \; \;; +#X scalar trace-template 60 0 29 \; -419.167 60.4068 \; \;; +#X scalar trace-template 60 0 28 \; -392.231 59.7781 \; \;; +#X scalar trace-template 60 0 27 \; -371.337 60.3292 \; \;; +#X scalar trace-template 60 0 26 \; -398.408 60.2003 \; \;; +#X scalar trace-template 60 0 25 \; -377.858 58.0915 \; \;; +#X scalar trace-template 60 0 24 \; -435.536 59.8034 \; \;; +#X scalar trace-template 60 0 23 \; -396.954 58.3386 \; \;; +#X scalar trace-template 60 0 22 \; -436.522 58.3354 \; \;; +#X scalar trace-template 60 0 21 \; -440.126 58.766 \; \;; +#X scalar trace-template 60 0 20 \; -308.263 57.3698 \; \;; +#X scalar trace-template 60 0 19 \; -433.074 57.5008 \; -433.104 52.9969 +\; -433.287 49.6685 \; \;; +#X scalar trace-template 60 0 15 \; -429.448 57.4641 \; -429.399 55.5161 +\; -429.708 54.0471 \; -429.734 49.9219 \; -429.65 53.5657 \; -429.527 +55.2369 \; -429.684 55.5163 \; -429.488 52.7672 \; -428.957 57.1502 +\; -428.943 57.4992 \; -428.882 52.568 \; -428.923 41.1711 \; -428.547 +38.5196 \; -427.881 41.7497 \; -428.204 46.5288 \; -428.197 48.95 \; +\;; +#X scalar trace-template 60 0 14 \; -425.106 57.9547 \; \;; +#X scalar trace-template 60 0 13 \; -423.132 57.418 \; \;; +#X scalar trace-template 60 0 11 \; -441.187 58.0333 \; -440.975 53.9583 +\; -440.554 49.1177 \; \;; +#X scalar trace-template 60 0 7 \; -430.238 56.2685 \; -430.18 52.4758 +\; \;; +#X scalar trace-template 60 0 5 \; -425.552 53.1429 \; \;; +#X scalar trace-template 65 0 8 \; -422.11 62.513 \; -422.072 58.7504 +\; -421.885 52.978 \; -421.517 49.9812 \; \;; +#X scalar trace-template 70 0 30 \; -115.062 65.6259 \; \;; +#X scalar trace-template 70 0 29 \; -177.526 62.7993 \; \;; +#X scalar trace-template 70 0 28 \; -398.593 58.066 \; \;; +#X scalar trace-template 70 0 27 \; -396.912 58.167 \; \;; +#X scalar trace-template 70 0 26 \; -378.716 57.0482 \; \;; +#X scalar trace-template 70 0 25 \; -391.547 56.8804 \; \;; +#X scalar trace-template 70 0 24 \; -216.512 59.7809 \; \;; +#X scalar trace-template 70 0 23 \; -419.436 55.5083 \; \;; +#X scalar trace-template 70 0 22 \; -415.86 56.4906 \; \;; +#X scalar trace-template 70 0 21 \; -418.731 55.9113 \; \;; +#X scalar trace-template 70 0 20 \; -238.911 59.0968 \; -236.098 64.9314 +\; -235.335 75.1337 \; -235.488 80.6597 \; -235.334 82.3765 \; -235.188 +81.5331 \; -235.854 80.3934 \; -236.482 80.1482 \; -237.014 80.8588 +\; -237.392 81.5672 \; -237.157 81.9692 \; -236.124 81.9444 \; -235.598 +82.1367 \; -235.184 82.8738 \; -233.744 83.9626 \; -232.472 84.3863 +\; -229.946 82.7851 \; -224.852 81.2486 \; -223.784 80.4678 \; -225.711 +80.3113 \; -227.322 80.2665 \; -229.213 80.5589 \; -228.581 81.0675 +\; -226.456 81.9502 \; -225.715 82.128 \; -225.524 81.5024 \; -224.299 +79.8664 \; -223.063 75.9281 \; -219.031 68.3197 \; -212.339 58.54 \; +-198.833 45.1021 \; -181.235 51.0811 \; -191.364 44.7348 \; -190.861 +43.6189 \; -171.011 45.727 \; -183.198 44.2211 \; -185.769 44.3186 +\; -184.981 45.3483 \; -182.649 46.7902 \; -178.515 49.2263 \; \;; +#X scalar trace-template 70 0 14 \; -370.163 53.9807 \; -369.868 46.0882 +\; -371.45 55.0303 \; -371.311 55.4407 \; -370.858 58.6043 \; -370.974 +57.3594 \; -371.551 54.1256 \; -372.155 52.305 \; -372.164 49.1399 +\; -373.518 48.196 \; -374.058 42.636 \; -374.581 42.9521 \; -374.981 +44.2713 \; -376.365 56.7495 \; -376.333 58.7317 \; \;; +#X scalar trace-template 70 0 13 \; -390.106 54.8422 \; -391.243 55.3098 +\; -391.194 57.8822 \; -391.543 62.7992 \; -391.889 67.3958 \; -392.255 +68.4997 \; -392.795 66.8713 \; -392.946 63.915 \; -392.451 58.0064 +\; -392.203 56.8616 \; -392.099 54.2494 \; -392.211 52.1172 \; -392.35 +55.3925 \; -392.783 59.4555 \; -393.019 62.1274 \; -393.435 61.7598 +\; -393.244 54.6129 \; -392.719 39.3964 \; -393.701 30.6601 \; -394.29 +29.3324 \; -395.388 46.5814 \; -395.28 47.6806 \; -395.109 51.1302 +\; -394.889 53.4428 \; -394.829 57.0061 \; -395.03 57.7373 \; -395.428 +55.7082 \; -395.344 47.8085 \; -394.926 43.7896 \; -395.175 43.2274 +\; -395.601 43.7957 \; -395.999 44.0711 \; -396.015 41.3665 \; -396.027 +37.2967 \; \;; +#X scalar trace-template 70 0 5 \; -403.628 55.2189 \; -404.027 48.6292 +\; -404.136 52.3652 \; -404.622 56.4529 \; -404.926 60.9658 \; -405.461 +61.9229 \; -405.964 62.3743 \; -406.263 60.2696 \; -406.717 52.9077 +\; -407.108 39.9489 \; \;; +#X scalar trace-template 75 0 7 \; -188.578 79.2259 \; \;; +#X scalar trace-template 80 0 30 \; -380.625 63.5675 \; \;; +#X scalar trace-template 80 0 29 \; -283.414 63.5511 \; \;; +#X scalar trace-template 80 0 28 \; -298.719 60.9318 \; \;; +#X scalar trace-template 80 0 27 \; -250.777 58.8797 \; \;; +#X scalar trace-template 80 0 26 \; -384.506 63.7522 \; \;; +#X scalar trace-template 80 0 25 \; -395.42 59.6265 \; \;; +#X scalar trace-template 80 0 24 \; -384.844 61.8835 \; \;; +#X scalar trace-template 80 0 23 \; -398.6 56.5441 \; \;; +#X scalar trace-template 80 0 22 \; -83.7229 55.7272 \; \;; +#X scalar trace-template 80 0 21 \; -378.209 55.6708 \; \;; +#X scalar trace-template 80 0 19 \; -387.818 55.4255 \; -387.957 62.7154 +\; -388.071 67.7871 \; -388.363 68.5783 \; -388.97 67.1771 \; -389.368 +64.3916 \; -389.928 57.7565 \; -391.046 56.9723 \; -391.119 56.1286 +\; -390.818 57.0448 \; -390.954 58.626 \; -390.914 63.1461 \; -390.709 +65.5078 \; -390.332 67.565 \; -389.736 62.0547 \; -388.733 51.5892 +\; -388.955 42.6119 \; -389.363 41.9584 \; -389.122 46.3899 \; -388.985 +54.9279 \; -388.962 60.8979 \; -388.744 61.9151 \; -388.541 59.0006 +\; -388.261 54.4069 \; -387.722 46.4355 \; \;; +#X scalar trace-template 80 0 18 \; -394.944 57.2666 \; -395.108 63.997 +\; -395.34 69.2615 \; -395.91 71.0381 \; -396.266 71.2492 \; -396.587 +68.4881 \; -396.899 61.5745 \; -397.093 52.9859 \; -396.729 42.7911 +\; -397.57 56.1547 \; -398.046 61.0339 \; -398.024 64.8959 \; -397.695 +61.3579 \; -397.456 55.896 \; -396.703 46.6859 \; -395.691 39.7334 +\; \;; +#X scalar trace-template 80 0 11 \; -388.927 53.4613 \; \;; +#X scalar trace-template 80 0 10 \; -399.168 56.3128 \; -398.627 62.8329 +\; -398.794 67.8075 \; -399.149 68.3225 \; -399.706 68.5778 \; -400.006 +67.0948 \; -400.288 59.6133 \; -400.584 47.7702 \; \;; +#X scalar trace-template 85 0 7 \; -283.692 70.6638 \; -283.85 74.8784 +\; -283.984 76.3377 \; -284.151 75.3523 \; -284.425 71.4497 \; -285.931 +64.4954 \; -286.632 55.7005 \; -284.616 56.0925 \; -283.087 57.7965 +\; -282.764 60.298 \; -282.074 61.3734 \; -280.776 61.515 \; -278.407 +61.3404 \; -276.829 59.7575 \; -270.608 56.6879 \; -265.509 59.0446 +\; -260.29 59.3868 \; -261.187 70.1551 \; -259.184 79.8117 \; -256.807 +83.0488 \; -254.975 83.4096 \; -253.783 82.0816 \; -252.622 79.69 \; +-251.864 74.9713 \; -249.494 67.2379 \; -251.165 54.3383 \; -257.882 +41.931 \; -255.074 45.3247 \; -255.267 41.5086 \; -263.254 41.4242 +\; \;; +#X scalar trace-template 85 0 6 \; -380.232 69.9323 \; -380.163 72.6891 +\; -380.25 72.0067 \; -380.703 69.3107 \; -380.995 66.8155 \; -381.243 +60.6132 \; -381.057 50.7026 \; -381.337 40.5151 \; -382.265 47.7258 +\; -381.602 51.3242 \; -381.944 58.3135 \; -382.078 63.5577 \; -382.739 +63.1049 \; -382.102 52.9106 \; -381.876 35.7734 \; -382.368 31.5764 +\; -382.328 32.5301 \; -381.87 39.6924 \; -381.779 45.8811 \; -381.864 +49.157 \; -381.676 50.2023 \; -381.063 50.0624 \; -380.803 47.5131 +\; \;; +#X scalar trace-template 90 0 30 \; -384.242 72.5459 \; \;; +#X scalar trace-template 90 0 29 \; -299.282 66.5024 \; \;; +#X scalar trace-template 90 0 28 \; -420.886 64.0638 \; \;; +#X scalar trace-template 90 0 27 \; -401.961 63.3353 \; \;; +#X scalar trace-template 90 0 26 \; -312.198 61.9784 \; \;; +#X scalar trace-template 90 0 25 \; -425.32 60.4811 \; \;; +#X scalar trace-template 90 0 24 \; -413.342 60.8594 \; \;; +#X scalar trace-template 90 0 23 \; -416.055 60.626 \; \;; +#X scalar trace-template 90 0 22 \; -410.678 59.5924 \; \;; +#X scalar trace-template 90 0 21 \; -407.807 59.4934 \; \;; +#X scalar trace-template 90 0 17 \; -322.512 59.0657 \; -322.747 57.4957 +\; -323.254 53.9258 \; -323.628 49.2787 \; -325.363 44.2721 \; -325.631 +41.3937 \; -324.963 43.4613 \; -324.016 44.5249 \; -322.713 42.6748 +\; -321.041 49.7463 \; -320.381 51.1583 \; -317.165 52.6526 \; -316.873 +53.3804 \; -316.065 49.2861 \; -317.232 43.6747 \; -317.278 45.3196 +\; -316.968 57.8433 \; -315.126 61.5101 \; -314.189 60.7119 \; -313.037 +61.3391 \; -312.52 60.9065 \; -312.191 58.0171 \; -311.828 51.9593 +\; -311.472 44.209 \; \;; +#X scalar trace-template 90 0 11 \; -381.992 57.5538 \; \;; +#X scalar trace-template 90 0 9 \; -331.631 58.0103 \; -332.212 58.7472 +\; -332.653 57.8614 \; -332.989 55.5105 \; -333.934 51.2829 \; -335.22 +48.373 \; -334.499 47.5763 \; -333.741 47.5558 \; -333.396 44.6466 +\; \;; +#X scalar trace-template 90 0 8 \; -427.479 57.8001 \; -427.36 56.3457 +\; -427.297 58.6706 \; -426.745 58.7279 \; -426.922 51.0297 \; \;; +#X scalar trace-template 90 0 2 \; -417.579 58.351 \; -417.235 58.6206 +\; -417.189 62.9099 \; \;; +#X scalar trace-template 100 0 30 \; -384.996 74.4386 \; \;; +#X scalar trace-template 100 0 29 \; -422.106 68.3615 \; \;; +#X scalar trace-template 100 0 28 \; -419.812 67.5039 \; \;; +#X scalar trace-template 100 0 27 \; -299.88 65.7205 \; \;; +#X scalar trace-template 100 0 26 \; -420.361 64.5968 \; \;; +#X scalar trace-template 100 0 25 \; -424.351 64.0498 \; \;; +#X scalar trace-template 100 0 24 \; -402.789 64.1104 \; \;; +#X scalar trace-template 100 0 23 \; -424.97 63.061 \; \;; +#X scalar trace-template 100 0 22 \; -414.502 62.2844 \; \;; +#X scalar trace-template 100 0 21 \; -409.484 56.7494 \; \;; +#X scalar trace-template 100 0 11 \; -411.733 61.6498 \; -412.171 60.5067 +\; -412.598 53.9577 \; -412.947 41.2746 \; \;; +#X scalar trace-template 110 0 30 \; -385.294 64.1075 \; \;; +#X scalar trace-template 110 0 29 \; -422.529 62.385 \; \;; +#X scalar trace-template 110 0 28 \; -420.422 61.8631 \; \;; +#X scalar trace-template 110 0 27 \; -217.658 54.0387 \; \;; +#X scalar trace-template 110 0 26 \; -243.639 61.9016 \; \;; +#X scalar trace-template 110 0 25 \; -301.439 58.2116 \; \;; +#X scalar trace-template 110 0 24 \; -424.123 58.5 \; \;; +#X scalar trace-template 110 0 23 \; -425.124 56.2603 \; \;; +#X scalar trace-template 110 0 22 \; -393.247 56.7388 \; \;; +#X scalar trace-template 110 0 21 \; -389.116 56.5368 \; \;; +#X scalar trace-template 110 0 2 \; -427.646 56.0733 \; -427.631 49.5255 +\; -427.616 38.604 \; \;; +#X scalar trace-template 120 0 30 \; -255.967 57.0375 \; \;; +#X scalar trace-template 120 0 29 \; -394.764 54.5412 \; \;; +#X scalar trace-template 120 0 28 \; -393.347 51.8096 \; \;; +#X scalar trace-template 120 0 27 \; -282.622 54.4358 \; \;; +#X scalar trace-template 120 0 26 \; -387.147 48.7163 \; \;; +#X scalar trace-template 120 0 25 \; -389.675 43.1908 \; \;; +#X scalar trace-template 120 0 24 \; -300.367 48.3279 \; \;; +#X scalar trace-template 120 0 23 \; -389.007 49.4138 \; \;; +#X scalar trace-template 120 0 22 \; -314.3 46.3955 \; \;; +#X scalar trace-template 120 0 21 \; -288.037 45.506 \; \;; +#X scalar trace-template 120 0 8 \; -420.069 46.3664 \; \;; +#X scalar trace-template 125 0 11 \; -394.679 56.6363 \; -394.623 61.9565 +\; -394.436 66.1063 \; -394.199 65.5077 \; -394.168 61.1159 \; -393.749 +53.1866 \; \;; +#X scalar trace-template 125 0 10 \; -393.577 55.8074 \; \;; +#X scalar trace-template 125 0 5 \; -421.295 53.5134 \; -421.699 62.4225 +\; -421.847 66.638 \; -421.886 65.9003 \; -421.231 61.967 \; -421.03 +55.4412 \; -421.473 44.5366 \; -421.285 27.5918 \; -421.033 30.3389 +\; -421.224 37.6824 \; -421.966 47.2915 \; -422.102 54.9451 \; -421.946 +56.45 \; -421.669 53.5215 \; -421.272 50.5706 \; -420.961 44.6701 \; +-420.703 45.5131 \; -420.642 49.6653 \; -420.476 53.4881 \; -420.476 +54.7362 \; -420.346 51.4879 \; -420.237 49.7942 \; -420.841 49.7337 +\; -420.697 47.0281 \; -420.733 41.5637 \; -420.533 38.35 \; \;; +#X scalar trace-template 130 0 30 \; -388.15 68.5701 \; \;; +#X scalar trace-template 130 0 29 \; -387.718 68.2018 \; \;; +#X scalar trace-template 130 0 28 \; -222.963 61.8294 \; \;; +#X scalar trace-template 130 0 27 \; -389.065 60.9223 \; \;; +#X scalar trace-template 130 0 26 \; -419.402 59.5196 \; \;; +#X scalar trace-template 130 0 25 \; -384.145 62.5123 \; \;; +#X scalar trace-template 130 0 24 \; -384.57 61.1479 \; \;; +#X scalar trace-template 130 0 23 \; -420.677 58.0244 \; \;; +#X scalar trace-template 130 0 22 \; -424.09 56.8537 \; \;; +#X scalar trace-template 130 0 21 \; -400.884 56.5839 \; \;; +#X scalar trace-template 130 0 8 \; -422.922 54.6683 \; -423.089 60.022 +\; -423.146 62.8413 \; -423.299 62.9753 \; -423.001 57.4792 \; -423.479 +45.6741 \; -423.354 31.769 \; -423.571 29.2928 \; -423.339 40.7322 +\; -423.909 49.2346 \; -424.125 56.7108 \; -423.995 58.0007 \; -423.914 +56.5143 \; -423.563 51.2153 \; -424.124 46.4923 \; -424.117 44.7064 +\; -424.174 46.9804 \; -424.088 46.7715 \; \;; +#X scalar trace-template 130 0 4 \; -298.076 54.0227 \; -296.372 55.5122 +\; -295.132 57.6418 \; -293.982 58.6841 \; -292.486 57.0795 \; -290.384 +52.2773 \; -289.205 46.7944 \; -291.339 42.8024 \; -291.339 56.4168 +\; \;; +#X scalar trace-template 130 0 2 \; -415.001 51.8296 \; -414.762 58.5578 +\; -414.273 57.3512 \; -414.036 59.6338 \; -414.026 54.4524 \; -414.663 +48.2746 \; -413.814 30.0978 \; -413.608 34.4105 \; -413.933 43.4289 +\; \;; +#X scalar trace-template 135 0 10 \; -387.692 70.7518 \; -387.644 71.2318 +\; -387.392 67.6515 \; -386.687 57.288 \; -385.62 43.6547 \; -385.638 +29.7436 \; -385.967 29.8739 \; -385.444 42.7906 \; -385.572 47.8943 +\; -385.562 52.8217 \; -385.294 53.4587 \; -385.089 50.1346 \; \;; +#X scalar trace-template 140 0 30 \; -390.296 67.4097 \; \;; +#X scalar trace-template 140 0 29 \; -383.44 64.5739 \; \;; +#X scalar trace-template 140 0 28 \; -419.336 62.445 \; \;; +#X scalar trace-template 140 0 27 \; -419.853 59.251 \; \;; +#X scalar trace-template 140 0 26 \; -379.418 62.601 \; \;; +#X scalar trace-template 140 0 25 \; -420.876 61.1846 \; \;; +#X scalar trace-template 140 0 24 \; -398.502 60.4312 \; \;; +#X scalar trace-template 140 0 23 \; -424.097 61.5281 \; \;; +#X scalar trace-template 140 0 22 \; -417.463 57.7228 \; \;; +#X scalar trace-template 140 0 21 \; -416.228 59.4109 \; \;; +#X scalar trace-template 140 0 9 \; -418.559 58.9495 \; -418.882 59.9888 +\; -418.705 29.8503 \; -419.359 42.1819 \; -419.589 33.6311 \; -419.244 +27.5607 \; -418.738 37.0876 \; -418.028 52.0434 \; -417.914 54.7955 +\; -417.697 57.2834 \; -417.456 59.3538 \; -417.162 56.804 \; -416.958 +50.241 \; \;; +#X scalar trace-template 145 0 15 \; -388.154 63.5145 \; -387.553 56.7901 +\; \;; +#X scalar trace-template 145 0 3 \; -378.684 62.078 \; -377.953 54.1212 +\; -377.115 36.8067 \; -376.649 26.6416 \; -377.342 30.9521 \; -378.093 +41.6639 \; -377.971 44.5183 \; -378.033 47.3775 \; -377.798 49.2022 +\; -377.492 50.3797 \; -376.887 47.504 \; \;; +#X scalar trace-template 150 0 30 \; -423.392 57.0674 \; \;; +#X scalar trace-template 150 0 29 \; -415.416 53.6056 \; \;; +#X scalar trace-template 150 0 28 \; -416.398 54.8234 \; \;; +#X scalar trace-template 150 0 27 \; -417.96 51.6214 \; \;; +#X scalar trace-template 150 0 26 \; -418.635 52.096 \; \;; +#X scalar trace-template 150 0 25 \; -358.331 51.8688 \; \;; +#X scalar trace-template 150 0 24 \; -306.834 51.9124 \; \;; +#X scalar trace-template 150 0 23 \; -364.569 52.3269 \; \;; +#X scalar trace-template 150 0 22 \; -411.643 50.2552 \; \;; +#X scalar trace-template 150 0 21 \; -325.469 51.2394 \; \;; +#X scalar trace-template 150 0 14 \; -369.121 49.5576 \; -368.372 35.4134 +\; \;; +#X scalar trace-template 160 0 30 \; -269.116 60.5634 \; \;; +#X scalar trace-template 160 0 29 \; -276.083 43.5233 \; \;; +#X scalar trace-template 160 0 28 \; -311.409 44.1401 \; \;; +#X scalar trace-template 160 0 27 \; -301.688 40.5239 \; \;; +#X scalar trace-template 160 0 26 \; -390.558 42.3624 \; \;; +#X scalar trace-template 160 0 25 \; -315.522 43.54 \; \;; +#X scalar trace-template 160 0 24 \; -308.681 39.9929 \; \;; +#X scalar trace-template 160 0 23 \; -387.548 39.4357 \; \;; +#X scalar trace-template 160 0 22 \; -321.1 37.1669 \; \;; +#X scalar trace-template 160 0 21 \; -325.781 34.6654 \; \;; +#X scalar trace-template 160 0 15 \; -285.988 44.8007 \; -289.788 43.2483 +\; -293.318 60.0833 \; -291.214 65.632 \; -289.954 70.4334 \; -289.045 +71.2554 \; -288.768 69.4702 \; -288.704 65.3685 \; -288.691 58.7163 +\; -288.517 49.3761 \; \;; +#X scalar trace-template 160 0 11 \; -296.529 29.2822 \; \;; +#X scalar trace-template 165 0 18 \; -275.73 56.8264 \; -275.94 66.2997 +\; -276.526 74.2808 \; -275.783 79.5775 \; -274.385 82.7761 \; -273.306 +83.2427 \; -272.649 80.7754 \; -271.308 75.7016 \; -270.519 67.859 +\; -270.784 58.6413 \; -271.756 54.0224 \; -271.133 48.3546 \; -271.889 +45.1608 \; -272.361 42.8267 \; -272.756 42.989 \; -271.276 38.878 \; +\;; +#X scalar trace-template 165 0 14 \; -279.523 52.7733 \; \;; +#X scalar trace-template 170 0 30 \; -334.995 60.8382 \; \;; +#X scalar trace-template 170 0 29 \; -335.742 58.8138 \; \;; +#X scalar trace-template 170 0 28 \; -340.655 47.1987 \; \;; +#X scalar trace-template 170 0 27 \; -304.269 54.4193 \; \;; +#X scalar trace-template 170 0 26 \; -305.669 52.7464 \; \;; +#X scalar trace-template 170 0 25 \; -392.345 44.3877 \; \;; +#X scalar trace-template 170 0 24 \; -390.549 45.4784 \; \;; +#X scalar trace-template 170 0 23 \; -345.006 42.0563 \; \;; +#X scalar trace-template 170 0 22 \; -388.498 46.1862 \; \;; +#X scalar trace-template 170 0 21 \; -412.227 40.0968 \; \;; +#X scalar trace-template 170 0 11 \; -414.506 37.5579 \; -413.82 55.1113 +\; -413.615 61.7866 \; -413.57 63.4626 \; -413.194 59.9168 \; -413.116 +51.6547 \; -413.747 47.2392 \; -413.848 44.4774 \; -413.991 43.966 +\; -414.011 46.3354 \; -414.749 48.1864 \; -414.984 47.6829 \; -415.195 +46.2486 \; -415.178 42.7078 \; -415.025 39.3416 \; -414.622 39.0873 +\; -414.477 40.6234 \; -414.23 43.5496 \; \;; +#X scalar trace-template 175 0 14 \; -215.565 67.3243 \; \;; +#X scalar trace-template 175 0 1 \; -328.509 66.4856 \; -329.176 65.5487 +\; -329.762 61.9074 \; -329.734 57.581 \; -329.136 53.5061 \; -328.949 +46.9691 \; \;; +#X scalar trace-template 180 0 30 \; -166.207 64.6698 \; \;; +#X scalar trace-template 180 0 29 \; -339.323 66.4192 \; \;; +#X scalar trace-template 180 0 28 \; -345.357 62.3548 \; \;; +#X scalar trace-template 180 0 27 \; -324.217 63.1772 \; \;; +#X scalar trace-template 180 0 26 \; -350.729 61.3334 \; \;; +#X scalar trace-template 180 0 25 \; -392.206 60.8392 \; \;; +#X scalar trace-template 180 0 24 \; -334.567 59.2207 \; \;; +#X scalar trace-template 180 0 23 \; -356.08 56.5257 \; \;; +#X scalar trace-template 180 0 22 \; -415.71 62.9252 \; \;; +#X scalar trace-template 180 0 21 \; -298.775 57.7765 \; \;; +#X scalar trace-template 180 0 4 \; -320.118 55.447 \; -322.296 60.1158 +\; -321.383 57.9882 \; -320.933 54.4226 \; -321.228 46.923 \; -319.707 +41.9839 \; \;; +#X scalar trace-template 180 0 2 \; -302.817 54.7268 \; -301.009 59.1176 +\; -301.39 58.5091 \; -301.576 56.9315 \; -301.308 52.0042 \; -297.925 +46.8487 \; -295.419 36.674 \; \;; +#X scalar trace-template 185 0 14 \; -122.162 67.8003 \; -124.834 64.8849 +\; -153.815 57.4348 \; -177.826 84.8044 \; -177.225 83.2958 \; -174.232 +79.1032 \; -172.104 71.7641 \; -171.587 61.5916 \; \;; +#X scalar trace-template 190 0 30 \; -356.055 67.1782 \; \;; +#X scalar trace-template 190 0 29 \; -350.682 63.9514 \; \;; +#X scalar trace-template 190 0 28 \; -391.934 63.2392 \; \;; +#X scalar trace-template 190 0 27 \; -343.834 62.4469 \; \;; +#X scalar trace-template 190 0 26 \; -360.71 60.3133 \; \;; +#X scalar trace-template 190 0 25 \; -337.882 58.0562 \; \;; +#X scalar trace-template 190 0 24 \; -346.993 58.3282 \; \;; +#X scalar trace-template 190 0 23 \; -413.781 57.9662 \; \;; +#X scalar trace-template 190 0 22 \; -364.619 56.5007 \; \;; +#X scalar trace-template 190 0 21 \; -410.679 54.9666 \; \;; +#X scalar trace-template 200 0 30 \; -360.705 59.8884 \; \;; +#X scalar trace-template 200 0 29 \; -356.25 58.1515 \; \;; +#X scalar trace-template 200 0 28 \; -71.5224 55.9028 \; \;; +#X scalar trace-template 200 0 27 \; -354.814 53.0861 \; \;; +#X scalar trace-template 200 0 26 \; -443.24 54.5861 \; \;; +#X scalar trace-template 200 0 25 \; -428.778 51.073 \; \;; +#X scalar trace-template 200 0 24 \; -430.901 51.7116 \; \;; +#X scalar trace-template 200 0 23 \; -443.1 53.9988 \; \;; +#X scalar trace-template 200 0 22 \; -441.278 54.7714 \; \;; +#X scalar trace-template 200 0 21 \; -417.997 50.1931 \; \;; +#X scalar trace-template 200 0 10 \; -349.324 51.5403 \; \;; +#X scalar trace-template 205 0 12 \; -443.056 60.1648 \; -443.459 62.3312 +\; -443.516 62.6574 \; -443.566 64.4139 \; -443.468 64.5701 \; -443.313 +63.7168 \; -443.201 63.3721 \; -443.053 60.8111 \; -442.924 61.8333 +\; -442.948 62.5284 \; -442.913 61.6541 \; -442.995 58.325 \; -443.009 +52.815 \; -442.93 47.0302 \; \;; +#X scalar trace-template 205 0 6 \; -440.858 59.3019 \; -440.935 64.4419 +\; -441.007 69.1739 \; -441.031 71.0624 \; -440.989 67.8891 \; -440.922 +62.9801 \; -441.358 58.2267 \; -441.459 57.4144 \; -441.938 65.4306 +\; \;; +#X scalar trace-template 205 0 3 \; -432.781 55.3837 \; -433.039 57.1444 +\; -433.234 57.5488 \; -433.463 57.8548 \; -433.179 55.2409 \; -433.068 +55.6575 \; -432.466 52.1878 \; \;; +#X scalar trace-template 210 0 30 \; -438.545 61.6708 \; \;; +#X scalar trace-template 210 0 29 \; -442.897 61.296 \; \;; +#X scalar trace-template 210 0 28 \; -441.25 58.7775 \; \;; +#X scalar trace-template 210 0 27 \; -438.817 61.2134 \; \;; +#X scalar trace-template 210 0 26 \; -437.329 57.6463 \; \;; +#X scalar trace-template 210 0 25 \; -435.376 56.4647 \; \;; +#X scalar trace-template 210 0 24 \; -442.334 57.5138 \; \;; +#X scalar trace-template 210 0 23 \; -244.824 57.5919 \; \;; +#X scalar trace-template 210 0 22 \; -444.14 55.2809 \; \;; +#X scalar trace-template 210 0 21 \; -439.983 54.7238 \; \;; +#X scalar trace-template 210 0 19 \; -434.22 54.1186 \; -434.168 61.1415 +\; -434.139 62.7788 \; -433.895 60.5238 \; -433.786 58.2429 \; -433.798 +56.9528 \; -433.965 55.0453 \; -434.023 55.5024 \; -433.948 55.918 +\; -433.924 54.3102 \; -434.164 51.2607 \; -434.49 47.5072 \; \;; +#X scalar trace-template 210 0 10 \; -432.257 55.535 \; -432.192 58.8013 +\; -432.14 57.275 \; -432.231 54.3287 \; -432.383 49.9243 \; -432.772 +54.4293 \; -432.726 54.6575 \; -432.745 57.5534 \; -432.755 59.2111 +\; -432.776 58.0508 \; -432.855 53.9984 \; -433.232 47.6841 \; \;; +#X scalar trace-template 210 0 9 \; -143.141 62.7756 \; \;; +#X scalar trace-template 210 0 1 \; -436.028 55.0365 \; -436.036 52.4472 +\; -435.953 55.2402 \; -436.218 60.3383 \; -436.351 59.9215 \; -436.803 +57.7897 \; -436.683 56.8107 \; -436.513 62.5709 \; -436.53 66.4953 +\; -436.537 65.7829 \; -436.556 61.1256 \; -436.578 51.8536 \; \;; +#X scalar trace-template 215 0 17 \; -438.675 67.349 \; -438.913 64.2584 +\; -438.84 64.7488 \; -439.067 62.9038 \; -439.077 60.0283 \; -439.092 +58.7568 \; -438.808 61.9131 \; -438.84 66.4908 \; -438.995 66.8352 +\; -439.554 67.2808 \; -439.562 63.6987 \; -439.594 55.1068 \; \;; +#X scalar trace-template 215 0 15 \; -438.513 69.144 \; -438.448 66.3183 +\; -438.356 64.314 \; -438.233 60.1766 \; -438.026 58.6739 \; -438.052 +58.4943 \; -438.108 60.8168 \; -437.926 62.0583 \; -437.803 64.4761 +\; -437.645 62.0308 \; -437.565 53.6149 \; -437.123 44.3924 \; \;; +#X scalar trace-template 215 0 4 \; -439.932 60.942 \; -439.807 64.8443 +\; -439.879 66.9021 \; -439.925 66.6547 \; -440.142 62.7043 \; -440.363 +60.2896 \; -440.134 59.1136 \; -440.037 62.3062 \; -439.913 66.9495 +\; -440.04 65.4381 \; -439.89 64.1656 \; -439.906 53.505 \; \;; +#X scalar trace-template 220 0 30 \; -435.302 61.8967 \; \;; +#X scalar trace-template 220 0 29 \; -442.101 56.9345 \; \;; +#X scalar trace-template 220 0 28 \; -104.438 54.2585 \; \;; +#X scalar trace-template 220 0 27 \; -437.323 52.7311 \; \;; +#X scalar trace-template 220 0 26 \; -425.538 53.7795 \; \;; +#X scalar trace-template 220 0 25 \; -429.508 52.7502 \; \;; +#X scalar trace-template 220 0 24 \; -431.001 48.7483 \; \;; +#X scalar trace-template 220 0 23 \; -222.058 49.0953 \; \;; +#X scalar trace-template 220 0 22 \; -423.169 47.7943 \; \;; +#X scalar trace-template 220 0 21 \; -422.095 46.1813 \; \;; +#X scalar trace-template 220 0 9 \; -418.154 45.9283 \; -418.139 44.5917 +\; -418.941 42.9874 \; -419.09 42.8959 \; -419.053 44.5463 \; -418.857 +46.5088 \; -418.911 50.1356 \; -418.916 50.7641 \; -418.888 48.6784 +\; \;; +#X scalar trace-template 220 0 2 \; -412.662 45.5248 \; -412.675 41.8566 +\; -413.419 42.6056 \; -413.637 45.4579 \; -413.827 44.5752 \; -413.711 +43.7968 \; -413.645 46.011 \; -413.548 44.1869 \; \;; +#X scalar trace-template 225 0 8 \; -435.306 60.4514 \; -435.211 57.8282 +\; -435.325 54.8703 \; -435.427 54.7188 \; -435.2 52.3239 \; -435.193 +52.6763 \; -435.645 58.1965 \; -435.611 57.9314 \; -435.805 53.8346 +\; \;; +#X scalar trace-template 230 0 30 \; -440.266 58.8442 \; \;; +#X scalar trace-template 230 0 29 \; -442.404 63.4369 \; \;; +#X scalar trace-template 230 0 28 \; -443.932 59.9021 \; \;; +#X scalar trace-template 230 0 27 \; -441.661 54.758 \; \;; +#X scalar trace-template 230 0 26 \; -104.059 55.1153 \; \;; +#X scalar trace-template 230 0 25 \; -437.561 50.2221 \; \;; +#X scalar trace-template 230 0 24 \; -426.227 49.3831 \; \;; +#X scalar trace-template 230 0 23 \; -421.049 47.7936 \; \;; +#X scalar trace-template 230 0 22 \; -425.575 47.827 \; \;; +#X scalar trace-template 230 0 21 \; -430.681 47.7209 \; \;; +#X scalar trace-template 230 0 14 \; -421.954 46.6295 \; -421.907 46.6274 +\; -421.439 46.8154 \; -421.721 47.1663 \; -422.105 50.5039 \; -422.718 +52.285 \; -423.088 48.6899 \; -423.347 54.0379 \; -422.689 55.8722 +\; -422.758 59.2679 \; -422.909 60.3298 \; -422.792 59.6276 \; -422.259 +58.5879 \; -422.185 55.8932 \; -422.035 55.8226 \; -422.16 54.2387 +\; -422.029 52.9649 \; -422.086 50.6118 \; -422.099 49.3464 \; -422.451 +55.327 \; -422.92 59.383 \; -422.699 54.2531 \; -422.997 42.9502 \; +\;; +#X scalar trace-template 240 0 30 \; -442.139 63.511 \; \;; +#X scalar trace-template 240 0 29 \; -443.61 59.5267 \; \;; +#X scalar trace-template 240 0 28 \; -439.749 54.1069 \; \;; +#X scalar trace-template 240 0 27 \; -440.671 57.765 \; \;; +#X scalar trace-template 240 0 26 \; -431.013 52.4544 \; \;; +#X scalar trace-template 240 0 25 \; -433.315 49.7399 \; \;; +#X scalar trace-template 240 0 24 \; -124.718 44.8551 \; \;; +#X scalar trace-template 240 0 23 \; -427.297 44.7046 \; \;; +#X scalar trace-template 240 0 22 \; -434.382 47.0623 \; \;; +#X scalar trace-template 240 0 21 \; -192.21 42.3618 \; \;; +#X scalar trace-template 240 0 7 \; -428.335 44.2572 \; -428.545 42.0686 +\; \;; +#X scalar trace-template 245 0 13 \; -441.774 63.9911 \; -441.78 67.8674 +\; -441.646 70.3926 \; -441.512 68.4236 \; -441.252 63.0274 \; -440.822 +53.4469 \; \;; +#X scalar trace-template 245 0 3 \; -440.93 54.3359 \; \;; +#X scalar trace-template 250 0 30 \; -431.93 54.1097 \; \;; +#X scalar trace-template 250 0 29 \; -424.613 55.1919 \; \;; +#X scalar trace-template 250 0 28 \; -424.336 56.9431 \; \;; +#X scalar trace-template 250 0 27 \; -431.671 55.8738 \; \;; +#X scalar trace-template 250 0 26 \; -444.217 54.6088 \; \;; +#X scalar trace-template 250 0 25 \; -425.459 53.1242 \; \;; +#X scalar trace-template 250 0 24 \; -427.647 50.1381 \; \;; +#X scalar trace-template 250 0 23 \; -422.739 49.2705 \; \;; +#X scalar trace-template 250 0 22 \; -419.728 48.0035 \; \;; +#X scalar trace-template 250 0 21 \; -411.966 47.0557 \; \;; +#X scalar trace-template 250 0 18 \; -430.715 43.0662 \; -430.858 46.8413 +\; -430.241 51.5923 \; -430.566 47.9469 \; \;; +#X scalar trace-template 255 0 7 \; -424.333 56.7162 \; -424.274 56.7372 +\; -424.28 57.522 \; -424.744 57.0366 \; -424.924 58.5282 \; -425.106 +59.6135 \; -424.456 54.8815 \; -424.286 59.7953 \; -424.352 55.7169 +\; -424.245 54.8735 \; -424.462 54.0118 \; -424.357 53.2521 \; \;; +#X scalar trace-template 255 0 6 \; -431.699 55.9232 \; -431.946 51.2784 +\; \;; +#X scalar trace-template 255 0 3 \; -444.192 55.0146 \; -444.257 55.0849 +\; -444.164 52.9537 \; -444.039 47.4297 \; \;; +#X scalar trace-template 260 0 30 \; -442.422 55.4848 \; \;; +#X scalar trace-template 260 0 29 \; -425.933 55.2484 \; \;; +#X scalar trace-template 260 0 28 \; -425.01 53.2364 \; \;; +#X scalar trace-template 260 0 27 \; -419.798 50.3546 \; \;; +#X scalar trace-template 260 0 26 \; -298.839 50.5987 \; \;; +#X scalar trace-template 260 0 25 \; -396.001 51.2844 \; \;; +#X scalar trace-template 260 0 24 \; -431.641 50.6679 \; \;; +#X scalar trace-template 260 0 23 \; -422.407 50.3617 \; \;; +#X scalar trace-template 260 0 22 \; -265.866 45.6825 \; \;; +#X scalar trace-template 260 0 21 \; -397.384 50.4029 \; \;; +#X scalar trace-template 260 0 5 \; -427.856 49.6789 \; \;; +#X scalar trace-template 265 0 11 \; -263.875 65.8078 \; -265.347 75.9839 +\; -265.094 78.8907 \; -263.568 76.6748 \; -261.197 73.5388 \; -259.739 +71.8184 \; -259.295 70.8515 \; -260.555 70.5203 \; -262.909 70.5755 +\; -264.734 70.6071 \; -265.956 70.48 \; -265.479 70.2342 \; -263.851 +70.1608 \; -261.868 69.6341 \; -259.485 67.3471 \; -257.176 62.414 +\; -255.345 53.1101 \; -253.968 45.6031 \; -244.83 47.0936 \; -235.887 +58.241 \; \;; +#X scalar trace-template 265 0 2 \; -287.372 63.9423 \; -287.165 77.3988 +\; -287.073 80.1249 \; -289.363 76.8412 \; \;; +#X scalar trace-template 270 0 30 \; -201.322 74.3319 \; \;; +#X scalar trace-template 270 0 29 \; -229.322 71.4314 \; \;; +#X scalar trace-template 270 0 28 \; -347.648 69.1691 \; \;; +#X scalar trace-template 270 0 27 \; -301.535 73.3173 \; \;; +#X scalar trace-template 270 0 26 \; -300.181 73.7109 \; \;; +#X scalar trace-template 270 0 25 \; -340.013 64.0825 \; \;; +#X scalar trace-template 270 0 24 \; -343.668 64.6285 \; \;; +#X scalar trace-template 270 0 23 \; -312.421 63.2953 \; \;; +#X scalar trace-template 270 0 22 \; -323.497 63.2532 \; \;; +#X scalar trace-template 270 0 21 \; -332.875 62.5524 \; \;; +#X scalar trace-template 270 0 16 \; -355.226 63.2462 \; -354.489 63.8709 +\; -353.749 63.851 \; -354.452 61.1162 \; -355.163 64.888 \; -354.994 +63.5686 \; -354.117 60.5841 \; -354.113 60.9198 \; -355.911 59.5786 +\; -356.006 64.0427 \; -355.514 63.942 \; -354.628 64.7291 \; -352.985 +65.7553 \; -352.143 64.1858 \; -350.554 57.9545 \; -349.429 35.4331 +\; \;; +#X scalar trace-template 270 0 9 \; -354.582 64.1152 \; -355.751 58.0826 +\; -355.984 60.1166 \; -356.174 63.3053 \; \;; +#X scalar trace-template 270 0 6 \; -351.612 59.4026 \; -351.891 63.6917 +\; -351.578 66.4178 \; -349.973 69.3671 \; -349.35 71.4391 \; -348.913 +69.9875 \; -348.393 65.422 \; -347.901 66.585 \; -348.895 66.4377 \; +-349.361 69.536 \; \;; +#X scalar trace-template 270 0 5 \; -335.709 60.0338 \; \;; +#X scalar trace-template 275 0 20 \; -191.242 81.3894 \; -189.256 83.8819 +\; -186.027 83.6364 \; -184.812 82.5392 \; -183.695 81.7076 \; -183.758 +81.2244 \; -185.297 81.2216 \; -187.463 81.5731 \; -189.238 82.067 +\; -190.008 82.6291 \; -189.489 83.2532 \; -188.021 83.9339 \; -185.775 +84.3156 \; -184.018 83.5191 \; -183.186 80.5572 \; -190.65 72.7163 +\; -176.157 67.0746 \; -194.814 62.6187 \; -185.566 65.9473 \; \;; +#X scalar trace-template 275 0 19 \; -285.884 82.6441 \; -285.574 80.9494 +\; -281.646 76.1301 \; -279.343 73.5161 \; -279.132 73.5956 \; -280.818 +73.5817 \; -282.805 73.5663 \; -284.572 73.2066 \; -285.695 73.2845 +\; -285.549 72.9222 \; -284.145 72.0977 \; -282.832 71.3436 \; -282.768 +66.6924 \; -277.507 59.0063 \; -276.001 46.292 \; -281.056 45.145 \; +-282.58 43.5383 \; -282.622 43.7535 \; \;; +#X scalar trace-template 275 0 18 \; -300.048 77.5534 \; -299.121 82.038 +\; -298.068 81.6501 \; -295.757 78.5572 \; -294.77 76.8273 \; -295.617 +74.6788 \; -298.097 75.4789 \; -300.161 75.9329 \; -301.196 76.2198 +\; -301.041 75.3854 \; -299.397 74.2074 \; -297.975 73.665 \; -296.109 +69.1497 \; -293.861 61.6321 \; -289.294 49.0492 \; \;; +#X scalar trace-template 275 0 10 \; -233.116 77.4311 \; -233.946 79.2009 +\; -233.493 78.1796 \; -231.871 77.3778 \; -230.941 76.8979 \; -231.822 +75.9774 \; -233.777 74.9402 \; -236.058 74.0257 \; -237.598 73.5601 +\; -237.748 73.6957 \; -236.49 74.3358 \; -235.03 75.1583 \; -232.583 +74.5143 \; -227.395 71.8619 \; -222.207 67.2775 \; -218.386 60.0749 +\; -222.116 52.5096 \; \;; +#X scalar trace-template 275 0 8 \; -347.011 73.9727 \; -345.741 72.9052 +\; -345.246 77.1967 \; -343.935 67.4347 \; -342.451 73.0179 \; -341.113 +67.1098 \; -340.477 68.965 \; -342.018 70.0082 \; -342.156 73.1939 +\; -342.133 72.2802 \; -341.324 68.7502 \; -340.706 62.8598 \; -342.799 +60.4333 \; \;; +#X scalar trace-template 275 0 1 \; -344.601 68.6236 \; -345.003 75.3933 +\; \;; +#X scalar trace-template 280 0 30 \; -346.909 73.1916 \; \;; +#X scalar trace-template 280 0 29 \; -309.363 73.0557 \; \;; +#X scalar trace-template 280 0 28 \; -340.014 69.5417 \; \;; +#X scalar trace-template 280 0 27 \; -337.835 68.7659 \; \;; +#X scalar trace-template 280 0 26 \; -330.597 69.5767 \; \;; +#X scalar trace-template 280 0 25 \; -320.782 68.1433 \; \;; +#X scalar trace-template 280 0 24 \; -314.28 65.5986 \; \;; +#X scalar trace-template 280 0 23 \; -349.571 65.4388 \; \;; +#X scalar trace-template 280 0 22 \; -357.762 64.32 \; \;; +#X scalar trace-template 280 0 21 \; -117.523 63.0952 \; \;; +#X scalar trace-template 280 0 17 \; -326.246 62.7418 \; -328.229 69.6066 +\; -327.387 71.1504 \; -327.215 71.3617 \; -328.339 69.7448 \; -330.11 +70.5693 \; -332.933 72.9138 \; -333.759 73.7293 \; -333.68 72.502 \; +-333.068 70.4529 \; -330.711 69.2613 \; -328.968 64.5726 \; -328.128 +56.3934 \; -330.225 44.7835 \; -330.216 43.1914 \; -328.539 43.21 \; +-328.313 40.1626 \; -328.627 31.3877 \; -327.329 21.7685 \; -326.845 +15.7164 \; -325.441 23.3733 \; \;; +#X scalar trace-template 280 0 15 \; -363.54 62.8848 \; -361.802 62.1372 +\; -360.777 63.7216 \; -360.619 61.7084 \; -360.04 57.7583 \; -360.15 +57.0821 \; \;; +#X scalar trace-template 280 0 13 \; -359.642 62.015 \; -358.06 61.3402 +\; \;; +#X scalar trace-template 280 0 12 \; -365.137 59.9455 \; -363.544 61.1259 +\; \;; +#X scalar trace-template 280 0 5 \; -368.669 60.0851 \; -368.557 58.9508 +\; -368.707 54.2715 \; \;; +#X scalar trace-template 280 0 4 \; -361.881 57.5694 \; -360.531 60.81 +\; \;; +#X scalar trace-template 280 0 3 \; -424.103 58.1808 \; -423.904 60.0827 +\; -423.724 56.407 \; -423.501 54.7176 \; -423.397 52.456 \; -423.262 +56.1974 \; -423.33 60.664 \; -423.476 62.983 \; -423.515 63.5678 \; +-423.313 60.7953 \; \;; +#X scalar trace-template 290 0 30 \; -308.144 80.3716 \; \;; +#X scalar trace-template 290 0 29 \; -317.953 72.3299 \; \;; +#X scalar trace-template 290 0 28 \; -342.584 72.431 \; \;; +#X scalar trace-template 290 0 27 \; -335.18 71.1889 \; \;; +#X scalar trace-template 290 0 26 \; -345.474 71.0235 \; \;; +#X scalar trace-template 290 0 25 \; -339.599 61.4696 \; \;; +#X scalar trace-template 290 0 24 \; -321.176 58.67 \; \;; +#X scalar trace-template 290 0 23 \; -365.81 61.0473 \; \;; +#X scalar trace-template 290 0 22 \; -370.663 58.8762 \; \;; +#X scalar trace-template 290 0 21 \; -67.0623 53.9693 \; \;; +#X scalar trace-template 290 0 2 \; -422.848 55.3323 \; \;; +#X scalar trace-template 290 0 1 \; -375.204 56.8683 \; -374.753 54.1246 +\; -374.957 48.8701 \; \;; +#X scalar trace-template 295 0 13 \; -307.502 80.1764 \; -308.207 77.4228 +\; -311.129 77.0487 \; -313.098 78.0041 \; -314.079 79.1762 \; -313.981 +78.3457 \; -312.407 76.4739 \; -310.372 75.1084 \; -309.097 72.1151 +\; -308.182 63.9002 \; -304.864 28.6084 \; \;; +#X scalar trace-template 295 0 12 \; -317.819 74.0694 \; -318.86 72.445 +\; -320.072 69.9675 \; \;; +#X scalar trace-template 295 0 9 \; -334.964 71.7181 \; -333.171 68.0271 +\; -332.597 70.1769 \; \;; +#X scalar trace-template 295 0 4 \; -298.572 68.1924 \; \;; +#X scalar trace-template 300 0 30 \; -311.326 70.4995 \; \;; +#X scalar trace-template 300 0 29 \; -331.104 68.5874 \; \;; +#X scalar trace-template 300 0 28 \; -343 67.3658 \; \;; +#X scalar trace-template 300 0 27 \; -335.883 67.5216 \; \;; +#X scalar trace-template 300 0 26 \; -338.683 66.1906 \; \;; +#X scalar trace-template 300 0 25 \; -345.703 66.1852 \; \;; +#X scalar trace-template 300 0 24 \; -352.459 60.3496 \; \;; +#X scalar trace-template 300 0 23 \; -365.396 55.9954 \; \;; +#X scalar trace-template 300 0 22 \; -358.272 55.1033 \; \;; +#X scalar trace-template 300 0 21 \; -355.902 55.1886 \; \;; +#X scalar trace-template 300 0 5 \; -363.642 53.2007 \; -363.75 52.47 +\; -362.3 59.6847 \; -362.183 60.1604 \; -362.096 57.7935 \; -360.416 +58.9617 \; -358.716 55.4735 \; -357.804 58.0702 \; -358.281 49.4021 +\; -359.823 40.3918 \; -359.877 44.6402 \; -360.237 51.4168 \; -358.784 +46.5898 \; -358.788 33.5896 \; \;; +#X scalar trace-template 300 0 2 \; -88.8001 50.3486 \; -82.4855 49.5075 +\; -109.697 47.7841 \; \;; +#X scalar trace-template 305 0 4 \; -323.296 68.5088 \; -323.647 70.2597 +\; -324.888 72.2406 \; -324.287 72.3579 \; -322.304 72.1056 \; -320.866 +72.02 \; -319.726 68.8753 \; -318.093 62.0456 \; -314.938 52.5543 \; +-314.483 40.1855 \; \;; +#X scalar trace-template 310 0 30 \; -339.377 66.5226 \; \;; +#X scalar trace-template 310 0 29 \; -344.401 64.8709 \; \;; +#X scalar trace-template 310 0 28 \; -346.811 64.7517 \; \;; +#X scalar trace-template 310 0 27 \; -353.338 58.912 \; \;; +#X scalar trace-template 310 0 26 \; -420.892 59.0479 \; \;; +#X scalar trace-template 310 0 25 \; -425.701 58.0402 \; \;; +#X scalar trace-template 310 0 24 \; -418.363 56.544 \; \;; +#X scalar trace-template 310 0 23 \; -400.943 55.8351 \; \;; +#X scalar trace-template 310 0 22 \; -415.796 55.7473 \; \;; +#X scalar trace-template 310 0 21 \; -413.074 54.9103 \; \;; +#X scalar trace-template 310 0 1 \; -404.273 54.6432 \; -404.194 56.6753 +\; -404.604 55.7181 \; -404.731 53.7181 \; \;; +#X scalar trace-template 315 0 15 \; -347.646 57.9046 \; -349.346 69.1855 +\; -348.211 69.2747 \; -346.385 68.2338 \; -345.313 64.5327 \; -345.273 +53.985 \; -346.923 39.1865 \; \;; +#X scalar trace-template 315 0 12 \; -331.436 61.1331 \; \;; +#X scalar trace-template 315 0 9 \; -421.051 61.5853 \; -421.096 62.1888 +\; -420.877 60.0159 \; -420.62 58.7714 \; -420.421 54.3434 \; -420.111 +44.206 \; \;; +#X scalar trace-template 320 0 30 \; -347.041 64.425 \; \;; +#X scalar trace-template 320 0 29 \; -339.549 62.6053 \; \;; +#X scalar trace-template 320 0 28 \; -425.889 60.4715 \; \;; +#X scalar trace-template 320 0 27 \; -418.573 59.452 \; \;; +#X scalar trace-template 320 0 26 \; -416.034 59.6743 \; \;; +#X scalar trace-template 320 0 25 \; -401.386 58.7946 \; \;; +#X scalar trace-template 320 0 24 \; -413.334 58.2126 \; \;; +#X scalar trace-template 320 0 23 \; -359.748 56.2472 \; \;; +#X scalar trace-template 320 0 22 \; -398.137 56.3221 \; \;; +#X scalar trace-template 320 0 21 \; -410.531 56.1421 \; \;; +#X scalar trace-template 320 0 7 \; -367.539 56.6424 \; -365.927 56.9559 +\; -365.643 55.8519 \; -366.002 51.0317 \; -364.891 48.546 \; -365.132 +46.801 \; -364.991 47.5896 \; -364.746 51.1177 \; -364.693 49.1402 +\; -365.125 40.2853 \; \;; +#X scalar trace-template 320 0 2 \; -372.628 55.714 \; -371.109 55.3773 +\; -370.801 54.9675 \; -370.873 49.6642 \; -370.269 44.07 \; -368.98 +41.741 \; -368.76 42.8057 \; -368.797 47.1343 \; -368.813 47.7347 \; +-368.801 43.421 \; -368.67 37.3336 \; -369.927 10.6337 \; \;; +#X scalar trace-template 325 0 12 \; -324.338 66.0529 \; -324.966 62.7171 +\; -326.212 62.3128 \; \;; +#X scalar trace-template 325 0 6 \; -330.418 67.4839 \; \;; +#X scalar trace-template 330 0 30 \; -314.01 67.9029 \; \;; +#X scalar trace-template 330 0 29 \; -338.822 68.8167 \; \;; +#X scalar trace-template 330 0 28 \; -348.17 66.043 \; \;; +#X scalar trace-template 330 0 27 \; -333.411 64.4191 \; \;; +#X scalar trace-template 330 0 26 \; -351.118 64.4949 \; \;; +#X scalar trace-template 330 0 25 \; -343.97 62.7684 \; \;; +#X scalar trace-template 330 0 24 \; -354.495 62.7874 \; \;; +#X scalar trace-template 330 0 23 \; -357.641 58.9532 \; \;; +#X scalar trace-template 330 0 22 \; -360.296 58.1037 \; \;; +#X scalar trace-template 330 0 21 \; -388.041 56.1031 \; \;; +#X scalar trace-template 335 0 6 \; -299.023 67.6006 \; -300.453 61.0111 +\; -302.593 45.7888 \; -299.862 38.9742 \; \;; +#X scalar trace-template 335 0 3 \; -316.27 67.0579 \; \;; +#X scalar trace-template 335 0 1 \; -338.093 64.4008 \; -338.727 56.0591 +\; -339.037 44.5965 \; -338.953 42.4875 \; -339.236 42.6752 \; -339.251 +43.0495 \; -339.407 37.4655 \; -337.492 27.0867 \; -337.101 14.4416 +\; -336.3 20.4444 \; -335.499 40.4211 \; \;; +#X scalar trace-template 340 0 30 \; -143.141 59.4926 \; \;; +#X scalar trace-template 340 0 29 \; -351.351 59.3886 \; \;; +#X scalar trace-template 340 0 28 \; -335.536 52.8307 \; \;; +#X scalar trace-template 340 0 27 \; -389.209 49.6752 \; \;; +#X scalar trace-template 340 0 26 \; -363.631 48.797 \; \;; +#X scalar trace-template 340 0 25 \; -389.675 41.8912 \; \;; +#X scalar trace-template 340 0 24 \; -441.971 46.6276 \; \;; +#X scalar trace-template 340 0 23 \; -368.804 46.7389 \; \;; +#X scalar trace-template 340 0 22 \; -386.21 43.3046 \; \;; +#X scalar trace-template 340 0 21 \; -382.157 45.6023 \; \;; +#X scalar trace-template 345 0 12 \; -127.015 63.2968 \; -124.486 65.4928 +\; -114.751 63.2997 \; -121.133 60.9595 \; -153.244 64.1193 \; -155.619 +64.7283 \; -161.967 57.7433 \; -153.815 40.7914 \; -140.947 46.918 +\; -148.267 61.6486 \; \;; +#X scalar trace-template 345 0 8 \; -309.193 49.3084 \; -309.537 42.8437 +\; -308.469 44.6198 \; -308.33 45.5788 \; -309.177 41.0363 \; -308.363 +31.1439 \; -312.08 14.3751 \; \;; +#X scalar trace-template 345 0 3 \; -317.083 54.4819 \; \;; +#X scalar trace-template 350 0 30 \; -175.122 72.7967 \; \;; +#X scalar trace-template 350 0 29 \; -235.265 43.6604 \; \;; +#X scalar trace-template 350 0 28 \; -389.037 45.6173 \; \;; +#X scalar trace-template 350 0 27 \; -414.28 44.4656 \; \;; +#X scalar trace-template 350 0 26 \; -248.66 47.0129 \; \;; +#X scalar trace-template 350 0 25 \; -296.718 44.4434 \; \;; +#X scalar trace-template 350 0 24 \; -358.149 47.8698 \; \;; +#X scalar trace-template 350 0 23 \; -357.392 48.3074 \; \;; +#X scalar trace-template 350 0 22 \; -415.638 43.1929 \; \;; +#X scalar trace-template 350 0 21 \; -424.103 42.0013 \; \;; +#X scalar trace-template 350 0 14 \; -442.4 46.0441 \; -442.29 45.4442 +\; -442.283 43.1795 \; \;; +#X scalar trace-template 350 0 9 \; -321.599 42.6105 \; -322.64 44.0493 +\; -323.365 40.5153 \; -323.266 29.596 \; \;; +#X scalar trace-template 355 0 18 \; -188.097 65.685 \; -184.275 63.1874 +\; \;; +#X scalar trace-template 355 0 16 \; -234.144 49.0442 \; -222.591 58.3425 +\; -222.733 60.8038 \; -219.896 56.3835 \; -222.963 43.3151 \; -214.073 +36.9443 \; \;; +#X scalar trace-template 355 0 15 \; -258.864 51.8705 \; -254.62 56.1176 +\; \;; +#X scalar trace-template 355 0 13 \; -263.012 52.9319 \; \;; +#X scalar trace-template 355 0 3 \; -414.309 48.4193 \; -414.321 47.9367 +\; -414.313 41.9812 \; -413.908 32.5502 \; -414.478 15.016 \; -414.931 +24.3359 \; \;; +#X scalar trace-template 360 0 30 \; -244.915 56.8583 \; \;; +#X scalar trace-template 360 0 29 \; -391.262 48.7089 \; \;; +#X scalar trace-template 360 0 28 \; -293.956 47.4808 \; \;; +#X scalar trace-template 360 0 27 \; -360.725 46.007 \; \;; +#X scalar trace-template 360 0 26 \; -381.258 46.7602 \; \;; +#X scalar trace-template 360 0 25 \; -423.901 45.7278 \; \;; +#X scalar trace-template 360 0 24 \; -382.609 45.0324 \; \;; +#X scalar trace-template 360 0 23 \; -393.186 44.9342 \; \;; +#X scalar trace-template 360 0 22 \; -389.346 43.7656 \; \;; +#X scalar trace-template 360 0 21 \; -425.321 44.0369 \; \;; +#X scalar trace-template 360 0 6 \; -415.162 44.6163 \; \;; +#X scalar trace-template 360 0 4 \; -377.879 42.8247 \; -377.797 38.9207 +\; -377.371 29.751 \; \;; +#X scalar trace-template 365 0 13 \; -77.0994 52.2251 \; -102.203 55.2831 +\; -119.409 60.021 \; -96.5792 56.1494 \; -78.1611 53.3885 \; -132.541 +60.3548 \; -167.394 64.5774 \; -173.578 73.65 \; -170.906 79.3459 \; +-163.691 81.5679 \; -157.933 81.1115 \; -154.094 80.2498 \; -152.808 +79.9746 \; -152.411 79.4852 \; -152.028 79.349 \; -152.349 79.5254 +\; -152.103 79.4091 \; -151.965 78.9939 \; -151.099 78.3489 \; -150.303 +77.703 \; -149.575 77.3837 \; -149.084 77.2647 \; -148.346 77.0252 +\; -148.026 76.7734 \; -149.582 76.5325 \; -151.505 76.1887 \; -151.113 +75.3765 \; -152.353 74.786 \; -151.313 73.7474 \; -148.162 73.288 \; +-151.051 74.3701 \; -152.907 75.9831 \; -155.172 77.5182 \; -157.001 +78.7277 \; -158.72 79.6841 \; -160.129 80.6082 \; -161.113 81.2645 +\; -161.654 81.6027 \; -161.922 81.8184 \; -162.14 81.9691 \; -162.137 +82.0352 \; -163.163 81.6947 \; -163.391 79.4059 \; -162.29 74.255 \; +-157.705 67.0181 \; -161.28 61.459 \; -141.543 53.9786 \; -127.199 +56.1906 \; -127.412 55.3841 \; -119.347 51.8614 \; -101.72 47.2911 +\; -95.1405 44.2951 \; \;; +#X scalar trace-template 365 0 10 \; -391.564 44.3716 \; -391.264 35.9614 +\; -390.977 17.8362 \; \;; +#X scalar trace-template 370 0 30 \; -265.513 40.9439 \; \;; +#X scalar trace-template 370 0 29 \; -276.341 30.3024 \; \;; +#X scalar trace-template 370 0 28 \; -291.861 33.3545 \; \;; +#X scalar trace-template 370 0 27 \; -382.122 35.3259 \; \;; +#X scalar trace-template 370 0 26 \; -367.755 36.7311 \; \;; +#X scalar trace-template 370 0 25 \; -295.305 32.2806 \; \;; +#X scalar trace-template 370 0 24 \; -411.409 28.5246 \; \;; +#X scalar trace-template 370 0 23 \; -381.683 31.8749 \; \;; +#X scalar trace-template 370 0 22 \; -391.695 36.1211 \; \;; +#X scalar trace-template 370 0 21 \; -413.582 30.4582 \; \;; +#X scalar trace-template 370 0 19 \; -301.617 27.6904 \; \;; +#X scalar trace-template 370 0 18 \; -311.261 31.0937 \; -307.629 10.3228 +\; \;; +#X scalar trace-template 370 0 15 \; -377.987 30.2063 \; -377.076 12.509 +\; \;; +#X scalar trace-template 370 0 14 \; -361.776 25.6511 \; -361.356 11.2859 +\; -362.611 19.0798 \; \;; +#X scalar trace-template 370 0 11 \; -318.449 27.8409 \; -318.898 21.2971 +\; -319.964 33.1481 \; \;; +#X scalar trace-template 370 0 6 \; -344.896 29.345 \; -345.706 19.1477 +\; -345.937 25.2134 \; \;; +#X scalar trace-template 375 0 20 \; -261.108 33.1236 \; -263.261 28.9941 +\; -260.981 48.7027 \; -262.959 55.9352 \; -261.52 60.6753 \; -256.053 +75.9382 \; -256.662 77.5114 \; -260.777 72.6247 \; -261.927 72.952 +\; -264.224 70.7267 \; -263.155 68.6356 \; -263.301 69.1857 \; -263.551 +68.9619 \; -263.51 68.7263 \; -263.06 68.3254 \; -263.266 68.2807 \; +-264.009 68.8006 \; -263.437 68.8217 \; -260.663 68.0569 \; -259.425 +67.7527 \; -259.546 66.527 \; -261.385 64.446 \; -261.936 65.7127 \; +-263.436 69.2508 \; -265.63 73.8179 \; -269.382 72.7049 \; -270.68 +72.7862 \; -275.694 71.9111 \; -278.223 70.9128 \; -279.056 67.4421 +\; -281.024 68.0527 \; -281.676 68.0548 \; -283.913 68.6206 \; -284.982 +70.4271 \; -285.601 71.2072 \; -285.767 71.64 \; -285.569 72.0641 \; +-285.268 72.1253 \; -284.197 70.0541 \; -282.861 64.0467 \; -283.287 +51.4638 \; -282.467 42.3308 \; -280.168 46.6996 \; -279.601 47.8069 +\; -278.376 43.873 \; \;; +#X scalar trace-template 375 0 9 \; -245.141 32.7178 \; -244.225 33.7463 +\; \;; +#X scalar trace-template 375 0 7 \; -250.706 29.4741 \; -254.411 29.9356 +\; \;; +#X scalar trace-template 375 0 5 \; -273.868 28.8093 \; -268.4 33.6899 +\; \;; +#X scalar trace-template 380 0 30 \; -296.568 35.596 \; \;; +#X scalar trace-template 380 0 29 \; -293.145 32.6821 \; \;; +#X scalar trace-template 380 0 28 \; -429.213 26.0867 \; \;; +#X scalar trace-template 380 0 27 \; -424.717 27.0487 \; \;; +#X scalar trace-template 380 0 26 \; -406.441 25.2743 \; \;; +#X scalar trace-template 380 0 25 \; -407.141 25.2877 \; \;; +#X scalar trace-template 380 0 24 \; -399.136 25.6923 \; \;; +#X scalar trace-template 380 0 23 \; -400.283 21.6978 \; \;; +#X scalar trace-template 380 0 22 \; -442.618 22.564 \; \;; +#X scalar trace-template 380 0 21 \; -435.703 23.4239 \; \;; +#X scalar trace-template 380 0 19 \; -318.657 36.1636 \; \;; +#X scalar trace-template 380 0 4 \; -277.074 25.7038 \; \;; +#X scalar trace-template 385 0 18 \; -373.477 50.0837 \; -373.557 60.2192 +\; -373.792 59.7981 \; -373.68 60.9061 \; -372.264 64.853 \; -372.234 +64.3154 \; -372.332 57.8012 \; -371.36 52.2744 \; -371.448 49.9573 +\; -371.881 53.9599 \; -372.164 56.2898 \; -372.098 56.6533 \; -371.72 +55.4641 \; -371.806 53.1086 \; -372.325 54.6369 \; -372.074 62.4182 +\; -371.297 64.6909 \; -371.611 59.8356 \; -370.268 60.6635 \; -370.808 +47.4123 \; \;; +#X scalar trace-template 385 0 15 \; -401.262 51.6169 \; -400.902 56.393 +\; -400.285 55.5258 \; -400.023 54.278 \; -400.043 48.3872 \; -400.686 +44.7091 \; \;; +#X scalar trace-template 385 0 10 \; -425.112 46.4883 \; -425.381 50.0181 +\; \;; +#X scalar trace-template 385 0 8 \; -400.952 51.3833 \; -400.613 57.065 +\; -401.242 54.9885 \; -401.285 50.8376 \; -401.228 45.6447 \; \;; +#X scalar trace-template 385 0 2 \; -397.718 43.7264 \; -398.53 50.6216 +\; -398.4 51.6547 \; -398.354 51.8256 \; -398.43 50.9084 \; -398.416 +46.7374 \; -399.006 34.9359 \; \;; +#X scalar trace-template 390 0 30 \; -374.32 56.7904 \; \;; +#X scalar trace-template 390 0 29 \; -415.838 53.7581 \; \;; +#X scalar trace-template 390 0 28 \; -252.957 54.9402 \; \;; +#X scalar trace-template 390 0 27 \; -219.996 52.9429 \; \;; +#X scalar trace-template 390 0 26 \; -239.171 53.5524 \; \;; +#X scalar trace-template 390 0 25 \; -393.613 56.4896 \; \;; +#X scalar trace-template 390 0 24 \; -291.282 53.8049 \; \;; +#X scalar trace-template 390 0 23 \; -393.99 54.6923 \; \;; +#X scalar trace-template 390 0 22 \; -419.15 52.0401 \; \;; +#X scalar trace-template 390 0 21 \; -417.428 50.8809 \; \;; +#X scalar trace-template 390 0 19 \; -438.808 52.7056 \; -438.611 49.9757 +\; \;; +#X scalar trace-template 390 0 17 \; -425.131 52.7355 \; -425.32 52.2751 +\; -425.354 45.3006 \; \;; +#X scalar trace-template 390 0 16 \; -284.443 50.9963 \; -285.683 51.9303 +\; -285.705 55.3415 \; -285.616 59.7699 \; -285.926 59.9601 \; -288.682 +60.9333 \; -287.921 57.3383 \; -287.131 55.2039 \; -286.952 54.5127 +\; -287.139 53.5197 \; -286.786 52.13 \; -286.521 50.4557 \; -285.702 +56.7767 \; -284.262 64.145 \; -285.231 70.1467 \; -284.623 74.4088 +\; -284.037 76.7431 \; -284.045 75.5611 \; -284.878 73.0282 \; -284.38 +72.5957 \; -282.671 63.5145 \; -279.782 71.3607 \; -276.388 69.211 +\; -276.046 69.454 \; -281.316 69.1593 \; \;; +#X scalar trace-template 390 0 14 \; -297.588 51.624 \; -298.713 49.0234 +\; -302.635 48.5313 \; -302.808 53.7432 \; -302.713 54.6233 \; -302.393 +50.4924 \; -301.64 44.5211 \; -303.906 42.0924 \; -304.644 41.8614 +\; -304.839 42.8965 \; -304.721 45.8413 \; -303.727 47.9771 \; -301.787 +50.0052 \; -301.125 54.1869 \; -300.841 57.0571 \; -300.194 60.0128 +\; -297.957 62.5958 \; -300.396 61.5293 \; \;; +#X scalar trace-template 390 0 11 \; -397.201 50.689 \; -397.166 52.486 +\; -397.12 53.5988 \; -396.792 52.6782 \; -396.22 49.2264 \; -396.588 +39.242 \; \;; +#X scalar trace-template 390 0 9 \; -440.88 50.9284 \; -440.689 48.0259 +\; \;; +#X scalar trace-template 390 0 7 \; -443.628 50.841 \; -443.772 49.9892 +\; \;; +#X scalar trace-template 390 0 6 \; -274.6 48.5977 \; -274.258 55.8429 +\; -272.651 64.0185 \; -272.01 70.9563 \; -271.245 74.1454 \; -270.931 +72.1848 \; -270.562 66.9343 \; -272.911 57.7429 \; -276.046 56.4166 +\; -276.707 55.4678 \; -276.409 55.6498 \; -276.174 55.5125 \; -276.115 +58.1363 \; -275.318 67.4496 \; -276.056 73.4638 \; -274.883 73.2895 +\; -273.508 69.2125 \; -271.482 63.5775 \; -268.04 58.707 \; \;; +#X scalar trace-template 390 0 5 \; -434.509 50.2293 \; -434.503 49.5554 +\; \;; +#X scalar trace-template 390 0 4 \; -427.648 50.1091 \; -427.718 48.6316 +\; -427.759 44.5802 \; \;; +#X scalar trace-template 390 0 3 \; -420.913 49.8324 \; -421.25 48.5164 +\; -421.124 47.027 \; \;; +#X scalar trace-template 395 0 1 \; -253.149 62.0857 \; -258.699 74.3107 +\; \;; +#X scalar trace-template 400 0 30 \; -126.824 69.0065 \; \;; +#X scalar trace-template 400 0 29 \; -218.538 70.6076 \; \;; +#X scalar trace-template 400 0 28 \; -225.023 71.4466 \; \;; +#X scalar trace-template 400 0 27 \; -372.234 60.652 \; \;; +#X scalar trace-template 400 0 26 \; -375.633 58.7542 \; \;; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10494] trunk/externals
by aschix＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 10494 http://pure-data.svn.sourceforge.net/pure-data/?rev=10494&view=rev Author: aschix Date: 2009-01-09 17:23:55 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Added Paths: ----------- trunk/externals/algocomp/ trunk/externals/algocomp/.cdtproject trunk/externals/algocomp/.cproject trunk/externals/algocomp/.project trunk/externals/algocomp/Makefile trunk/externals/algocomp/Makefile.advanced trunk/externals/algocomp/Makefile.bak trunk/externals/algocomp/algocomp-help-patches/ trunk/externals/algocomp/algocomp-help-patches/delnote.pd trunk/externals/algocomp/algocomp-help-patches/dnote.pd trunk/externals/algocomp/algocomp-help-patches/help-algocomp.pd trunk/externals/algocomp/algocomp-help-patches/help-chaosgame.pd trunk/externals/algocomp/algocomp-help-patches/help-eca.pd trunk/externals/algocomp/algocomp-help-patches/help-genetic.pd trunk/externals/algocomp/algocomp-help-patches/help-henon.pd trunk/externals/algocomp/algocomp-help-patches/help-ifs.pd trunk/externals/algocomp/algocomp-help-patches/help-ifsmusic.pd trunk/externals/algocomp/algocomp-help-patches/help-logistic.pd trunk/externals/algocomp/algocomp-help-patches/help-lorenz.pd trunk/externals/algocomp/algocomp-help-patches/help-map.pd trunk/externals/algocomp/algocomp-help-patches/help-oneoverf.pd trunk/externals/algocomp/algocomp-help-patches/help-selfsimilar.pd trunk/externals/algocomp/algocomp.c trunk/externals/algocomp/chaotic.c trunk/externals/algocomp/distribute.c trunk/externals/algocomp/elementaryca.c trunk/externals/algocomp/fractal.c trunk/externals/algocomp/gauss_tilde.c trunk/externals/algocomp/genetic.c trunk/externals/algocomp/helpers.c trunk/externals/algocomp/ifs.c trunk/externals/algocomp/ifs.c.old trunk/externals/algocomp/ifsmusic.c trunk/externals/algocomp/logistictilde.c trunk/externals/algocomp/m_pd.h trunk/externals/algocomp/neural.c trunk/externals/algocomp/selfsimilar.c trunk/externals/algocomp/stochastic.c trunk/externals/algocomp/utils.c Added: trunk/externals/algocomp/.cdtproject =================================================================== --- trunk/externals/algocomp/.cdtproject (rev 0) +++ trunk/externals/algocomp/.cdtproject 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse-cdt version="2.0"?> + +<cdtproject id="org.eclipse.cdt.make.core.make"> +<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> +<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/> +<data> +<item id="scannerConfiguration"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="false" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="false"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="false" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="false"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="false" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="false"/> +</scannerInfoProvider> +</profile> +</item> +<item id="org.eclipse.cdt.core.pathentry"> +<pathentry kind="src" path=""/> +<pathentry kind="out" path=""/> +<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> +</item> +</data> +</cdtproject> Property changes on: trunk/externals/algocomp/.cdtproject ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/.cproject =================================================================== --- trunk/externals/algocomp/.cproject (rev 0) +++ trunk/externals/algocomp/.cproject 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?fileVersion 4.0.0?> + +<cproject> +<storageModule moduleId="org.eclipse.cdt.core.settings"> +<cconfiguration id="converted.config.111355161"> +<storageModule moduleId="scannerConfiguration"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="false" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="false"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="false" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="false"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="false" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="false"/> +</scannerInfoProvider> +</profile> +</storageModule> +<storageModule moduleId="org.eclipse.cdt.core.pathentry"> +<pathentry kind="src" path=""/> +<pathentry kind="out" path=""/> +<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> +</storageModule> +<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.111355161" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig"> +<externalSettings/> +<extensions> +<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/> +<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> +</extensions> +</storageModule> +</cconfiguration> +</storageModule> +</cproject> Added: trunk/externals/algocomp/.project =================================================================== --- trunk/externals/algocomp/.project (rev 0) +++ trunk/externals/algocomp/.project 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>algocomp</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.cdt.make.core.makeBuilder</name> + <triggers>clean,full,incremental,</triggers> + <arguments> + <dictionary> + <key>org.eclipse.cdt.make.core.build.arguments</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.core.errorOutputParser</key> + <value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableAutoBuild</key> + <value>false</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.environment</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableFullBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.target.inc</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.target.clean</key> + <value>clean</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.command</key> + <value>make</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableCleanBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.append_environment</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.target.full</key> + <value>clean all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.target.auto</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.stopOnError</key> + <value>false</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.cdt.core.cnature</nature> + <nature>org.eclipse.cdt.make.core.makeNature</nature> + <nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature> + </natures> +</projectDescription> Property changes on: trunk/externals/algocomp/.project ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/Makefile =================================================================== --- trunk/externals/algocomp/Makefile (rev 0) +++ trunk/externals/algocomp/Makefile 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,85 @@ +# set Name and system + +NAME=algocomp +#SYSTEM = nt +SYSTEM = linux +# set paths for windows + +# where is VC++ ??? +VC="C:\Programme\Microsoft Visual C++ Toolkit 2003" +VCLINK="C:\Programme\Microsoft Visual C++ Toolkit 2003\bin\link" +# where is pd +#PDPATH="E:\Program Files\pd-0.38-3" +PDPATH=C:\Programme\pd-0.38-3 +LIBPATH="$(PDPATH)/bin" + +install: install_$(SYSTEM) + +all: $(SYSTEM) +#all: pd_linux install_linux + +# ----------------------- LINUX i386 ----------------------- + +linux: $(NAME).pd_linux + +.SUFFIXES: .pd_linux + +LINUXCFLAGS = -DPD -DUNIX -O2 -funroll-loops -fomit-frame-pointer \ + -Wall -W -Wshadow -Wstrict-prototypes -Werror \ + -Wno-unused -Wno-parentheses -Wno-switch + +# where is your m_pd.h ??? +LINUXINCLUDE = -I../../src + +.c.pd_linux: + cc -O2 -Wall -DPD -fPIC $(LINUXCFLAGS) $(LINUXINCLUDE) -c $*.c + ld -export_dynamic -shared -o $*.pd_linux $*.o -lc + strip --strip-unneeded $*.pd_linux + +install_linux: + sudo cp *.pd_linux /usr/lib/pd/extra/ + cp *.pd_linux ../../download + +# ----------------------- NT ----------------------- + +nt: $(NAME).dll + +.SUFFIXES: .dll + +PDNTCFLAGS = /W3 /WX /O2 /G6 /DNT /DPD /nologo +PDNTINCLUDE = /I. /I$(PDPATH)\tcl\include /I$(PDPATH)\src /I$(VC)\include /Iinclude +PDNTLDIR = "C:\Programme\Microsoft Visual C++ Toolkit 2003\Lib" + +PDNTLIB = "C:\Programme\Microsoft Visual C++ Toolkit 2003\Lib\libc.lib" \ + "C:\Programme\Microsoft Visual C++ Toolkit 2003\Lib\oldnames.lib" \ + "C:\Programme\Microsoft Visual C++ Toolkit 2003\Lib\kernel32.lib" \ + "$(PDPATH)\bin\pd.lib" + + +.c.dll: algocomp.c chaotic.c ifs.c selfsimilar.c chaossignals.c pan.c + cl /W3 /WX /O2 /G6 /DNT /DPD /nologo /I. /I"C:\Programme\flextbuild\pd\tcl\include" /I"C:\Programme\flextbuild\pd\src" /I"C:\Programme\Microsoft Visual C++ Toolkit 2003\include" /Iinclude /c $(NAME).c + link /dll /export:$(NAME)_setup $*.obj $(PDNTLIB) + +#.c.dll: +# cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c +# link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) + +install_nt: + cp $(NAME).dll $(PDPATH)\externs +# -------------------------- XP -------------------------- + +# $(CXX) $(LDFLAGS) -shared $(patsubst %,-L%,$(LIBPATH)) $^ $(patsubst %,-l%,$(LIBS)) -o $@ + +pd_xp: + gcc -O2 -Wall -DPD -L$(LIBPATH) -c $(NAME).c + ld -export_dynamic -shared -o $(NAME).dll -lc + + +install_xp: +# copy $(NAME).dll $(PDPATH)/externs + cp $(NAME).dll $(PDPATH)/externs + +clean: + rm -f *.o *.dll *.exp *.obj *.lib + rm -f *.o *.pd_* *.dll so_locations + Property changes on: trunk/externals/algocomp/Makefile ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/Makefile.advanced =================================================================== --- trunk/externals/algocomp/Makefile.advanced (rev 0) +++ trunk/externals/algocomp/Makefile.advanced 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,104 @@ +NAME=patcher~ +CSYM=patcher_tilde + +current: pd_nt pd_linux pd_darwin + +# ----------------------- NT ----------------------- + +pd_nt: $(NAME).dll + +.SUFFIXES: .dll + +PDNTCFLAGS = /W3 /WX /O2 /G6 /DNT /DPD /nologo + +# where is VC++ ??? +VC="C:\Programme\Microsoft Visual Studio\VC98" + +# where is your m_pd.h ??? +PDNTINCLUDE = /I. /Ic:\pd\tcl\include /Ic:\pd\src /I$(VC)\include /Iinclude + +PDNTLDIR = $(VC)\Lib +PDNTLIB = $(PDNTLDIR)\libc.lib \ + $(PDNTLDIR)\oldnames.lib \ + $(PDNTLDIR)\kernel32.lib \ + $(PDNTLDIR)\user32.lib \ + $(PDNTLDIR)\uuid.lib \ + c:\pd\bin\pd.lib + +.c.dll: + cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c + link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) + +# ----------------------- IRIX 5.x ----------------------- + +pd_irix5: $(NAME).pd_irix5 + +.SUFFIXES: .pd_irix5 + +SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 + +SGIINCLUDE = -I../../src + +.c.pd_irix5: + cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c + ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o + rm $*.o + +# ----------------------- IRIX 6.x ----------------------- + +pd_irix6: $(NAME).pd_irix6 + +.SUFFIXES: .pd_irix6 + +SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ + -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ + -Ofast=ip32 + +.c.pd_irix6: + cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c + ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o + rm $*.o + +# ----------------------- MAX OS X ----------------------- + +pd_darwin: $(NAME).pd_darwin + +.SUFFIXES: .pd_darwin + +DARWINCFLAGS = -DPD -DUNIX -O2 -DMACOSX \ + -Wall -W -Wshadow -Wstrict-prototypes \ + -Wno-unused -Wno-parentheses -Wno-switch + +DARWININCLUDE = -I../../src + +.c.pd_darwin: + cc $(DARWINCFLAGS) $(DARWININCLUDE) -o $*.o -c $*.c + cc -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o + rm -f $*.o ../$*.pd_darwin + ln -s $*/$*.pd_darwin .. + +# ----------------------- LINUX i386 ----------------------- + +pd_linux: $(NAME).pd_linux + +.SUFFIXES: .pd_linux + +LINUXCFLAGS = -DPD -DUNIX -O2 -funroll-loops -fomit-frame-pointer \ + -Wall -W -Wshadow -Wstrict-prototypes -Werror \ + -Wno-unused -Wno-parentheses -Wno-switch + +# where is your m_pd.h ??? +LINUXINCLUDE = -I../../src + +.c.pd_linux: + cc -O2 -Wall -DPD -fPIC $(LINUXCFLAGS) $(LINUXINCLUDE) -c $*.c + ld -export_dynamic -shared -o $*.pd_linux $*.o -lc + strip --strip-unneeded $*.pd_linux + +# ---------------------------------------------------------- + +install: + cp help-*.pd ../../doc/5.reference + +clean: + rm -f *.o *.pd_* so_locations \ No newline at end of file Property changes on: trunk/externals/algocomp/Makefile.advanced ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/Makefile.bak =================================================================== --- trunk/externals/algocomp/Makefile.bak (rev 0) +++ trunk/externals/algocomp/Makefile.bak 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,9 @@ +all: test + +test: test.o + gcc test.c -o test.o + +clean: + rm test.o + + Property changes on: trunk/externals/algocomp/Makefile.bak ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/delnote.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/delnote.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/delnote.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,42 @@ +#N canvas 88 99 482 332 12; +#X obj 25 70 del; +#X obj 29 157 unpack 0 0; +#X floatatom 111 186 5 0 0 0 - - -; +#X floatatom 161 187 5 0 0 0 - - -; +#X obj 29 130 pack 0 0; +#X obj 29 106 f; +#X obj 76 14 inlet; +#X obj 126 15 inlet; +#X obj 31 207 f; +#X obj 61 207 t b f; +#X obj 31 237 makenote 60 100 100; +#X obj 25 14 inlet; +#X obj 193 215 outlet; +#X obj 25 40 t b f; +#X obj 29 267 noteout; +#X obj 255 212 s note; +#X obj 252 182 pack 0 0 0 0 0 0 0 0; +#X floatatom 312 154 5 0 0 0 - - -; +#X connect 0 0 5 0; +#X connect 1 0 2 0; +#X connect 1 0 8 1; +#X connect 1 0 16 1; +#X connect 1 1 3 0; +#X connect 1 1 9 0; +#X connect 4 0 1 0; +#X connect 5 0 4 0; +#X connect 6 0 5 1; +#X connect 7 0 4 1; +#X connect 8 0 10 0; +#X connect 8 0 16 0; +#X connect 9 0 8 0; +#X connect 9 1 10 2; +#X connect 9 1 12 0; +#X connect 9 1 16 2; +#X connect 10 0 14 0; +#X connect 10 1 14 1; +#X connect 11 0 13 0; +#X connect 13 0 0 0; +#X connect 13 1 0 1; +#X connect 16 0 15 0; +#X connect 17 0 16 3; Property changes on: trunk/externals/algocomp/algocomp-help-patches/delnote.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/dnote.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/dnote.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/dnote.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,42 @@ +#N canvas 88 99 482 332 12; +#X obj 25 70 del; +#X obj 29 157 unpack 0 0; +#X floatatom 111 186 5 0 0 0 - - -; +#X floatatom 161 187 5 0 0 0 - - -; +#X obj 29 130 pack 0 0; +#X obj 29 106 f; +#X obj 76 14 inlet; +#X obj 126 15 inlet; +#X obj 31 207 f; +#X obj 61 207 t b f; +#X obj 31 237 makenote 60 100 100; +#X obj 25 14 inlet; +#X obj 100 269 outlet; +#X obj 25 40 t b f; +#X obj 29 267 noteout; +#X obj 240 270 s note; +#X obj 237 240 pack 0 0 0 0 0 0 0 0; +#X floatatom 297 212 5 0 0 0 - - -; +#X connect 0 0 5 0; +#X connect 1 0 2 0; +#X connect 1 0 8 1; +#X connect 1 0 16 1; +#X connect 1 1 3 0; +#X connect 1 1 9 0; +#X connect 4 0 1 0; +#X connect 5 0 4 0; +#X connect 6 0 5 1; +#X connect 7 0 4 1; +#X connect 8 0 10 0; +#X connect 8 0 16 0; +#X connect 9 0 8 0; +#X connect 9 1 10 2; +#X connect 9 1 12 0; +#X connect 9 1 16 2; +#X connect 10 0 14 0; +#X connect 10 1 14 1; +#X connect 11 0 13 0; +#X connect 13 0 0 0; +#X connect 13 1 0 1; +#X connect 16 0 15 0; +#X connect 17 0 16 3; Property changes on: trunk/externals/algocomp/algocomp-help-patches/dnote.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-algocomp.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-algocomp.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-algocomp.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,16 @@ +#N canvas 493 243 450 300 10; +#X obj 169 33 help-oneoverf; +#X obj 66 132 help-eca; +#X obj 57 58 help-henon; +#X obj 50 81 help-lorenz; +#X text 24 12 chaos functions; +#X obj 36 34 help-logistic; +#X text 165 13 fractal; +#X obj 169 56 help-ifs; +#X text 32 113 elementary CA; +#X obj 272 33 help-selfsimilar; +#X obj 272 56 help-ifsmusic; +#X obj 65 210 help-map; +#X obj 166 134 help-genetic; +#X text 164 113 genetic algorithm; +#X text 23 187 linear mapping; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-algocomp.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-chaosgame.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-chaosgame.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-chaosgame.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,70 @@ +#N canvas 540 1 452 619 12; +#X obj 33 83 chaosgame; +#X obj 30 17 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X msg 53 13 stop; +#X obj 15 203 gemhead; +#X obj 14 237 translateXYZ; +#X obj 128 340 loadbang; +#X obj 32 467 gemwin; +#X msg 182 423 1; +#X msg 176 448 0; +#X msg 82 403 create; +#X msg 83 430 destroy; +#N canvas 95 194 342 231 Gem.init 0; +#X obj 118 18 loadbang; +#X msg 201 78 reset; +#X obj 118 113 outlet; +#X obj 118 45 t b b; +#X msg 22 77 buffer 1; +#X connect 0 0 3 0; +#X connect 1 0 2 0; +#X connect 3 0 4 0; +#X connect 3 1 1 0; +#X connect 4 0 2 0; +#X restore 24 350 pd Gem.init; +#X obj 128 367 t b b b; +#X obj 39 401 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 16 173 t b f; +#X obj 12 266 colorRGB 1 1 1; +#X obj 14 293 sphere 0.02; +#X floatatom 157 146 5 0 0 0 - - -; +#X floatatom 176 124 5 0 0 0 - - -; +#X obj 174 281 noteout; +#X obj 295 178 noteout; +#X obj 161 214 map -2 2 52 88; +#X obj 290 108 map -2 2 64 100; +#X obj 32 44 metro 100; +#X obj 165 250 makenote 100 150; +#X obj 294 145 makenote 100 250; +#X connect 0 0 14 0; +#X connect 0 0 17 0; +#X connect 0 1 4 2; +#X connect 0 1 18 0; +#X connect 1 0 23 0; +#X connect 2 0 23 0; +#X connect 3 0 4 0; +#X connect 4 0 15 0; +#X connect 5 0 12 0; +#X connect 7 0 6 0; +#X connect 8 0 6 0; +#X connect 9 0 6 0; +#X connect 10 0 6 0; +#X connect 11 0 6 0; +#X connect 12 0 6 0; +#X connect 12 1 7 0; +#X connect 12 2 9 0; +#X connect 13 0 6 0; +#X connect 14 0 3 0; +#X connect 14 1 4 1; +#X connect 15 0 16 0; +#X connect 17 0 21 0; +#X connect 18 0 22 0; +#X connect 21 0 24 0; +#X connect 22 0 25 0; +#X connect 23 0 0 0; +#X connect 24 0 19 0; +#X connect 24 1 19 1; +#X connect 25 0 20 0; +#X connect 25 1 20 1; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-chaosgame.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-eca.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-eca.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-eca.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,30 @@ +#N canvas 385 55 466 361 12; +#X msg 128 59 randomize; +#X msg 128 36 init; +#X floatatom 129 82 5 0 0 0 - - -; +#X obj 26 276 makenote 100 125; +#X obj 26 304 noteout 10; +#X obj 26 28 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +; +#X obj 26 104 eca 110 9 1; +#X obj 26 157 unpack 0 0 0 0 0 0 0 0 0; +#X obj 26 128 map 0 9 34 42; +#X obj 26 48 metro 200; +#X connect 0 0 6 0; +#X connect 1 0 6 0; +#X connect 2 0 6 1; +#X connect 3 0 4 0; +#X connect 3 1 4 1; +#X connect 5 0 9 0; +#X connect 6 0 8 0; +#X connect 7 0 3 0; +#X connect 7 1 3 0; +#X connect 7 2 3 0; +#X connect 7 3 3 0; +#X connect 7 4 3 0; +#X connect 7 5 3 0; +#X connect 7 6 3 0; +#X connect 7 7 3 0; +#X connect 7 8 3 0; +#X connect 8 0 7 0; +#X connect 9 0 6 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-eca.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-genetic.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-genetic.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-genetic.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,146 @@ +#N canvas 0 21 995 664 12; +#X obj 432 142 unpack 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0; +#X obj 8 115 map 0 32 52 84; +#X obj 8 408 t b f; +#X msg 8 432 0; +#X obj 834 486 t b f; +#X obj 834 513 del; +#X obj 8 92 genetic 128 80 5; +#X obj 432 118 map 0 64 0 1000; +#X msg 147 23 0 7 4 2 11 12 6 4 12 7 12 11 2 7 12; +#X obj 432 94 genetic 128 96 6; +#X msg 571 24 16 32 16 16 16 16 32 16 32 7 7 7 32 16 16 32; +#X obj 430 171 s d1; +#X obj 454 197 s d2; +#X obj 473 171 s d3; +#X obj 495 197 s d4; +#X obj 515 170 s d5; +#X obj 539 196 s d6; +#X obj 558 170 s d7; +#X obj 580 196 s d8; +#X obj 598 171 s d9; +#X obj 622 197 s d10; +#X obj 641 171 s d11; +#X obj 675 197 s d12; +#X obj 693 171 s d13; +#X obj 745 172 s d15; +#X obj 780 197 s d16; +#X obj 728 197 s d14; +#X obj 834 538 s retrigger; +#X obj 47 433 r d1; +#X obj 95 433 r d2; +#X obj 149 433 r d3; +#X obj 205 433 r d4; +#X obj 255 433 r d5; +#X obj 307 435 r d6; +#X obj 360 435 r d7; +#X obj 411 436 r d8; +#X obj 462 437 r d9; +#X obj 519 439 r d10; +#X obj 579 438 r d11; +#X obj 633 436 r d12; +#X obj 8 138 unpack 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0; +#X obj 693 436 r d13; +#X obj 802 437 r d15; +#X obj 748 436 r d14; +#X obj 853 434 r d16; +#X obj 287 460 dnote; +#X obj 295 48 bng 15 250 50 0 empty retrigger empty 0 -6 0 8 -262144 +-1 -1; +#X obj 8 457 dnote; +#X obj 68 458 dnote; +#X obj 126 458 dnote; +#X obj 182 459 dnote; +#X obj 233 459 dnote; +#X obj 338 461 dnote; +#X obj 390 461 dnote; +#X obj 445 461 dnote; +#X obj 499 461 dnote; +#X obj 556 461 dnote; +#X obj 613 461 dnote; +#X obj 671 461 dnote; +#X obj 727 461 dnote; +#X obj 781 461 dnote; +#X obj 833 462 dnote; +#X msg 8 56 randomize; +#X msg 432 63 randomize; +#X connect 0 0 11 0; +#X connect 0 1 12 0; +#X connect 0 2 13 0; +#X connect 0 3 14 0; +#X connect 0 4 15 0; +#X connect 0 5 16 0; +#X connect 0 6 17 0; +#X connect 0 7 18 0; +#X connect 0 8 19 0; +#X connect 0 9 20 0; +#X connect 0 10 21 0; +#X connect 0 11 22 0; +#X connect 0 12 23 0; +#X connect 0 13 26 0; +#X connect 0 14 24 0; +#X connect 0 15 25 0; +#X connect 1 0 40 0; +#X connect 2 0 3 0; +#X connect 2 1 47 1; +#X connect 3 0 47 0; +#X connect 4 0 5 0; +#X connect 4 1 5 1; +#X connect 5 0 27 0; +#X connect 6 0 1 0; +#X connect 7 0 0 0; +#X connect 8 0 6 1; +#X connect 9 0 7 0; +#X connect 10 0 9 1; +#X connect 28 0 47 2; +#X connect 29 0 48 2; +#X connect 30 0 49 2; +#X connect 31 0 50 2; +#X connect 32 0 51 2; +#X connect 33 0 45 2; +#X connect 34 0 52 2; +#X connect 35 0 53 2; +#X connect 36 0 54 2; +#X connect 37 0 55 2; +#X connect 38 0 56 2; +#X connect 39 0 57 2; +#X connect 40 0 2 0; +#X connect 40 1 48 1; +#X connect 40 2 49 1; +#X connect 40 3 50 1; +#X connect 40 4 51 1; +#X connect 40 5 45 1; +#X connect 40 6 52 1; +#X connect 40 7 53 1; +#X connect 40 8 54 1; +#X connect 40 9 55 1; +#X connect 40 10 56 1; +#X connect 40 11 57 1; +#X connect 40 12 58 1; +#X connect 40 13 59 1; +#X connect 40 14 60 1; +#X connect 40 15 61 1; +#X connect 41 0 58 2; +#X connect 42 0 60 2; +#X connect 43 0 59 2; +#X connect 44 0 61 2; +#X connect 45 0 52 0; +#X connect 46 0 9 0; +#X connect 46 0 6 0; +#X connect 47 0 48 0; +#X connect 48 0 49 0; +#X connect 49 0 50 0; +#X connect 50 0 51 0; +#X connect 51 0 45 0; +#X connect 52 0 53 0; +#X connect 53 0 54 0; +#X connect 54 0 55 0; +#X connect 55 0 56 0; +#X connect 56 0 57 0; +#X connect 57 0 58 0; +#X connect 58 0 59 0; +#X connect 59 0 60 0; +#X connect 60 0 61 0; +#X connect 61 0 4 0; +#X connect 62 0 6 0; +#X connect 63 0 9 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-genetic.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-henon.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-henon.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-henon.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,57 @@ +#N canvas 614 4 408 558 12; +#X floatatom 112 45 5 0 0 0 - - -; +#X floatatom 159 44 5 0 0 0 - - -; +#X obj 15 203 gemhead; +#X obj 14 237 translateXYZ; +#X obj 32 467 gemwin; +#X msg 157 432 1; +#X msg 158 459 0; +#X msg 82 403 create; +#X msg 81 430 destroy; +#N canvas 95 194 338 227 Gem.init 0; +#X obj 118 18 loadbang; +#X msg 201 78 reset; +#X obj 118 113 outlet; +#X obj 118 45 t b b; +#X msg 22 77 buffer 1; +#X connect 0 0 3 0; +#X connect 1 0 2 0; +#X connect 3 0 4 0; +#X connect 3 1 1 0; +#X connect 4 0 2 0; +#X restore 25 375 pd Gem.init; +#X obj 63 403 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 74 121 * 2; +#X obj 35 119 * 2; +#X obj 16 173 t b f; +#X floatatom 122 189 5 0 0 0 - - -; +#X floatatom 125 153 5 0 0 0 - - -; +#X obj 12 266 colorRGB 1 1 1; +#X obj 14 293 sphere 0.02; +#X obj 32 44 metro 50; +#X obj 37 79 henon 2 0.3; +#X obj 32 22 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +; +#X connect 0 0 19 1; +#X connect 1 0 19 2; +#X connect 2 0 3 0; +#X connect 3 0 16 0; +#X connect 5 0 4 0; +#X connect 6 0 4 0; +#X connect 7 0 4 0; +#X connect 8 0 4 0; +#X connect 9 0 4 0; +#X connect 10 0 4 0; +#X connect 11 0 3 2; +#X connect 11 0 15 0; +#X connect 12 0 13 0; +#X connect 13 0 2 0; +#X connect 13 1 3 1; +#X connect 13 1 14 0; +#X connect 16 0 17 0; +#X connect 18 0 19 0; +#X connect 19 0 12 0; +#X connect 19 1 11 0; +#X connect 20 0 18 0; +#X coords 0 0 0.00123609 0.0020202 200 140 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-henon.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-ifs.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-ifs.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-ifs.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,77 @@ +#N canvas 275 21 646 602 12; +#X obj 31 272 gemhead; +#X obj 31 296 translateXYZ; +#X obj 32 467 gemwin; +#X msg 170 433 1; +#X msg 170 456 0; +#X msg 82 403 create; +#X msg 83 430 destroy; +#N canvas 95 194 342 231 Gem.init 0; +#X obj 118 18 loadbang; +#X msg 201 78 reset; +#X obj 118 113 outlet; +#X obj 118 45 t b b; +#X msg 22 77 buffer 1; +#X connect 0 0 3 0; +#X connect 1 0 2 0; +#X connect 3 0 4 0; +#X connect 3 1 1 0; +#X connect 4 0 2 0; +#X restore 32 376 pd Gem.init; +#X obj 59 403 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 31 249 t b f; +#X obj 31 320 colorRGB 1 1 1; +#X obj 31 344 sphere 0.02; +#X obj 198 267 makenote 64 250; +#X obj 198 293 noteout; +#X obj 345 295 noteout; +#X msg 15 3 0.5 0.5 0 0 1 0.5 0.5 0.5 0 1 0.5 0.5 0.25 0.5 1; +#X msg 50 26 0.5 0.5 0 0 1 1 0.5 0.5 0.5 1 0.5 0.5 0 1 1; +#X msg 74 50 0.5 0.5 0.25 0 1 0.5 0.25 1 0.5 1 1 0.5 0 0.5 1; +#X obj 100 272 * 2; +#X obj 67 222 t b f; +#X obj 31 223 f; +#X obj 31 198 * 2; +#X obj 198 170 ifs; +#X msg 86 74 0.333 0.1 0 0 1 0.667 0.333 0 0.667 1 0.333 0.667 0.667 +0 1; +#X obj 198 215 map 0 2 52 88; +#X obj 345 214 map 0 2 52 88; +#X obj 345 268 makenote 64 100 250; +#X obj 198 147 metro 250; +#X obj 198 127 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +1; +#X connect 0 0 1 0; +#X connect 1 0 10 0; +#X connect 3 0 2 0; +#X connect 4 0 2 0; +#X connect 5 0 2 0; +#X connect 6 0 2 0; +#X connect 7 0 2 0; +#X connect 8 0 2 0; +#X connect 9 0 0 0; +#X connect 9 1 1 1; +#X connect 10 0 11 0; +#X connect 12 0 13 0; +#X connect 12 1 13 1; +#X connect 15 0 22 0; +#X connect 16 0 22 0; +#X connect 17 0 22 0; +#X connect 18 0 1 2; +#X connect 19 0 20 0; +#X connect 19 1 18 0; +#X connect 20 0 9 0; +#X connect 21 0 20 1; +#X connect 22 0 21 0; +#X connect 22 0 24 0; +#X connect 22 1 19 0; +#X connect 22 1 25 0; +#X connect 23 0 22 0; +#X connect 24 0 12 0; +#X connect 25 0 26 0; +#X connect 26 0 14 0; +#X connect 26 1 14 1; +#X connect 27 0 22 0; +#X connect 28 0 27 0; +#X coords 0 0 0.00123609 0.0020202 200 140 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-ifs.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-ifsmusic.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-ifsmusic.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-ifsmusic.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,13 @@ +#N canvas 0 0 482 332 12; +#X obj 22 109 makenote 64; +#X obj 22 134 noteout; +#X obj 22 5 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; +#X obj 22 24 metro 250; +#X msg 52 50 1 0 -1 1 -1 0 1 1; +#X obj 22 83 ifsmusic 66 82 54 75 71; +#X connect 0 0 1 0; +#X connect 0 1 1 1; +#X connect 2 0 3 0; +#X connect 3 0 5 0; +#X connect 4 0 5 0; +#X connect 5 0 0 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-ifsmusic.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-logistic.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-logistic.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-logistic.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,32 @@ +#N canvas 136 94 652 298 12; +#X obj 140 84 tabwrite logistic; +#N canvas 0 0 450 300 graph1 0; +#X array logistic 96 float 2; +#X coords 0 1 95 0 200 180 1; +#X restore 315 16 graph; +#X obj 14 132 noteout; +#X floatatom 118 41 5 0 0 0 - - -; +#X obj 235 59 + 1; +#X obj 181 63 float; +#X msg 181 41 0; +#X obj 14 85 map 0 1 52 76; +#X obj 14 40 metro 250; +#X obj 223 41 select 96; +#X obj 14 63 logistic 3.59; +#X obj 15 20 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +; +#X obj 14 107 makenote 100 250 500; +#X connect 3 0 10 1; +#X connect 4 0 5 1; +#X connect 4 0 0 1; +#X connect 4 0 9 0; +#X connect 5 0 4 0; +#X connect 6 0 5 0; +#X connect 7 0 12 0; +#X connect 8 0 5 0; +#X connect 8 0 10 0; +#X connect 10 0 0 0; +#X connect 10 0 7 0; +#X connect 11 0 8 0; +#X connect 12 0 2 0; +#X connect 12 1 2 1; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-logistic.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-lorenz.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-lorenz.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-lorenz.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,64 @@ +#N canvas 529 21 335 453 12; +#X floatatom 68 86 5 0 0 0 - - -; +#X floatatom 120 86 5 0 0 0 - - -; +#X obj 16 198 gemhead; +#X obj 16 223 translateXYZ; +#X obj 23 394 gemwin; +#X msg 154 358 1; +#X msg 156 381 0; +#X msg 73 330 create; +#X msg 74 357 destroy; +#N canvas 95 194 338 227 Gem.init 0; +#X obj 118 18 loadbang; +#X msg 201 78 reset; +#X obj 118 113 outlet; +#X obj 118 45 t b b; +#X msg 22 77 buffer 1; +#X connect 0 0 3 0; +#X connect 1 0 2 0; +#X connect 3 0 4 0; +#X connect 3 1 1 0; +#X connect 4 0 2 0; +#X restore 16 305 pd Gem.init; +#X obj 49 331 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 16 173 t b f; +#X obj 16 248 colorRGB 1 1 1; +#X floatatom 173 87 5 0 0 0 - - -; +#X obj 16 108 lorenz 10 28 2.666; +#X obj 16 148 / 20; +#X obj 84 198 / 20; +#X obj 126 198 / 20; +#X floatatom 25 129 5 0 0 0 - - -; +#X floatatom 102 131 5 0 0 0 - - -; +#X floatatom 175 132 5 0 0 0 - - -; +#X obj 16 273 sphere 0.01; +#X obj 16 65 metro 10; +#X obj 17 43 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 +; +#X connect 0 0 14 1; +#X connect 1 0 14 2; +#X connect 2 0 3 0; +#X connect 3 0 12 0; +#X connect 5 0 4 0; +#X connect 6 0 4 0; +#X connect 7 0 4 0; +#X connect 8 0 4 0; +#X connect 9 0 4 0; +#X connect 10 0 4 0; +#X connect 11 0 2 0; +#X connect 11 1 3 1; +#X connect 12 0 21 0; +#X connect 13 0 14 3; +#X connect 14 0 15 0; +#X connect 14 0 18 0; +#X connect 14 1 16 0; +#X connect 14 1 19 0; +#X connect 14 2 17 0; +#X connect 14 2 20 0; +#X connect 15 0 11 0; +#X connect 16 0 3 2; +#X connect 17 0 3 3; +#X connect 22 0 14 0; +#X connect 23 0 22 0; +#X coords 0 0 0.00123609 0.0020202 200 140 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-lorenz.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-map.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-map.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-map.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,10 @@ +#N canvas 0 0 450 300 10; +#X obj 21 44 map 0 5 0 100; +#X floatatom 21 23 5 0 0 0 - - -; +#X floatatom 21 67 5 0 0 0 - - -; +#X msg 64 22 3 2 0.2 1.4; +#X text 155 21 rescale to the desired range arguments: float or list +of floats; +#X connect 0 0 2 0; +#X connect 1 0 0 0; +#X connect 3 0 0 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-map.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-oneoverf.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-oneoverf.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-oneoverf.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,31 @@ +#N canvas 41 117 658 266 12; +#X obj 14 35 metro 100; +#X obj 120 91 + 1; +#X obj 156 91 select 100; +#X msg 120 38 0; +#N canvas 0 0 450 300 graph1 0; +#X array oneoverf 100 float 0; +#X coords 0 1 99 0 300 140 1; +#X restore 328 16 graph; +#X obj 30 118 tabwrite oneoverf; +#X obj 14 199 noteout; +#X obj 14 148 map 0 1 0 127; +#X obj 14 63 oneoverf 8; +#X obj 14 15 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 +; +#X obj 14 173 makenote 100 100 100; +#X obj 120 65 f; +#X connect 0 0 8 0; +#X connect 0 0 11 0; +#X connect 1 0 2 0; +#X connect 1 0 5 1; +#X connect 1 0 11 1; +#X connect 2 0 3 0; +#X connect 3 0 11 0; +#X connect 7 0 10 0; +#X connect 8 0 5 0; +#X connect 8 0 7 0; +#X connect 9 0 0 0; +#X connect 10 0 6 0; +#X connect 10 1 6 1; +#X connect 11 0 1 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-oneoverf.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp-help-patches/help-selfsimilar.pd =================================================================== --- trunk/externals/algocomp/algocomp-help-patches/help-selfsimilar.pd (rev 0) +++ trunk/externals/algocomp/algocomp-help-patches/help-selfsimilar.pd 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,28 @@ +#N canvas 51 221 474 392 12; +#X obj 31 10 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 +; +#X obj 31 114 s n_out; +#X obj 269 113 s n_out; +#X obj 150 112 s n_out; +#X obj 31 238 noteout; +#X obj 31 161 r n_out; +#X obj 31 212 makenote 60 100 250; +#X obj 31 186 unpack; +#X obj 31 61 selfsimilar 3 7 48 52 59 55; +#X obj 31 32 metro 250; +#X obj 31 88 pack 0 125; +#X obj 150 87 pack 0 400; +#X obj 269 87 pack 0 1000; +#X connect 0 0 9 0; +#X connect 5 0 7 0; +#X connect 6 0 4 0; +#X connect 6 1 4 1; +#X connect 7 0 6 0; +#X connect 7 1 6 2; +#X connect 8 0 10 0; +#X connect 8 1 11 0; +#X connect 8 2 12 0; +#X connect 9 0 8 0; +#X connect 10 0 1 0; +#X connect 11 0 3 0; +#X connect 12 0 2 0; Property changes on: trunk/externals/algocomp/algocomp-help-patches/help-selfsimilar.pd ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/algocomp.c =================================================================== --- trunk/externals/algocomp/algocomp.c (rev 0) +++ trunk/externals/algocomp/algocomp.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,132 @@ +/* +* Main library file +*/ + +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include "helpers.c" +#include "chaotic.c" +#include "fractal.c" +#include "ifs.c" +#include "ifsmusic.c" +#include "selfsimilar.c" +#include "logistictilde.c" +#include "gauss_tilde.c" +#include "utils.c" +#include "elementaryca.c" +#include "genetic.c" +#include "neural.c" +#include "distribute.c" + + +void algocomp_setup(void) { + logistic_class = class_new(gensym("logistic"), + (t_newmethod)logistic_new, + 0, sizeof(t_logistic), + CLASS_DEFAULT, A_DEFFLOAT,0); + class_addbang(logistic_class, logistic_bang); + henon_class = class_new(gensym("henon"), + (t_newmethod)henon_new, + 0, sizeof(t_henon), + CLASS_DEFAULT, A_DEFFLOAT,A_DEFFLOAT,0); + class_addbang(henon_class, henon_bang); + lorenz_class = class_new(gensym("lorenz"), + (t_newmethod)lorenz_new, + 0, sizeof(t_lorenz), + CLASS_DEFAULT, A_DEFFLOAT, A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); + class_addbang(lorenz_class, lorenz_bang); + chaosgame_class = class_new(gensym("chaosgame"), + (t_newmethod)chaosgame_new, + 0, sizeof(t_chaosgame), + CLASS_DEFAULT, A_DEFFLOAT,0); + class_addbang(chaosgame_class, chaosgame_bang); + selfsimilar_class = class_new(gensym("selfsimilar"), + (t_newmethod)selfsimilar_new, + 0, sizeof(t_selfsimilar), + CLASS_DEFAULT, A_GIMME,0); + class_addbang(selfsimilar_class, selfsimilar_bang); + selfsimilarrhythm_class = class_new(gensym("selfsimilarrhythm"), + (t_newmethod)selfsimilarrhythm_new, + 0, sizeof(t_selfsimilarrhythm), + CLASS_DEFAULT, A_DEFFLOAT,0); + class_addbang(selfsimilarrhythm_class, selfsimilarrhythm_bang); + ifs_class = class_new(gensym("ifs"), + (t_newmethod)ifs_new, + 0, sizeof(t_ifs), + CLASS_DEFAULT, 0); + class_addbang(ifs_class, ifs_bang); + class_addmethod(ifs_class,(t_method)ifs_setFunctions,gensym("list"), A_GIMME,0); + distribute_class = class_new(gensym("distribute"), + (t_newmethod)distribute_new, + 0, sizeof(t_distribute), + CLASS_DEFAULT, A_DEFFLOAT, 0); + class_addmethod(distribute_class,(t_method)distribute_float,gensym("float"), A_FLOAT,0); + + + ifsmusic_class = class_new(gensym("ifsmusic"), + (t_newmethod)ifsmusic_new, + 0, sizeof(t_ifsmusic), + CLASS_DEFAULT, A_GIMME, 0); + class_addbang(ifsmusic_class, ifsmusic_bang); + class_addmethod(ifsmusic_class,(t_method)ifsmusic_setFunctions,gensym("list"), A_GIMME,0); + class_addmethod(ifsmusic_class,(t_method)ifsmusic_setNotes,gensym("notes"), A_GIMME,0); + class_addmethod(ifsmusic_class,(t_method)ifsmusic_outputSerie,gensym("serie"), 0); + eca_class = class_new(gensym("eca"), + (t_newmethod)eca_new, + 0, sizeof(t_eca), + CLASS_DEFAULT,A_DEFFLOAT, A_DEFFLOAT,A_DEFFLOAT,0); + class_addbang(eca_class, eca_bang); + class_addmethod(eca_class,(t_method)eca_randomize,gensym("randomize"), 0); + class_addmethod(eca_class,(t_method)eca_activateMiddleCell,gensym("init"), 0); + genetic_class = class_new(gensym("genetic"), + (t_newmethod)genetic_new, + 0, sizeof(t_genetic), + CLASS_DEFAULT,A_DEFFLOAT, A_DEFFLOAT,A_DEFFLOAT,0); + class_addbang(genetic_class, genetic_bang); + class_addmethod(genetic_class,(t_method)genetic_randomize,gensym("randomize"), 0); + class_addmethod(genetic_class,(t_method)genetic_setTarget,gensym("target"), A_GIMME,0); + //void class_addlist(t_class *c, t_method fn); + mlp_class = class_new(gensym("mlp"), + (t_newmethod)mlp_new, + 0, sizeof(t_mlp), + CLASS_DEFAULT,0); + class_addbang(mlp_class, mlp_bang); + class_addmethod(mlp_class,(t_method)mlp_inputed,gensym("list"), A_GIMME, 0); + class_addmethod(mlp_class,(t_method)mlp_train,gensym("train"), 0); + class_addmethod(mlp_class,(t_method)mlp_setTarget,gensym("target"), A_GIMME,0); + oneoverf_class = class_new(gensym("oneoverf"), + (t_newmethod)oneoverf_new, + 0, sizeof(t_oneoverf), + CLASS_DEFAULT,A_DEFFLOAT, 0); + class_addbang(oneoverf_class, oneoverf_bang); + logistic_tilde_class = class_new(gensym("logistic~"), + (t_newmethod)logistic_tilde_new, + 0, sizeof(t_logistic_tilde), + CLASS_DEFAULT, + A_DEFFLOAT, + 0); + class_addmethod(logistic_tilde_class, + (t_method)logistic_tilde_dsp, gensym("dsp"), 0); + // CLASS_MAINSIGNALIN(logistic_tilde_class, t_logistic_tilde, f); + gauss_tilde_class = class_new(gensym("gauss~"), + (t_newmethod)gauss_tilde_new, 0, + sizeof(t_gauss_tilde), + 0, A_DEFFLOAT, A_DEFFLOAT, 0); + class_addmethod(gauss_tilde_class, (t_method)gauss_tilde_dsp, + gensym("dsp"), 0); + // class_addbang(rand_gauss_class, rand_gauss_bang); + map_class = class_new(gensym("map"), + (t_newmethod)map_new, + 0, sizeof(t_map), + CLASS_DEFAULT, + A_DEFFLOAT, A_DEFFLOAT,A_DEFFLOAT,A_DEFFLOAT,0); + + class_addfloat(map_class, map_float); + class_addmethod(map_class,(t_method)map_list,gensym("list"), A_GIMME, 0); + + post("AlgoComp library loaded - v_0.20060116"); + +} + Property changes on: trunk/externals/algocomp/algocomp.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/chaotic.c =================================================================== --- trunk/externals/algocomp/chaotic.c (rev 0) +++ trunk/externals/algocomp/chaotic.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,108 @@ +/* +* Chaotic function objects +*/ + +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +static t_class *logistic_class; +static t_class *henon_class; +static t_class *lorenz_class; + + +typedef struct _logistic { + t_object x_obj; + t_float x; + t_float a; + t_outlet *note_out; +} t_logistic; + +void logistic_bang(t_logistic *x) +{ +if (x->a > 4) x->a = 4; +if (x->a <= 0) x->a = 0.01; +outlet_float(x->note_out, x->x); +x->x = x->a*x->x*(1-x->x); +} + +void *logistic_new(t_floatarg f) +{ + t_logistic *x = (t_logistic *)pd_new(logistic_class); + x->a = f; + x->x = 0.5; + x->note_out = outlet_new(&x->x_obj,&s_float); + floatinlet_new(&x->x_obj, &x->a); + return (void *)x; +} + +typedef struct _henon { + t_object x_obj; + t_float x,y,B,A; + t_outlet *x_out, *y_out; +} t_henon; + +void henon_bang(t_henon *x) +{ +outlet_float(x->x_out, x->x); +outlet_float(x->y_out, x->y); +x->x = x->y+1-x->A*x->x*x->x; +x->y = x->B*x->x; +} + +void *henon_new(t_floatarg f1,t_floatarg f2) +{ + t_henon *x = (t_henon *)pd_new(henon_class); + x->A = f1; + x->B = f2; + x->x = 0; + x->y = 0; + x->x_out = outlet_new(&x->x_obj,&s_float); + x->y_out = outlet_new(&x->x_obj,&s_float); + + floatinlet_new(&x->x_obj, &x->A); + floatinlet_new(&x->x_obj, &x->B); + + return (void *)x; +} + +typedef struct _lorenz { + t_object x_obj; + t_float x,y,z,B,R,S,xdot,ydot,zdot,dt; + t_outlet *x_out, *y_out, *z_out; +} t_lorenz; + +void lorenz_bang(t_lorenz *x) +{ +outlet_float(x->x_out, x->x); +outlet_float(x->y_out, x->y); +outlet_float(x->z_out, x->z); +x->xdot = x->S * (x->y - x->x); +x->ydot = x->R * x->x - x->y - (x->x * x->z); +x->zdot = x->x * x->y - x->B * x->z; +x->x = x->x + x->xdot * x->dt; +x->y = x->y + x->ydot * x->dt; +x->z = x->z + x->zdot * x->dt; + +} + +void *lorenz_new(t_floatarg f1,t_floatarg f2,t_floatarg f3,t_floatarg f4) +{ + t_lorenz *x = (t_lorenz *)pd_new(lorenz_class); + x->S = f1; + x->R = f2; + x->B = f3; + x->x = 0.1; + x->y = 0.1; + x->z = 0.1; + x->dt = 0.01; + if (f4 != 0) x->dt = f4; + x->x_out = outlet_new(&x->x_obj,&s_float); + x->y_out = outlet_new(&x->x_obj,&s_float); + x->z_out = outlet_new(&x->x_obj,&s_float); + floatinlet_new(&x->x_obj, &x->S); + floatinlet_new(&x->x_obj, &x->R); + floatinlet_new(&x->x_obj, &x->B); + return (void *)x; +} Property changes on: trunk/externals/algocomp/chaotic.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/distribute.c =================================================================== --- trunk/externals/algocomp/distribute.c (rev 0) +++ trunk/externals/algocomp/distribute.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,35 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +static t_class *distribute_class; + +typedef struct _distribute { + t_object x_obj; + t_int counter; + t_int max; + t_outlet *out[128];//,*r_out,*n_out; +} t_distribute; + +void distribute_float(t_distribute *x,t_float in) +{ +outlet_float(x->out[x->counter],in); +x->counter++; +if (x->counter == x->max) +x->counter = 0; +//x->out[x->counter] = in; +} + +void *distribute_new(t_floatarg f1) +{ + int i; + t_distribute *x = (t_distribute *)pd_new(distribute_class); + x->counter = 0; + if ((f1>0) && (f1<128)) + x->max = (t_int) f1; + else x->max = 8; + for (i=0;i<x->max;i++) + x->out[i] = outlet_new(&x->x_obj,&s_float); + return (void *)x; +} Property changes on: trunk/externals/algocomp/distribute.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/elementaryca.c =================================================================== --- trunk/externals/algocomp/elementaryca.c (rev 0) +++ trunk/externals/algocomp/elementaryca.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,132 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +#define TRUE 1 +#define FALSE 0 +#define MAX_ARRAY_SIZE 256 + +//Already defined elsewhere ?? +//typedef short boolean; + +static t_class *eca_class; + + +typedef struct _eca { + t_object x_obj; + t_int counter; + boolean cells[256]; + t_int size; + //t_int offset; + t_outlet *on_cells; + //t_outlet *firstcell; + t_atom oncells[256]; + boolean ruletable[8]; + t_int rule; + t_float inrule; +} t_eca; + +void randomizeCells(t_eca *x) { + int i; + for (i=0;i<x->size;i++) { + x->cells[i] = ((t_float) rand())/RAND_MAX*2; + } +} + +void eca_activateMiddleCell(t_eca *x) { + int i; + post("activate middle cell"); + for (i=0;i<x->size;i++) { + x->cells[i] = FALSE; + } + x->cells[x->size/2] = TRUE; +} + +void calculateCellStates(t_eca *x) { + + int i; + + boolean newstates[MAX_ARRAY_SIZE]; + newstates[0] = x->ruletable[x->cells[x->size-1]*4+x->cells[0]*2+x->cells[1]]; + newstates[x->size-1] = x->ruletable[x->cells[x->size-2]*4+x->cells[x->size-1]*2+x->cells[0]]; + for (i=1;i<x->size-1;i++) { + newstates[i] = x->ruletable[x->cells[i-1]*4+x->cells[i]*2+x->cells[i+1]]; + } + for (i=0;i<x->size;i++) { + x->cells[i] = newstates[i]; + } +} + +void eca_randomize(t_eca *x) { +post("Randomize called"); +randomizeCells(x); +} + +void createRuleTable(t_eca *x,unsigned short decimalcode) { + + int i; + post("Rule changed to %d",x->rule); + //decimalcode to binary + fast_d2b(decimalcode,x->ruletable); + //for (i=0;i<8;i++) + //post("%d",x->ruletable[i]); +} + +void eca_bang(t_eca *x) +{ +t_atom *y; +int i; +int k = 0; +if ((t_int) x->inrule != x->rule) { +x->rule = (t_int) x->inrule/1; +createRuleTable(x,(unsigned short) x->rule); +} +//startpost("%d",x->counter); +for (i=0;i<x->size;i++) { + if (x->cells[i]==TRUE) + { + //startpost("& $\\bullet$ "); + SETFLOAT(&x->oncells[k],i); +// SETFLOAT(&x->oncells[k],i+x->offset); +// oncells[k] = y; + k++; + } + //else startpost("& "); + + +} +//post("\\tabularnewline"); +x->counter++; +//randomizeCells(x); +outlet_list(x->on_cells,&s_list, k, &x->oncells[0]); +calculateCellStates(x); // calculate for next step +//outlet_float(x->firstcell,x->cells[0]); +} + + + +/* + * take argument rule, size, init (0=random), (1=middlecell active) + */ +void *eca_new(t_floatarg rule,t_floatarg size,t_floatarg init) +{ + + t_eca *x = (t_eca *)pd_new(eca_class); + //inlet_new(&x->x_obj, &x->x_obj.ob_pd,gensym("list"), gensym("randomize")); + if (size != 0) + x->size = size; + else (size = 16); + //x->offset = offset; + + if (init == 0) randomizeCells(x); + else if (init == 1) eca_activateMiddleCell(x); + x->rule = rule; + x->inrule = rule; + x->counter = 1; + createRuleTable(x,(unsigned short) rule); + x->on_cells = outlet_new(&x->x_obj,&s_list); + //x->firstcell = outlet_new(&x->x_obj,&s_float); + floatinlet_new(&x->x_obj, &x->inrule); + return (void *)x; +} Property changes on: trunk/externals/algocomp/elementaryca.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/fractal.c =================================================================== --- trunk/externals/algocomp/fractal.c (rev 0) +++ trunk/externals/algocomp/fractal.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,118 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +static t_class *oneoverf_class; +static t_class *chaosgame_class; + + +/* + * Implementation of 1/f noise sequences + */ + +typedef struct _oneoverf { + t_object x_obj; +// t_int nrp; + t_int nrbits; + t_float bits; + t_float output; + t_float rans[32]; +// t_int count[16]; + t_int counter; +// t_float avg[16]; + t_outlet *note_out;//,*r_out,*n_out; +} t_oneoverf; + +void oneoverf_bang(t_oneoverf *x) +{ +if ((t_int) x->bits != x->nrbits) { +post("Changed number of bits"); +x->nrbits = (t_int) x->bits; +x->counter = 0; +} +int i; +outlet_float(x->note_out, x->output); +//outlet_float(x->r_out, x->nrp); +//outlet_float(x->n_out, x->nrp); +x->output = 0; // ((t_float) rand())/RAND_MAX/x->nrbits; +x->counter++; +for (i=x->nrbits-1;i>=0;i--) { +// x->avg[i] = ((t_float) (x->avg[i]*(x->count[i]-1)+x->old))/x->count[i]; + + if (x->counter%((int) pow(2,i)) == 0) { + if (i == x->nrbits-1) x->counter = 0; +// x->count[i] = 1; +// x->avg[i] = 0; + x->rans[i] = ((t_float) rand())/RAND_MAX/x->nrbits; + post("Changing value of %d, counter: %d",i,x->counter); + i = -1; // break + } +} +for (i=0;i<x->nrbits;i++) { + x->output += x->rans[i]; +} +} + +void *oneoverf_new(t_floatarg f1) +{ + t_oneoverf *x = (t_oneoverf *)pd_new(oneoverf_class); + int i; + x->bits = f1; + x->nrbits = (t_int) f1; + if (f1 < 1) x->nrbits = 1; + else if (f1 > 32) x->nrbits = 32; + x->output = 0; + x->counter = 0; + for (i=0;i<x->nrbits;i++) { + x->rans[i] = (((t_float) rand())/RAND_MAX)/x->nrbits; + // x->count[i] = 1; +// x->avg[i] = 0; + x->output += x->rans[i]; + post("Random generators: %d", x->nrbits); + } + x->note_out = outlet_new(&x->x_obj,&s_float); + floatinlet_new(&x->x_obj, &x->bits); + //x->r_out = outlet_new(&x->x_obj,&s_float); + //x->n_out = outlet_new(&x->x_obj,&s_float); + return (void *)x; +} + +/* + * Implementation of the chaos game! + */ +typedef struct _chaosgame { + t_object x_obj; + t_float x,y; + t_float px[3],py[3]; + t_outlet *x_out,*y_out; +} t_chaosgame; + + +void chaosgame_bang(t_chaosgame *x) +{ +int i; +outlet_float(x->x_out, x->x); +outlet_float(x->y_out, x->y); +i = 3*rand()/32765; +x->x = (x->x + x->px[i])/2; +x->y = (x->y + x->py[i])/2; +} + +void *chaosgame_new(t_floatarg f1) +{ + t_chaosgame *x = (t_chaosgame *)pd_new(chaosgame_class); + x->px[0] = -1; + x->py[0] = -1; + x->px[1] = 0; + x->py[1] = 1; + x->px[2] = 1; + x->py[2] = -1; + + x->x = rand()/RAND_MAX; + x->y = rand()/RAND_MAX; + + x->x_out = outlet_new(&x->x_obj,&s_float); + x->y_out = outlet_new(&x->x_obj,&s_float); + return (void *)x; +} Property changes on: trunk/externals/algocomp/fractal.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/gauss_tilde.c =================================================================== --- trunk/externals/algocomp/gauss_tilde.c (rev 0) +++ trunk/externals/algocomp/gauss_tilde.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,65 @@ +#include "m_pd.h" + + +#define fran() (t_float)rand()/(t_float)RAND_MAX + +static char *version = "gauss v0.1, generates a Gaussian distributed random variable\n" + " with mean 'mu' and standard deviation 'sigma',\n" + " written by Olaf Matthes <olaf.matthes(a)gmx.de>"; + +/* -------------------------- rand_gauss ------------------------------ */ + +static t_class *gauss_tilde_class; + +typedef struct _gauss_tilde +{ + t_object x_obj; + t_float x_sigma; + t_float x_mu; +} t_gauss_tilde; + + + +t_int *gauss_tilde_perform(t_int *w) +{ + t_gauss_tilde *x = (t_gauss_tilde *)(w[1]); + t_sample *out = (t_sample *)(w[2]); + int n = (int)(w[3]); + t_float u, halfN = 6.0, sum = 0, scale; + t_int k, N = 12; + scale = 1/sqrt(N/12); + while (n--){ + sum = 0; + for(k = 1; k <= N; k++) + sum += fran(); + *out++ = x->x_sigma*scale*(sum-halfN)+x->x_mu; + } + return (w+4); +} + +void gauss_tilde_dsp(t_gauss_tilde *x, t_signal **sp) +{ +dsp_add(gauss_tilde_perform, 3, x, +sp[0]->s_vec, +sp[0]->s_n); +} + + +void *gauss_tilde_new(t_floatarg fs, t_floatarg fm) +{ + t_gauss_tilde *x = (t_gauss_tilde *)pd_new(gauss_tilde_class); + + floatinlet_new(&x->x_obj, &x->x_sigma); + floatinlet_new(&x->x_obj, &x->x_mu); + outlet_new(&x->x_obj, &s_signal); + x->x_sigma = fs; + x->x_mu = fm; + return (x); +} + + + + + + + Property changes on: trunk/externals/algocomp/gauss_tilde.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/genetic.c =================================================================== --- trunk/externals/algocomp/genetic.c (rev 0) +++ trunk/externals/algocomp/genetic.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,218 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +#define TRUE 1 +#define FALSE 0 +#define MAX_ARRAY_SIZE 256 +//typedef short boolean; + +static t_class *genetic_class; + +typedef struct _individual { + boolean genes[MAX_ARRAY_SIZE]; + float fitness; + t_int length; +} t_individual; + +typedef struct _genetic { + t_object x_obj; + float cumulativeprobability; + t_int individuallength; + t_individual population[MAX_ARRAY_SIZE]; + t_int populationsize; + t_individual targetindividual; + t_atom out[MAX_ARRAY_SIZE]; + t_int chunksize; + t_outlet *outlist; +} t_genetic; + +void randomizeIndividuals(t_genetic *x) { + int i,k; + for (k=0;k<x->populationsize;k++) { + for (i=0;i<x->individuallength;i++) { + x->population[k].genes[i] = ((t_float) rand())/RAND_MAX*2; + } + x->population[k].length = x->individuallength; + } +// x->population[0].genes[0] = 1; +// x->population[0].genes[1] = 0; +} + +void printTarget(t_genetic *x) { + unsigned int out[MAX_ARRAY_SIZE]; + int i; + for (i=0;i< x->targetindividual.length/x->chunksize;i++) { + fast_b2short(&out[i],&x->targetindividual.genes[i*x->chunksize],x->chunksize); + SETFLOAT(&x->out[i],out[i]); + } + outlet_list(x->outlist,&s_list, i, &x->out[0]); +} + + +void randomTargetIndividual(t_genetic *x) { + int i; + for (i=0;i<x->individuallength;i++) { + x->targetindividual.genes[i] = ((t_float) rand())/RAND_MAX*2; + } + x->targetindividual.length = x->individuallength; + //printTarget(&x->targetindividual,x); +} + +/*float evaluateFitness(t_genetic *x,int index) { + int fitness = 0; + int i; +// post("Fitness eval"); + for (i=0;i<x->individuallength;i++) { + //if (x->targetindividual.genes[i] == x->population[index].genes[i]) + //if (x->population[index].genes[i] == TRUE) + fitness += x->population[0].genes[0]; + //fitness++; + } + return fitness/x->individuallength; + //return 1; +} +*/ +void startReproduction(t_genetic *x) { + int selectedIndividuals[MAX_ARRAY_SIZE]; + int count = 0; + int i; + float r; + t_individual childs[MAX_ARRAY_SIZE]; + int childindex = 0; + for (count =0; count < x->populationsize/4; count++) { + float sum = 0; + i = 0; + r = ((t_float) rand())/RAND_MAX * x->cumulativeprobability; + while (r > sum) { + sum += x->population[i].fitness; + i++; + } + selectedIndividuals[count] = i; + } + post("parents: %d",count); + i=0; + while (i<count) { + int k = 0; + for (k=0;k<8;k++) { + int l; + r = ((t_float) rand())/RAND_MAX * x->individuallength; + for (l=0;l<x->individuallength;l++) { + if (l<r) childs[childindex].genes[l] = x->population[selectedIndividuals[i]].genes[l]; + else childs[childindex].genes[l] = x->population[selectedIndividuals[i+1]].genes[l]; + } + // mutation + r = ((t_float) rand())/RAND_MAX * x->individuallength; + childs[childindex].genes[(int)r] = 1-childs[childindex].genes[(int)r]; + childindex++; + } + i+=2; + } + for (i=0;i<childindex;i++) { + x->population[i] = childs[i]; + } + post("New childs: %d",childindex); + +} + + +int evaluatePopulation(t_genetic *x) { + int i,k; + int f; + int highestfitnessindex = 0; + float highestfitness = 0; + float mean; + x->cumulativeprobability = 0; + for (k=0; k < x->populationsize; k++) { + float fitness = 0; + for (i=0;i<x->individuallength;i++) { + //x->population[k].genes[i] = 0; + if (x->targetindividual.genes[i] == x->population[k].genes[i]) + fitness++; +// fitness += x->population[k].genes[i]; + } + x->population[k].fitness = fitness/x->individuallength; + x->population[k].fitness = (fitness/x->individuallength)*(fitness/x->individuallength); + + if (x->population[k].fitness > highestfitness) { + // post("fitness of %d: %f",k,fitness); + highestfitness = x->population[k].fitness; + highestfitnessindex = k; + } + x->cumulativeprobability+=x->population[k].fitness; + } + //recalculate + mean = x->cumulativeprobability/x->populationsize; + x->cumulativeprobability = 0; + for (k=0;k < x->populationsize; k++) { + if (x->population[k].fitness < mean) + x->population[k].fitness = 0; + else x->cumulativeprobability += x->population[k].fitness; + } + post("Highest fitness: %f",highestfitness); + return highestfitnessindex; +} + + +void genetic_setTarget(t_genetic *x,t_symbol *s, int argc, t_atom *argv) { +int i; +post("target called: %d",argc); + for (i=0;i< x->individuallength/x->chunksize;i++) { + if (i >= argc) break; + fast_d2bl(atom_getint(&argv[i]),&x->targetindividual.genes[i*x->chunksize],x->chunksize); + + } + printTarget(x); +} + +void genetic_randomize(t_genetic *x) { +post("Randomize called"); +randomizeIndividuals(x); +} + +void genetic_bang(t_genetic *x) +{ + int selected = 1; + unsigned int out[MAX_ARRAY_SIZE]; + int i; + selected = evaluatePopulation(x); + //post("Selected individual: %d",selected); + for (i=0;i< x->individuallength/x->chunksize;i++) { + //out[i] = ((t_float) rand())/RAND_MAX*2; + fast_b2short(&out[i],&x->population[selected].genes[i*x->chunksize],x->chunksize); + //fast_b2short8(&out[i],&x->population[selected].genes[i*8]); + SETFLOAT(&x->out[i],out[i]); + } + // fast_b2d(&out,&x->population[0].genes[0]); +// fast_b2short(&out,&x->population[0].genes[0]); +// fast_b2d(&out,&test[0]); +// out = 100; +// SETFLOAT(&x->out[1],out); + outlet_list(x->outlist,&s_list, i, &x->out[0]); + startReproduction(x); +} + + +/* + * take argument rule, size, and offset + */ +void *genetic_new(t_float popsize,t_float indsize, t_float chunksize) +{ + t_genetic *x = (t_genetic *)pd_new(genetic_class); + //inlet_new(&x->x_obj, &x->x_obj.ob_pd,gensym("list"), gensym("randomize")); + if ((popsize > 0) && (popsize <= 256)) + x->populationsize = popsize; + else x->populationsize = 256; + if ((indsize > 0) && (indsize <= 256)) + x->individuallength = indsize; + else x->individuallength = 256; + if ((chunksize <= 16) && (chunksize > 0)) + x->chunksize = (int) chunksize; + else x->chunksize = 8; + randomizeIndividuals(x); + randomTargetIndividual(x); + inlet_new(&x->x_obj, &x->x_obj.ob_pd,gensym("list"), gensym("target")); + x->outlist = outlet_new(&x->x_obj,&s_list); + return (void *)x; +} Property changes on: trunk/externals/algocomp/genetic.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/helpers.c =================================================================== --- trunk/externals/algocomp/helpers.c (rev 0) +++ trunk/externals/algocomp/helpers.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,42 @@ +void fast_d2bl(int x, short *c, short length) { + int i; + for (i=0;i<length;i++) + *(c++) = (x >> i) & 0x1; +} + +void fast_d2b(unsigned short x, short *c) { + int i; + for (i=0;i<8;i++) + *(c++) = (x >> i) & 0x1; +} + + +void fast_b2d(unsigned long int *n, short *c) { +int i = 32; +*n = 0; +while(i--) { +*n <<=1; +*n+= *(c+i); +} +} + +void fast_b2short8(unsigned short *n, short *c) { +int i = 8; +*n = 0; +while(i--) { +*n <<=1; +*n+= *(c+i); +} +} + +void fast_b2short(unsigned int *n, short *c,short length) { +int i; +if ((length <= 16) && (length > 0)) +i = length; +else i = 8; +*n = 0; +while(i--) { +*n <<=1; +*n+= *(c+i); +} +} Property changes on: trunk/externals/algocomp/helpers.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/ifs.c =================================================================== --- trunk/externals/algocomp/ifs.c (rev 0) +++ trunk/externals/algocomp/ifs.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,105 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +static t_class *ifs_class; + + +/* + * An interated function system music example + * a more general approach is needed. + */ +typedef struct _ifs { + t_object x_obj; + t_int nr_functions; + t_float R1,R2; + t_float T1[6],T2[6],S1[6],S2[6]; + t_float A[6], B[6]; + t_float C[6], D[6], P[6]; + t_float x,y; + t_outlet *x_out,*y_out, *i_out; +} t_ifs; + + +void ifs_bang(t_ifs *x) +{ +float r = ((float) rand())/RAND_MAX; +int i = 0; +while (r > x->P[i]) +i++; +//post("Applying function nr: %d",i); +//x->x = x->A[i]*x->x + x->B[i]*x->y + x->T1[i]; +//x->y = x->C[i]*x->x + x->D[i]*x->y + x->T2[i]; +x->x = x->S1[i]*x->x + x->T1[i]; +x->y = x->S2[i]*x->y + x->T2[i]; +outlet_float(x->x_out,x->x); +outlet_float(x->y_out,x->y); +//outlet_float(x->i_out,r); +} + +void ifs_setFunctions(t_ifs *x,t_symbol *s, int argc, t_atom *argv) { +int i; +float p = 0; +x->nr_functions = argc/5; +post("%d new function set!",x->nr_functions); + +for (i=0;i<x->nr_functions;i++) { + x->S1[i] = atom_getfloat(&argv[i*5]); + x->S2[i] = atom_getfloat(&argv[i*5+1]); + x->T1[i] = atom_getfloat(&argv[i*5+2]); + x->T2[i] = atom_getfloat(&argv[i*5+3]); + x->P[i] = p+atom_getfloat(&argv[i*5+4]); + p = x->P[i]; +} + +if (p != 1.0) { + float scale = 1.0/p; + post("%d new function set. Scale probabilities by %f",x->nr_functions,scale); + for (i=0;i<x->nr_functions;i++) { + x->P[i] = scale*x->P[i]; + startpost("p for %d: %f; ",i,x->P[i]); + } +} + +} + +void *ifs_new(t_floatarg f1) +{ + t_ifs *x = (t_ifs *)pd_new(ifs_class); + t_float p; + t_float R1[6],R2[6],S1[6],S2[6]; + t_int i; + x->nr_functions = 3; + p = 1.0/x->nr_functions; + //R1[0]=R1[1]=R1[2]=R1[3]=R1[4]=R1[5]= 1; + //R2[0]=R2[1]=R2[2]=R2[3]=R2[4]=R2[5]= 0; + //S1[0]=S1[1]=S1[2]=S1[3]=S1[4]=S1[5]= 0.5;//0.33333; + //S2[0]=S2[1]=S2[2]=S2[3]=S2[4]=S2[5]= 1;//0.33333; + + x->S1[0]=0.333; + x->S2[0]=0.333; + x->S1[1]=0.667; + x->S2[1]=0.333; + x->S1[2]=0.333; + x->S2[2]=0.333; + x->T1[0] = 0; + x->T2[0] = 0; + x->T1[1] = 0.333; + x->T2[1] = 0.333; + x->T1[2] = 0; + x->T2[2] = 0.667; + + for (i = 0;i<x->nr_functions;i++) { + x->P[i] = p*(i+1); + post("prob %d: %f",i,x->P[i]); + } + x->x = 0; + x->y = 0; + x->x_out = outlet_new(&x->x_obj,&s_float); + x->y_out = outlet_new(&x->x_obj,&s_float); + //x->i_out = outlet_new(&x->x_obj,&s_float); + post("ifs initialized"); + return (void *)x; +} + Property changes on: trunk/externals/algocomp/ifs.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/ifs.c.old =================================================================== --- trunk/externals/algocomp/ifs.c.old (rev 0) +++ trunk/externals/algocomp/ifs.c.old 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,77 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +static t_class *ifs_class; + + +/* + * An interated function system music example + * a more general approach is needed. + */ +typedef struct _ifs { + t_object x_obj; + t_float R1,R2,S1,S2; + t_float T1[6],T2[6]; + t_float A[6], B[6]; + t_float C[6], D[6],P[6]; + t_float x,y; + t_outlet *x_out,*y_out, *i_out; +} t_ifs; + + +void ifs_bang(t_ifs *x) +{ +float r = ((float) rand())/RAND_MAX; +int i = 0; +while (r > x->P[i]) +i++; +x->x = x->A[i]*x->x + x->B[i]*x->y + x->T1[i]; +x->y = x->C[i]*x->x + x->D[i]*x->y + x->T2[i]; +outlet_float(x->x_out,x->x); +outlet_float(x->y_out,x->y); +outlet_float(x->i_out,r); +} + + + +void *ifs_new(t_floatarg f1) +{ + x->nr_functions = 3; + t_float R1[6],R2[6],S1[6],S2[6]; + t_ifs *x = (t_ifs *)pd_new(ifs_class); + t_int i; + t_float p = 1/x->nr_functions; + R1[0]=R1[1]=R1[2]=R1[3]=R1[4]=R1[5]= 1; + R2[0]=R2[1]=R2[2]=R2[3]=R2[4]=R2[5]= 0; + S1[0]=S1[1]=S1[2]=S1[3]=S1[4]=S1[5]= 0.5;//0.33333; + S2[0]=S2[1]=S2[2]=S2[3]=S2[4]=S2[5]= 1;//0.33333; + x->T1[0] = 0; + x->T2[0] = 2; + x->T1[1] = 1.5; + x->T2[1] = 1; + x->T1[2] = 1.5; + x->T2[2] = -1; + x->T1[3] = 0; + x->T2[3] = -2; + x->T1[4] = -1.5; + x->T2[4] = -1; + x->T1[5] = -1.5; + x->T2[5] = 1; + for (i = 0;i<6;i++) { + x->A[i] = S1[i]*cos(R1[i]); + x->B[i] = -S2[i]*sin(R2[i]); + x->C[i] = S1[i]*sin(R1[i]); + x->D[i] = S2[i]*cos(R2[i]); + x->P[i] = p*(i+1); + } + x->x = 0; + x->y = 0; + x->x_out = outlet_new(&x->x_obj,&s_float); + x->y_out = outlet_new(&x->x_obj,&s_float); + x->i_out = outlet_new(&x->x_obj,&s_float); + post("ifs initialized"); + return (void *)x; +} + Property changes on: trunk/externals/algocomp/ifs.c.old ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/ifsmusic.c =================================================================== --- trunk/externals/algocomp/ifsmusic.c (rev 0) +++ trunk/externals/algocomp/ifsmusic.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,151 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +static t_class *ifsmusic_class; + +/* + * An interated function system music example + */ +typedef struct _ifsmusic { + t_object x_obj; + t_int nr_notes; + t_int nr_functions; +// t_int melodylength; + t_float T[16]; + t_float S[16]; + t_float P[16]; + t_int R[16]; + t_int count; + t_float note[16]; + t_atom notesout[16]; + t_outlet *x_out; +} t_ifsmusic; + + + + +void nextSerie(t_ifsmusic *x) { +int i; +if (x->count == x->nr_notes) { +t_float ra = rand(); +t_float r = ra/RAND_MAX; +int k = 0; +t_float noten[16]; +x->count = 0; +while (r>x->P[k]) k++; +post("Selected function %d, r=%f",k,r); +for (i=1;i<x->nr_notes;i++) { +x->note[i] = ((x->note[i] - x->note[0])*x->S[k]) + x->note[0]; +} + +for (i=0;i<x->nr_notes;i++) { +x->note[i] = x->note[i] + x->T[k]; +} +if (x->R[k] == -1) { +for (i=0;i<x->nr_notes;i++) +noten[x->nr_notes-1-i]=x->note[i]; +for (i=0;i<x->nr_notes;i++) +x->note[i]=noten[i]; +} +} +} + +void ifsmusic_outputSerie(t_ifsmusic *x) +{ + int i; + for (i=0;i< x->nr_notes;i++) { + //x->notesout[i] = x->note[i]; + SETFLOAT(&x->notesout[i],x->note[i]); + } + +outlet_list(x->x_out,&s_list, x->nr_notes, &x->notesout[0]); +x->count = x->nr_notes; +nextSerie(x); +} + +void ifsmusic_bang(t_ifsmusic *x) +{ +outlet_float(x->x_out,x->note[x->count]); +x->count++; +nextSerie(x); +} + +void ifsmusic_setNotes(t_ifsmusic *x,t_symbol *s, int argc, t_atom *argv) { +int i; +x->nr_notes = argc; +post("%d new notes set!",x->nr_notes); +for (i=0;i<x->nr_notes;i++) { + x->note[i] = atom_getfloat(&argv[i]); +} +} + +void ifsmusic_setFunctions(t_ifsmusic *x,t_symbol *s, int argc, t_atom *argv) { +int i; +float p = 0; +x->nr_functions = argc/4; +post("%d new function set!",x->nr_functions); + +for (i=0;i<x->nr_functions;i++) { + x->S[i] = atom_getfloat(&argv[i*4]); + x->T[i] = atom_getfloat(&argv[i*4+1]); +// x->T2[i] = atom_getfloat(&argv[i*5+2]); + x->P[i] = p+atom_getfloat(&argv[i*4+3]); + x->R[i] = (t_int) atom_getfloat(&argv[i*4+2]); + p = x->P[i]; + post("function %d: %f %f %d %f",i,x->S[i],x->T[i],x->R[i],x->P[i]); +} + +if (p != 1.0) { + float scale = 1.0/p; + // post("%d new function set. Scale probabilities by %f",x->nr_functions,scale); + for (i=0;i<x->nr_functions;i++) { + x->P[i] = scale*x->P[i]; + // startpost("p for %d: %f; ",i,x->P[i]); + } +} + +} + + +void ifsmusic_initDummyNoteSequence(t_ifsmusic *x) { + x->nr_notes = 3; + x->note[0] = 66; + x->note[1] = 70; + x->note[2] = 63; +} + +void ifsmusic_initDummyFunctions(t_ifsmusic *x) { + int i; + x->T[0] = 0; + x->T[1] = 0; + x->T[2] = 0; + x->S[0] = 1; + x->S[1] = 1; + x->S[2] = 1; + x->R[0] = 1; + x->R[1] = 1; + x->R[2] = 1; + x->nr_functions = 3; + for (i=0;i<x->nr_functions;i++) x->P[i] = (t_float) (i+1)/x->nr_functions; +} + + +void *ifsmusic_new(t_symbol *s, int argc, t_atom *argv) +{ + t_ifsmusic *x = (t_ifsmusic *)pd_new(ifsmusic_class); + x->count = 0; + x->x_out = outlet_new(&x->x_obj,&s_float); + //x->mapped_out = outlet_new(&x->x_obj,&s_float); + if (argc == 0) ifsmusic_initDummyNoteSequence(x); + else { + int i; + x->nr_notes = argc; + for (i=0;i<argc;i++) + x->note[i] = atom_getfloat(argv+i); + } + ifsmusic_initDummyFunctions(x); + post("Ifsmusic initialised with sequence length: %d",x->nr_notes); + return (void *)x; +} Property changes on: trunk/externals/algocomp/ifsmusic.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/logistictilde.c =================================================================== --- trunk/externals/algocomp/logistictilde.c (rev 0) +++ trunk/externals/algocomp/logistictilde.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,59 @@ +/* +* Trying logistic function for audio processing +*/ + +#include "m_pd.h" + +static t_class *logistic_tilde_class; + +typedef struct _logistic_tilde { +t_object x_obj; +t_sample f_logistic; +t_sample f; +t_float a; +} t_logistic_tilde; + +t_sample logistic(t_sample x,t_float a) { + return a*x*(1-x); +} + +t_int *logistic_tilde_perform(t_int *w) +{ +t_logistic_tilde *x = (t_logistic_tilde *)(w[1]); +//t_sample *in1 = (t_sample *)(w[2]); +//t_sample *in2 = (t_sample *)(w[3]); +t_sample *out = (t_sample *)(w[2]); +int n = (int)(w[3]); +//t_sample f_logistic = (x->f_logistic<0)?0.0:(x->f_logistic>1)?1.0:x->f_logistic; +while (n--){ + x->f_logistic = logistic(x->f_logistic,x->a); + *out++ = x->f_logistic - 0.5; + } + +return (w+4); +} + + + +void logistic_tilde_dsp(t_logistic_tilde *x, t_signal **sp) +{ +dsp_add(logistic_tilde_perform, 3, x, +sp[0]->s_vec, +//sp[1]->s_vec, +//sp[2]->s_vec, +sp[0]->s_n); +} + +void *logistic_tilde_new(t_floatarg f) +{ +t_logistic_tilde *x = (t_logistic_tilde *)pd_new(logistic_tilde_class); +x->f_logistic = 0.5; +x->a = 3.7; +if (x->a < 0) x->a = 1; +if (x->a > 4) x->a = 4; +//inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); +floatinlet_new (&x->x_obj, &x->a); +outlet_new(&x->x_obj, &s_signal); +return (void *)x; +} + Property changes on: trunk/externals/algocomp/logistictilde.c ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/m_pd.h =================================================================== --- trunk/externals/algocomp/m_pd.h (rev 0) +++ trunk/externals/algocomp/m_pd.h 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,635 @@ +/* Copyright (c) 1997-1999 Miller Puckette. +* For information on usage and redistribution, and for a DISCLAIMER OF ALL +* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ + +#ifndef __m_pd_h_ + +#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) +extern "C" { +#endif + +#define PD_MAJOR_VERSION 0 +#define PD_MINOR_VERSION 38 + +/* old name for "MSW" flag -- we have to take it for the sake of many old +"nmakefiles" for externs, which will define NT and not MSW */ +#if defined(NT) && !defined(MSW) +#define MSW +#endif + +#ifdef MSW +/* #pragma warning( disable : 4091 ) */ +#pragma warning( disable : 4305 ) /* uncast const double to float */ +#pragma warning( disable : 4244 ) /* uncast float/int conversion etc. */ +#pragma warning( disable : 4101 ) /* unused automatic variables */ +#endif /* MSW */ + + /* the external storage class is "extern" in UNIX; in MSW it's ugly. */ +#ifdef MSW +#ifdef PD_INTERNAL +#define EXTERN __declspec(dllexport) extern +#else +#define EXTERN __declspec(dllimport) extern +#endif /* PD_INTERNAL */ +#else +#define EXTERN extern +#endif /* MSW */ + + /* and depending on the compiler, hidden data structures are + declared differently: */ +#if defined( __GNUC__) || defined( __BORLANDC__ ) || defined( __MWERKS__ ) +#define EXTERN_STRUCT struct +#else +#define EXTERN_STRUCT extern struct +#endif + + +#if !defined(_SIZE_T) && !defined(_SIZE_T_) +#include <stddef.h> /* just for size_t -- how lame! */ +#endif + +#define MAXPDSTRING 1000 /* use this for anything you want */ +#define MAXPDARG 5 /* max number of args we can typecheck today */ + +/* signed and unsigned integer types the size of a pointer: */ +/* GG: long is the size of a pointer */ +typedef long t_int; + +typedef float t_float; /* a floating-point number at most the same size */ +typedef float t_floatarg; /* floating-point type for function calls */ + +typedef struct _symbol +{ + char *s_name; + struct _class **s_thing; + struct _symbol *s_next; +} t_symbol; + +EXTERN_STRUCT _array; +#define t_array struct _array /* g_canvas.h */ + +/* pointers to glist and array elements go through a "stub" which sticks +around after the glist or array is freed. The stub itself is deleted when +both the glist/array is gone and the refcount is zero, ensuring that no +gpointers are pointing here. */ + +#define GP_NONE 0 /* the stub points nowhere (has been cut off) */ +#define GP_GLIST 1 /* the stub points to a glist element */ +#define GP_ARRAY 2 /* ... or array */ + +typedef struct _gstub +{ + union + { + struct _glist *gs_glist; /* glist we're in */ + struct _array *gs_array; /* array we're in */ + } gs_un; + int gs_which; /* GP_GLIST/GP_ARRAY */ + int gs_refcount; /* number of gpointers pointing here */ +} t_gstub; + +typedef struct _gpointer /* pointer to a gobj in a glist */ +{ + union + { + struct _scalar *gp_scalar; /* scalar we're in (if glist) */ + union word *gp_w; /* raw data (if array) */ + } gp_un; + int gp_valid; /* number which must match gpointee */ + t_gstub *gp_stub; /* stub which points to glist/array */ +} t_gpointer; + +typedef union word +{ + t_float w_float; + t_symbol *w_symbol; + t_gpointer *w_gpointer; + t_array *w_array; + struct _glist *w_list; + int w_index; +} t_word; + +typedef enum +{ + A_NULL, + A_FLOAT, + A_SYMBOL, + A_POINTER, + A_SEMI, + A_COMMA, + A_DEFFLOAT, + A_DEFSYM, + A_DOLLAR, + A_DOLLSYM, + A_GIMME, + A_CANT +} t_atomtype; + +#define A_DEFSYMBOL A_DEFSYM /* better name for this */ + +typedef struct _atom +{ + t_atomtype a_type; + union word a_w; +} t_atom; + +EXTERN_STRUCT _class; +#define t_class struct _class + +EXTERN_STRUCT _outlet; +#define t_outlet struct _outlet + +EXTERN_STRUCT _inlet; +#define t_inlet struct _inlet + +EXTERN_STRUCT _binbuf; +#define t_binbuf struct _binbuf + +EXTERN_STRUCT _clock; +#define t_clock struct _clock + +EXTERN_STRUCT _outconnect; +#define t_outconnect struct _outconnect + +EXTERN_STRUCT _glist; +#define t_glist struct _glist +#define t_canvas struct _glist /* LATER lose this */ + +typedef t_class *t_pd; /* pure datum: nothing but a class pointer */ + +typedef struct _gobj /* a graphical object */ +{ + t_pd g_pd; /* pure datum header (class) */ + struct _gobj *g_next; /* next in list */ +} t_gobj; + +typedef struct _scalar /* a graphical object holding data */ +{ + t_gobj sc_gobj; /* header for graphical object */ + t_symbol *sc_template; /* template name (LATER replace with pointer) */ + t_word sc_vec[1]; /* indeterminate-length array of words */ +} t_scalar; + +typedef struct _text /* patchable object - graphical, with text */ +{ + t_gobj te_g; /* header for graphical object */ + t_binbuf *te_binbuf; /* holder for the text */ + t_outlet *te_outlet; /* linked list of outlets */ + t_inlet *te_inlet; /* linked list of inlets */ + short te_xpix; /* x&y location (within the toplevel) */ + short te_ypix; + short te_width; /* requested width in chars, 0 if auto */ + unsigned int te_type:2; /* from defs below */ +} t_text; + +#define T_TEXT 0 /* just a textual comment */ +#define T_OBJECT 1 /* a MAX style patchable object */ +#define T_MESSAGE 2 /* a MAX stype message */ +#define T_ATOM 3 /* a cell to display a number or symbol */ + +#define te_pd te_g.g_pd + + /* t_object is synonym for t_text (LATER unify them) */ + +typedef struct _text t_object; + +#define ob_outlet te_outlet +#define ob_inlet te_inlet +#define ob_binbuf te_binbuf +#define ob_pd te_g.g_pd +#define ob_g te_g + +typedef void (*t_method)(void); +typedef void *(*t_newmethod)( void); +typedef void (*t_gotfn)(void *x, ...); + +/* ---------------- pre-defined objects and symbols --------------*/ +EXTERN t_pd pd_objectmaker; /* factory for creating "object" boxes */ +EXTERN t_pd pd_canvasmaker; /* factory for creating canvases */ +EXTERN t_symbol s_pointer; +EXTERN t_symbol s_float; +EXTERN t_symbol s_symbol; +EXTERN t_symbol s_bang; +EXTERN t_symbol s_list; +EXTERN t_symbol s_anything; +EXTERN t_symbol s_signal; +EXTERN t_symbol s__N; +EXTERN t_symbol s__X; +EXTERN t_symbol s_x; +EXTERN t_symbol s_y; +EXTERN t_symbol s_; + +/* --------- prototypes from the central message system ----------- */ +EXTERN void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv); +EXTERN void pd_forwardmess(t_pd *x, int argc, t_atom *argv); +EXTERN t_symbol *gensym(char *s); +EXTERN t_gotfn getfn(t_pd *x, t_symbol *s); +EXTERN t_gotfn zgetfn(t_pd *x, t_symbol *s); +EXTERN void nullfn(void); +EXTERN void pd_vmess(t_pd *x, t_symbol *s, char *fmt, ...); +#define mess0(x, s) ((*getfn((x), (s)))((x))) +#define mess1(x, s, a) ((*getfn((x), (s)))((x), (a))) +#define mess2(x, s, a,b) ((*getfn((x), (s)))((x), (a),(b))) +#define mess3(x, s, a,b,c) ((*getfn((x), (s)))((x), (a),(b),(c))) +#define mess4(x, s, a,b,c,d) ((*getfn((x), (s)))((x), (a),(b),(c),(d))) +#define mess5(x, s, a,b,c,d,e) ((*getfn((x), (s)))((x), (a),(b),(c),(d),(e))) +EXTERN void obj_list(t_object *x, t_symbol *s, int argc, t_atom *argv); +EXTERN t_pd *pd_newest(void); + +/* --------------- memory management -------------------- */ +EXTERN void *getbytes(size_t nbytes); +EXTERN void *getzbytes(size_t nbytes); +EXTERN void *copybytes(void *src, size_t nbytes); +EXTERN void freebytes(void *x, size_t nbytes); +EXTERN void *resizebytes(void *x, size_t oldsize, size_t newsize); + +/* -------------------- atoms ----------------------------- */ + +#define SETSEMI(atom) ((atom)->a_type = A_SEMI, (atom)->a_w.w_index = 0) +#define SETCOMMA(atom) ((atom)->a_type = A_COMMA, (atom)->a_w.w_index = 0) +#define SETPOINTER(atom, gp) ((atom)->a_type = A_POINTER, \ + (atom)->a_w.w_gpointer = (gp)) +#define SETFLOAT(atom, f) ((atom)->a_type = A_FLOAT, (atom)->a_w.w_float = (f)) +#define SETSYMBOL(atom, s) ((atom)->a_type = A_SYMBOL, \ + (atom)->a_w.w_symbol = (s)) +#define SETDOLLAR(atom, n) ((atom)->a_type = A_DOLLAR, \ + (atom)->a_w.w_index = (n)) +#define SETDOLLSYM(atom, s) ((atom)->a_type = A_DOLLSYM, \ + (atom)->a_w.w_symbol= (s)) + +EXTERN t_float atom_getfloat(t_atom *a); +EXTERN t_int atom_getint(t_atom *a); +EXTERN t_symbol *atom_getsymbol(t_atom *a); +EXTERN t_symbol *atom_gensym(t_atom *a); +EXTERN t_float atom_getfloatarg(int which, int argc, t_atom *argv); +EXTERN t_int atom_getintarg(int which, int argc, t_atom *argv); +EXTERN t_symbol *atom_getsymbolarg(int which, int argc, t_atom *argv); + +EXTERN void atom_string(t_atom *a, char *buf, unsigned int bufsize); + +/* ------------------ binbufs --------------- */ + +EXTERN t_binbuf *binbuf_new(void); +EXTERN void binbuf_free(t_binbuf *x); +EXTERN t_binbuf *binbuf_duplicate(t_binbuf *y); + +EXTERN void binbuf_text(t_binbuf *x, char *text, size_t size); +EXTERN void binbuf_gettext(t_binbuf *x, char **bufp, int *lengthp); +EXTERN void binbuf_clear(t_binbuf *x); +EXTERN void binbuf_add(t_binbuf *x, int argc, t_atom *argv); +EXTERN void binbuf_addv(t_binbuf *x, char *fmt, ...); +EXTERN void binbuf_addbinbuf(t_binbuf *x, t_binbuf *y); +EXTERN void binbuf_addsemi(t_binbuf *x); +EXTERN void binbuf_restore(t_binbuf *x, int argc, t_atom *argv); +EXTERN void binbuf_print(t_binbuf *x); +EXTERN int binbuf_getnatom(t_binbuf *x); +EXTERN t_atom *binbuf_getvec(t_binbuf *x); +EXTERN void binbuf_eval(t_binbuf *x, t_pd *target, int argc, t_atom *argv); +EXTERN int binbuf_read(t_binbuf *b, char *filename, char *dirname, + int crflag); +EXTERN int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, + int crflag); +EXTERN int binbuf_write(t_binbuf *x, char *filename, char *dir, + int crflag); +EXTERN void binbuf_evalfile(t_symbol *name, t_symbol *dir); +EXTERN t_symbol *binbuf_realizedollsym(t_symbol *s, int ac, t_atom *av, + int tonew); + +/* ------------------ clocks --------------- */ + +EXTERN t_clock *clock_new(void *owner, t_method fn); +EXTERN void clock_set(t_clock *x, double systime); +EXTERN void clock_delay(t_clock *x, double delaytime); +EXTERN void clock_unset(t_clock *x); +EXTERN double clock_getlogicaltime(void); +EXTERN double clock_getsystime(void); /* OBSOLETE; use clock_getlogicaltime() */ +EXTERN double clock_gettimesince(double prevsystime); +EXTERN double clock_getsystimeafter(double delaytime); +EXTERN void clock_free(t_clock *x); + +/* ----------------- pure data ---------------- */ +EXTERN t_pd *pd_new(t_class *cls); +EXTERN void pd_free(t_pd *x); +EXTERN void pd_bind(t_pd *x, t_symbol *s); +EXTERN void pd_unbind(t_pd *x, t_symbol *s); +EXTERN t_pd *pd_findbyclass(t_symbol *s, t_class *c); +EXTERN void pd_pushsym(t_pd *x); +EXTERN void pd_popsym(t_pd *x); +EXTERN t_symbol *pd_getfilename(void); +EXTERN t_symbol *pd_getdirname(void); +EXTERN void pd_bang(t_pd *x); +EXTERN void pd_pointer(t_pd *x, t_gpointer *gp); +EXTERN void pd_float(t_pd *x, t_float f); +EXTERN void pd_symbol(t_pd *x, t_symbol *s); +EXTERN void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv); +EXTERN void pd_anything(t_pd *x, t_symbol *s, int argc, t_atom *argv); +#define pd_class(x) (*(x)) + +/* ----------------- pointers ---------------- */ +EXTERN void gpointer_init(t_gpointer *gp); +EXTERN void gpointer_copy(const t_gpointer *gpfrom, t_gpointer *gpto); +EXTERN void gpointer_unset(t_gpointer *gp); +EXTERN int gpointer_check(const t_gpointer *gp, int headok); + +/* ----------------- patchable "objects" -------------- */ +EXTERN t_inlet *inlet_new(t_object *owner, t_pd *dest, t_symbol *s1, + t_symbol *s2); +EXTERN t_inlet *pointerinlet_new(t_object *owner, t_gpointer *gp); +EXTERN t_inlet *floatinlet_new(t_object *owner, t_float *fp); +EXTERN t_inlet *symbolinlet_new(t_object *owner, t_symbol **sp); +EXTERN void inlet_free(t_inlet *x); + +EXTERN t_outlet *outlet_new(t_object *owner, t_symbol *s); +EXTERN void outlet_bang(t_outlet *x); +EXTERN void outlet_pointer(t_outlet *x, t_gpointer *gp); +EXTERN void outlet_float(t_outlet *x, t_float f); +EXTERN void outlet_symbol(t_outlet *x, t_symbol *s); +EXTERN void outlet_list(t_outlet *x, t_symbol *s, int argc, t_atom *argv); +EXTERN void outlet_anything(t_outlet *x, t_symbol *s, int argc, t_atom *argv); +EXTERN t_symbol *outlet_getsymbol(t_outlet *x); +EXTERN void outlet_free(t_outlet *x); +EXTERN t_object *pd_checkobject(t_pd *x); + + +/* -------------------- canvases -------------- */ + +EXTERN void glob_setfilename(void *dummy, t_symbol *name, t_symbol *dir); + +EXTERN void canvas_setargs(int argc, t_atom *argv); +EXTERN void canvas_getargs(int *argcp, t_atom **argvp); +EXTERN t_symbol *canvas_getcurrentdir(void); +EXTERN t_glist *canvas_getcurrent(void); +EXTERN void canvas_makefilename(t_glist *c, char *file, + char *result,int resultsize); +EXTERN t_symbol *canvas_getdir(t_glist *x); +EXTERN int sys_fontwidth(int fontsize); +EXTERN int sys_fontheight(int fontsize); +EXTERN void canvas_dataproperties(t_glist *x, t_scalar *sc, t_binbuf *b); + +/* ---------------- widget behaviors ---------------------- */ + +EXTERN_STRUCT _widgetbehavior; +#define t_widgetbehavior struct _widgetbehavior + +EXTERN_STRUCT _parentwidgetbehavior; +#define t_parentwidgetbehavior struct _parentwidgetbehavior +EXTERN t_parentwidgetbehavior *pd_getparentwidget(t_pd *x); + +/* -------------------- classes -------------- */ + +#define CLASS_DEFAULT 0 /* flags for new classes below */ +#define CLASS_PD 1 +#define CLASS_GOBJ 2 +#define CLASS_PATCHABLE 3 +#define CLASS_NOINLET 8 + +#define CLASS_TYPEMASK 3 + + +EXTERN t_class *class_new(t_symbol *name, t_newmethod newmethod, + t_method freemethod, size_t size, int flags, t_atomtype arg1, ...); +EXTERN void class_addcreator(t_newmethod newmethod, t_symbol *s, + t_atomtype type1, ...); +EXTERN void class_addmethod(t_class *c, t_method fn, t_symbol *sel, + t_atomtype arg1, ...); +EXTERN void class_addbang(t_class *c, t_method fn); +EXTERN void class_addpointer(t_class *c, t_method fn); +EXTERN void class_doaddfloat(t_class *c, t_method fn); +EXTERN void class_addsymbol(t_class *c, t_method fn); +EXTERN void class_addlist(t_class *c, t_method fn); +EXTERN void class_addanything(t_class *c, t_method fn); +EXTERN void class_sethelpsymbol(t_class *c, t_symbol *s); +EXTERN void class_setwidget(t_class *c, t_widgetbehavior *w); +EXTERN void class_setparentwidget(t_class *c, t_parentwidgetbehavior *w); +EXTERN t_parentwidgetbehavior *class_parentwidget(t_class *c); +EXTERN char *class_getname(t_class *c); +EXTERN char *class_gethelpname(t_class *c); +EXTERN void class_setdrawcommand(t_class *c); +EXTERN int class_isdrawcommand(t_class *c); +EXTERN void class_domainsignalin(t_class *c, int onset); +#define CLASS_MAINSIGNALIN(c, type, field) \ + class_domainsignalin(c, (char *)(&((type *)0)->field) - (char *)0) + + /* prototype for functions to save Pd's to a binbuf */ +typedef void (*t_savefn)(t_gobj *x, t_binbuf *b); +EXTERN void class_setsavefn(t_class *c, t_savefn f); +EXTERN t_savefn class_getsavefn(t_class *c); + /* prototype for functions to open properties dialogs */ +typedef void (*t_propertiesfn)(t_gobj *x, struct _glist *glist); +EXTERN void class_setpropertiesfn(t_class *c, t_propertiesfn f); +EXTERN t_propertiesfn class_getpropertiesfn(t_class *c); + +#ifndef PD_CLASS_DEF +#define class_addbang(x, y) class_addbang((x), (t_method)(y)) +#define class_addpointer(x, y) class_addpointer((x), (t_method)(y)) +#define class_addfloat(x, y) class_doaddfloat((x), (t_method)(y)) +#define class_addsymbol(x, y) class_addsymbol((x), (t_method)(y)) +#define class_addlist(x, y) class_addlist((x), (t_method)(y)) +#define class_addanything(x, y) class_addanything((x), (t_method)(y)) +#endif + +/* ------------ printing --------------------------------- */ +EXTERN void post(const char *fmt, ...); +EXTERN void startpost(const char *fmt, ...); +EXTERN void poststring(const char *s); +EXTERN void postfloat(float f); +EXTERN void postatom(int argc, t_atom *argv); +EXTERN void endpost(void); +EXTERN void error(const char *fmt, ...); +EXTERN void bug(const char *fmt, ...); +EXTERN void pd_error(void *object, const char *fmt, ...); +EXTERN void sys_logerror(const char *object, const char *s); +EXTERN void sys_unixerror(const char *object); +EXTERN void sys_ouch(void); + + +/* ------------ system interface routines ------------------- */ +EXTERN int sys_isreadablefile(const char *name); +EXTERN void sys_bashfilename(const char *from, char *to); +EXTERN void sys_unbashfilename(const char *from, char *to); +EXTERN int open_via_path(const char *name, const char *ext, const char *dir, + char *dirresult, char **nameresult, unsigned int size, int bin); +EXTERN int sched_geteventno(void); +EXTERN double sys_getrealtime(void); +EXTERN int (*sys_idlehook)(void); /* hook to add idle time computation */ + + +/* ------------ threading ------------------- */ +/* T.Grill - see m_sched.c */ + +EXTERN void sys_lock(void); +EXTERN void sys_unlock(void); +EXTERN int sys_trylock(void); + + +/* --------------- signals ----------------------------------- */ + +typedef float t_sample; +#define MAXLOGSIG 32 +#define MAXSIGSIZE (1 << MAXLOGSIG) + +typedef struct _signal +{ + int s_n; /* number of points in the array */ + t_sample *s_vec; /* the array */ + float s_sr; /* sample rate */ + int s_refcount; /* number of times used */ + int s_isborrowed; /* whether we're going to borrow our array */ + struct _signal *s_borrowedfrom; /* signal to borrow it from */ + struct _signal *s_nextfree; /* next in freelist */ + struct _signal *s_nextused; /* next in used list */ +} t_signal; + + +typedef t_int *(*t_perfroutine)(t_int *args); + +EXTERN t_int *plus_perform(t_int *args); +EXTERN t_int *zero_perform(t_int *args); +EXTERN t_int *copy_perform(t_int *args); + +EXTERN void dsp_add_plus(t_sample *in1, t_sample *in2, t_sample *out, int n); +EXTERN void dsp_add_copy(t_sample *in, t_sample *out, int n); +EXTERN void dsp_add_scalarcopy(t_sample *in, t_sample *out, int n); +EXTERN void dsp_add_zero(t_sample *out, int n); + +EXTERN int sys_getblksize(void); +EXTERN float sys_getsr(void); +EXTERN int sys_get_inchannels(void); +EXTERN int sys_get_outchannels(void); + +EXTERN void dsp_add(t_perfroutine f, int n, ...); +EXTERN void dsp_addv(t_perfroutine f, int n, t_int *vec); +EXTERN void pd_fft(float *buf, int npoints, int inverse); +EXTERN int ilog2(int n); + +EXTERN void mayer_fht(float *fz, int n); +EXTERN void mayer_fft(int n, float *real, float *imag); +EXTERN void mayer_ifft(int n, float *real, float *imag); +EXTERN void mayer_realfft(int n, float *real); +EXTERN void mayer_realifft(int n, float *real); + +EXTERN float *cos_table; +#define LOGCOSTABSIZE 9 +#define COSTABSIZE (1<<LOGCOSTABSIZE) + +EXTERN int canvas_suspend_dsp(void); +EXTERN void canvas_resume_dsp(int oldstate); +EXTERN void canvas_update_dsp(void); + +/* IOhannes { (up/downsampling) */ +typedef struct _resample +{ + int method; /* up/downsampling method ID */ + + t_int downsample; /* downsampling factor */ + t_int upsample; /* upsampling factor */ + + t_float *s_vec; /* here we hold the resampled data */ + int s_n; + + t_float *coeffs; /* coefficients for filtering... */ + int coefsize; + + t_float *buffer; /* buffer for filtering */ + int bufsize; +} t_resample; + +EXTERN void resample_init(t_resample *x); +EXTERN void resample_free(t_resample *x); + +EXTERN void resample_dsp(t_resample *x, t_sample *in, int insize, t_sample *out, int outsize, int method); +EXTERN void resamplefrom_dsp(t_resample *x, t_sample *in, int insize, int outsize, int method); +EXTERN void resampleto_dsp(t_resample *x, t_sample *out, int insize, int outsize, int method); +/* } IOhannes */ + +/* ----------------------- utility functions for signals -------------- */ +EXTERN float mtof(float); +EXTERN float ftom(float); +EXTERN float rmstodb(float); +EXTERN float powtodb(float); +EXTERN float dbtorms(float); +EXTERN float dbtopow(float); + +EXTERN float q8_sqrt(float); +EXTERN float q8_rsqrt(float); +#ifndef N32 +EXTERN float qsqrt(float); /* old names kept for extern compatibility */ +EXTERN float qrsqrt(float); +#endif +/* --------------------- data --------------------------------- */ + + /* graphical arrays */ +EXTERN_STRUCT _garray; +#define t_garray struct _garray + +EXTERN t_class *garray_class; +EXTERN int garray_getfloatarray(t_garray *x, int *size, t_float **vec); +EXTERN float garray_get(t_garray *x, t_symbol *s, t_int indx); +EXTERN void garray_redraw(t_garray *x); +EXTERN int garray_npoints(t_garray *x); +EXTERN char *garray_vec(t_garray *x); +EXTERN void garray_resize(t_garray *x, t_floatarg f); +EXTERN void garray_usedindsp(t_garray *x); +EXTERN void garray_setsaveit(t_garray *x, int saveit); +EXTERN t_class *scalar_class; + +EXTERN t_float *value_get(t_symbol *s); +EXTERN void value_release(t_symbol *s); +EXTERN int value_getfloat(t_symbol *s, t_float *f); +EXTERN int value_setfloat(t_symbol *s, t_float f); + +/* ------- GUI interface - functions to send strings to TK --------- */ +typedef void (*t_guicallbackfn)(t_gobj *client, t_glist *glist); + +EXTERN void sys_vgui(char *fmt, ...); +EXTERN void sys_gui(char *s); +EXTERN void sys_pretendguibytes(int n); +EXTERN void sys_queuegui(void *client, t_glist *glist, t_guicallbackfn f); +EXTERN void sys_unqueuegui(void *client); + /* dialog window creation and destruction */ +EXTERN void gfxstub_new(t_pd *owner, void *key, const char *cmd); +EXTERN void gfxstub_deleteforkey(void *key); + +extern t_class *glob_pdobject; /* object to send "pd" messages */ + +/*------------- Max 0.26 compatibility --------------------*/ + +/* the following reflects the new way classes are laid out, with the class + pointing to the messlist and not vice versa. Externs shouldn't feel it. */ +typedef t_class *t_externclass; + +EXTERN void c_extern(t_externclass *cls, t_newmethod newroutine, + t_method freeroutine, t_symbol *name, size_t size, int tiny, \ + t_atomtype arg1, ...); +EXTERN void c_addmess(t_method fn, t_symbol *sel, t_atomtype arg1, ...); + +#define t_getbytes getbytes +#define t_freebytes freebytes +#define t_resizebytes resizebytes +#define typedmess pd_typedmess +#define vmess pd_vmess + +/* A definition to help gui objects straddle 0.34-0.35 changes. If this is +defined, there is a "te_xpix" field in objects, not a "te_xpos" as before: */ + +#define PD_USE_TE_XPIX + + +#ifdef __i386__ +/* a test for NANs and denormals. Should only be necessary on i386. */ +#define PD_BADFLOAT(f) ((((*(unsigned int*)&(f))&0x7f800000)==0) || \ + (((*(unsigned int*)&(f))&0x7f800000)==0x7f800000)) +/* more stringent test: anything not between 1e-19 and 1e19 in absolute val */ +#define PD_BIGORSMALL(f) ((((*(unsigned int*)&(f))&0x60000000)==0) || \ + (((*(unsigned int*)&(f))&0x60000000)==0x60000000)) +#else +#define PD_BADFLOAT(f) 0 +#define PD_BIGORSMALL(f) 0 +#endif + +#if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) +} +#endif + +#define __m_pd_h_ +#endif /* __m_pd_h_ */ Property changes on: trunk/externals/algocomp/m_pd.h ___________________________________________________________________ Added: svn:executable + * Added: trunk/externals/algocomp/neural.c =================================================================== --- trunk/externals/algocomp/neural.c (rev 0) +++ trunk/externals/algocomp/neural.c 2009-01-09 17:23:55 UTC (rev 10494) @@ -0,0 +1,157 @@ +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +#define MAX_LAYERS 3 +#define MAX_UNITS 3 + + +static t_class *mlp_class; + + +typedef struct _mlp { + t_object x_obj; + int nr_inputunits; + int nr_hiddenunits; + int nr_outunits; + int nr_layers; + t_float weights[2][MAX_UNITS][MAX_UNITS]; + t_float output[3][MAX_UNITS]; + t_float bias[2][MAX_UNITS]; + t_float input[MAX_UNITS]; + t_float target[MAX_UNITS]; + float eta; + t_outlet *out,*error_out; +} t_mlp; + + +void calculateOutput(t_mlp *x) { + int i,k,l; + for (k=0;k<x->nr_hiddenunits;k++) { + x->output[1][k] = x->bias[0][k]; + for (l=0;l<x->nr_inputunits;l++) { + x->output[1][k] += x->output[0][l]*x->weights[0][l][k]; + } + x->output[1][k] = 1.0/(1.0-exp(-x->output[1][k])); + } + for (k=0;k<x->nr_outunits;k++) { + x->output[2][k] = x->bias[1][k]; + for (l=0;l<x->nr_hiddenunits;l++) { + x->output[2][k] += x->output[1][l]*x->weights[1][l][k]; + } + x->output[2][k] = 1.0/(1.0-exp(-x->output[2][k])); + } +} + +void measureError(t_mlp *x) { +//post("Measuring Error"); +int i,k,j; +float Error = 0.0; +float SumDOW[MAX_UNITS]; +float DeltaH[MAX_UNITS]; +float DeltaO[MAX_UNITS]; +float DeltaWeightIH[MAX_UNITS][MAX_UNITS]; +float DeltaWeightHO[MAX_UNITS][MAX_UNITS]; + + for(k=0 ;k<x->nr_outunits;k++) { + Error +=0.5*(x->target[k]-x->output[2][k])*(x->target[k]-x->output[2][k]); + DeltaO[k] = (x->target[k]-x->output[2][k]);//*x->output[2][k] * (1 - x->output[2][k]); + } + + post("Target: %f Error: %f Delta: %f", x->target[0], Error, DeltaO[0]); + outlet_float(x->error_out, Error); + for(j=0;j<x->nr_hiddenunits;j++) { /* 'back-propagate' errors to hidden layer */ + SumDOW[j] = 0.0 ; + for(k=0 ; k<=x->nr_outunits; k++ ) { + SumDOW[j] += x->weights[1][j][k]*DeltaO[k] ; + } + DeltaH[j] = SumDOW[j] * x->output[1][j]* (1.0 - x->output[1][j]); + } + for(j = 0 ;j<x->nr_hiddenunits; j++) { /* update weights WeightIH */ + //DeltaWeightIH[0][j] = + x->alpha*DeltaWeightIH[0][j]; + x->bias[0][j] += x->eta*DeltaH[j]; + for(i = 0; i < x->nr_inputunits ; i++ ) { + DeltaWeightIH[i][j] = x->eta * x->output[0][i] * DeltaH[j];// + x->alpha * DeltaWeightIH[i][j]; + x->weights[0][i][j] += DeltaWeightIH[i][j]; + } + } + for( k = 0; k < x->nr_outunits; k++) { /* update weights WeightHO */ + x->bias[1][k] += x->eta*DeltaO[k]; +// DeltaWeightHO[0][k] = x->eta * DeltaO[k] + x->alpha * DeltaWeightHO[0][k] ; +// x->weights[1][0][k] += DeltaWeightHO[0][k]; + for(j = 0; j < x->nr_hiddenunits; j++ ) { + DeltaWeightHO[j][k] = x->eta * x->output[1][j] * DeltaO[k];// + x->alpha * DeltaWeightHO[j][k] ; + x->weights[1][j][k] += DeltaWeightHO[j][k]; + } +} +} + + +void mlp_bang(t_mlp *x) +{ + calculateOutput(x); + outlet_float(x->out, x->output[2][0]); +} + +void mlp_inputed(t_mlp *x,t_symbol *s, int argc, t_atom *argv) { +int i; +post("inputed called"); +for (i=0;i<argc;i++) { + if (i > x->nr_inputunits) break; + x->output[0][i] = atom_getfloat(&argv[i]); +} +mlp_bang(x); +} + +void mlp_setTarget(t_mlp *x,t_symbol *s, int argc, t_atom *argv) { +int i; +//post("target called: %d",argc); +for (i=0;i<argc-1;i++) { + if (i > x->nr_inputunits) break; + x->output[0][i] = atom_getfloat(&argv[i]); +} +post("set targetto: %f",atom_getfloat(&argv[argc-1])); +x->target[0] = atom_getfloat(&argv[argc-1]); +mlp_bang(x); +measureError(x); +} + + +void initializeWeights(t_mlp *x) { + int i,k,l; + for (k=0;k<x->nr_hiddenunits;k++) { + x->bias[0][k] = 0;//((t_float) rand())/RAND_MAX; @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10493] trunk/externals/iem/iemmatrix
by fzotter＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 10493 http://pure-data.svn.sourceforge.net/pure-data/?rev=10493&view=rev Author: fzotter Date: 2009-01-09 10:02:23 +0000 (Fri, 09 Jan 2009) Log Message: ----------- added [mtx_svd] for singular value decomposition with the GNU scientific library support. config.h.in and configure.ac correspondingly modified. Modified Paths: -------------- trunk/externals/iem/iemmatrix/src/config.h.in trunk/externals/iem/iemmatrix/src/configure.ac Added Paths: ----------- trunk/externals/iem/iemmatrix/doc/mtx_svd-help.pd trunk/externals/iem/iemmatrix/src/mtx_svd.c Added: trunk/externals/iem/iemmatrix/doc/mtx_svd-help.pd =================================================================== --- trunk/externals/iem/iemmatrix/doc/mtx_svd-help.pd (rev 0) +++ trunk/externals/iem/iemmatrix/doc/mtx_svd-help.pd 2009-01-09 10:02:23 UTC (rev 10493) @@ -0,0 +1,23 @@ +#N canvas 482 188 717 423 12; +#X obj 93 216 mtx_svd; +#X obj 93 108 mtx_rand; +#X obj 309 275 mtx_transpose; +#X obj 201 273 mtx_diag; +#X obj 93 131 t a a; +#X text 64 24 [mtx_svd] singular value decomposition using gsl; +#X text 442 338 Franz Zotter \, 2009; +#X text 353 153 A = U * S * V^T; +#X obj 93 298 mtx_print U; +#X obj 201 299 mtx_print S; +#X obj 309 298 mtx_print V^T; +#X obj 169 155 mtx_print A; +#X msg 93 85 4 3; +#X connect 0 0 8 0; +#X connect 0 1 3 0; +#X connect 0 2 2 0; +#X connect 1 0 4 0; +#X connect 2 0 10 0; +#X connect 3 0 9 0; +#X connect 4 0 0 0; +#X connect 4 1 11 0; +#X connect 12 0 1 0; Modified: trunk/externals/iem/iemmatrix/src/config.h.in =================================================================== --- trunk/externals/iem/iemmatrix/src/config.h.in 2009-01-09 05:10:16 UTC (rev 10492) +++ trunk/externals/iem/iemmatrix/src/config.h.in 2009-01-09 10:02:23 UTC (rev 10493) @@ -7,5 +7,8 @@ /* do we have libsndfile installed? */ #undef HAVE_SNDFILE_H +/* do we have libgsl installed? */ +#undef HAVE_LIBGSL + #endif /* CONFIG_H_ */ Modified: trunk/externals/iem/iemmatrix/src/configure.ac =================================================================== --- trunk/externals/iem/iemmatrix/src/configure.ac 2009-01-09 05:10:16 UTC (rev 10492) +++ trunk/externals/iem/iemmatrix/src/configure.ac 2009-01-09 10:02:23 UTC (rev 10493) @@ -72,7 +72,12 @@ dnl for soundfile reading (and writing, if we do that...) AC_CHECK_LIB(sndfile, sf_close) +dnl for gnu scientific library -lgsl: +dnl AC_CHECK_LIB([m], [cos]) +AC_CHECK_LIB([gslcblas], [cblas_dgemm]) +AC_CHECK_LIB([gsl], [gsl_blas_dgemm]) + if test "x$with_pd" != "x"; then if test -d "${with_pd}/src"; then INCLUDES="-I${with_pd}/src ${INCLUDES}" @@ -99,7 +104,7 @@ dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h fftw3.h sndfile.h) +AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h fftw3.h sndfile.h gsl/gsl_linalg.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_HEADER_TIME Added: trunk/externals/iem/iemmatrix/src/mtx_svd.c =================================================================== --- trunk/externals/iem/iemmatrix/src/mtx_svd.c (rev 0) +++ trunk/externals/iem/iemmatrix/src/mtx_svd.c 2009-01-09 10:02:23 UTC (rev 10493) @@ -0,0 +1,185 @@ +/* + * iemmatrix + * + * objects for manipulating simple matrices + * mostly refering to matlab/octave matrix functions + * + * Copyright (c) 2008, Franz Zotter + * IEM, Graz, Austria + * + * For information on usage and redistribution, and for a DISCLAIMER OF ALL + * WARRANTIES, see the file, "LICENSE.txt," in this distribution. + * + */ + +#include "iemmatrix.h" +#include <stdlib.h> + +#ifdef HAVE_LIBGSL +#include <gsl/gsl_linalg.h> +#endif + +static t_class *mtx_svd_class; + +typedef struct _MTXSvd_ MTXSvd; +struct _MTXSvd_ +{ + t_object x_obj; +#ifdef HAVE_LIBGSL + gsl_matrix *u; + gsl_vector *s; + gsl_matrix *v; + gsl_vector *w; +#endif + t_outlet *list_u_out; + t_outlet *list_s_out; + t_outlet *list_v_out; + t_atom *list_u; + t_atom *list_s; + t_atom *list_v; + int rows; + int columns; +}; + +#ifdef HAVE_LIBGSL +static void allocMTXusvw (MTXSvd *x) +{ + x->u=(gsl_matrix*)gsl_matrix_alloc(x->rows,x->columns); + x->s=(gsl_vector*)gsl_vector_alloc(x->columns); + x->v=(gsl_matrix*)gsl_matrix_alloc(x->columns,x->columns); + x->w=(gsl_vector*)gsl_vector_alloc(x->columns); + + x->list_u=(t_atom*)calloc(sizeof(t_atom),x->rows*x->columns+2); + x->list_s=(t_atom*)calloc(sizeof(t_atom),x->columns); + x->list_v=(t_atom*)calloc(sizeof(t_atom),x->columns*x->columns+2); +} + +static void deleteMTXusvw (MTXSvd *x) +{ + if (x->list_u!=0) + free(x->list_u); + if (x->list_s!=0) + free(x->list_s); + if (x->list_v!=0) + free(x->list_v); + + x->list_u = x->list_s = x->list_v = 0; + + if (x->u!=0) + gsl_matrix_free(x->u); + if (x->s!=0) + gsl_vector_free(x->s); + if (x->v!=0) + gsl_matrix_free(x->v); + if (x->w!=0) + gsl_vector_free(x->w); + + x->u = 0; + x->s = 0; + x->v = 0; + x->w = 0; +} +#endif + +static void deleteMTXSvd (MTXSvd *x) +{ +#ifdef HAVE_LIBGSL + deleteMTXSvd(x); +#endif +} + +static void *newMTXSvd (t_symbol *s, int argc, t_atom *argv) +{ + MTXSvd *x = (MTXSvd *) pd_new (mtx_svd_class); + x->list_u_out = outlet_new (&x->x_obj, gensym("matrix")); + x->list_s_out = outlet_new (&x->x_obj, gensym("list")); + x->list_v_out = outlet_new (&x->x_obj, gensym("matrix")); + x->list_u = 0; + x->list_s = 0; + x->list_v = 0; +#ifdef HAVE_LIBGSL + x->u=0; + x->s=0; + x->v=0; + x->w=0; +#endif + + return ((void *) x); +} + +static void mTXSvdBang (MTXSvd *x) +{ + if (x->list_u) { + outlet_anything(x->list_v_out, gensym("matrix"), x->columns*x->columns+2, x->list_v); + outlet_anything(x->list_s_out, gensym("list"), x->columns, x->list_s); + outlet_anything(x->list_u_out, gensym("matrix"), x->rows*x->columns+2, x->list_u); + } +} + +static void mTXSvdMatrix (MTXSvd *x, t_symbol *s, + int argc, t_atom *argv) +{ + int rows = atom_getint (argv++); + int columns = atom_getint (argv++); + int size = rows * columns; + int in_size = argc-2; + int n; + + +#ifdef HAVE_LIBGSL + /* size check */ + if (!size) + post("mtx_svd: invalid dimensions"); + else if (in_size<size) + post("mtx_svd: sparse matrix not yet supported: use \"mtx_check\""); + else if (rows<columns) + post("mtx_svd: gsl_linalg_SVD_decomp does not support M<N"); + else { + x->rows=rows; + x->columns=columns; + + deleteMTXusvw(x); + allocMTXusvw(x); + + for (n=0;n<in_size;n++) + x->u->data[n]=(double) atom_getfloat(argv++); + + gsl_linalg_SV_decomp(x->u,x->v,x->s,x->w); + + SETFLOAT((x->list_u),(float) x->rows); + SETFLOAT((x->list_u+1),(float) x->columns); + for (n=0;n<in_size;n++) + SETFLOAT((x->list_u+2+n), x->u->data[n]); + + for (n=0;n<x->columns;n++) + SETFLOAT((x->list_s+n), x->s->data[n]); + + SETFLOAT((x->list_v),(float) x->columns); + SETFLOAT((x->list_v+1),(float) x->columns); + in_size=x->columns*x->columns; + for (n=0;n<in_size;n++) + SETFLOAT((x->list_v+n+2), x->v->data[n]); + + mTXSvdBang(x); + } +#else + post("mtx_svd: implementation requires gsl"); +#endif + +} + +void mtx_svd_setup (void) +{ + mtx_svd_class = class_new + (gensym("mtx_svd"), + (t_newmethod) newMTXSvd, + (t_method) deleteMTXSvd, + sizeof (MTXSvd), + CLASS_DEFAULT, A_GIMME, 0); + class_addbang (mtx_svd_class, (t_method) mTXSvdBang); + class_addmethod (mtx_svd_class, (t_method) mTXSvdMatrix, gensym("matrix"), A_GIMME,0); +} + +void iemtx_svd_setup(void){ + mtx_svd_setup(); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10492] branches/pd-devel/0.41.4/src
by eighthave＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 10492 http://pure-data.svn.sourceforge.net/pure-data/?rev=10492&view=rev Author: eighthave Date: 2009-01-09 05:10:16 +0000 (Fri, 09 Jan 2009) Log Message: ----------- - sketched out some platform-specific functions, like the Windows 'system' menu and the ::tk::mac stuff - attempted to get the preferences menu to show up in the .apple menu, but no luck. I think this only works on Tcl/Tk 8.4.14 or later. Modified Paths: -------------- branches/pd-devel/0.41.4/src/pd.tk branches/pd-devel/0.41.4/src/pd_bindings.tcl branches/pd-devel/0.41.4/src/pd_menucommands.tcl branches/pd-devel/0.41.4/src/pd_menus.tcl branches/pd-devel/0.41.4/src/pkgIndex.tcl branches/pd-devel/0.41.4/src/pkg_mkIndex.tcl branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl Added Paths: ----------- branches/pd-devel/0.41.4/src/AppMain.tcl branches/pd-devel/0.41.4/src/apple_events.tcl Added: branches/pd-devel/0.41.4/src/AppMain.tcl =================================================================== --- branches/pd-devel/0.41.4/src/AppMain.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/AppMain.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -0,0 +1,8 @@ + +# this file is for the Wish.app on Mac OS X + +if {[string first "-psn" [lindex $argv 0]] == 0} { set argv [lrange $argv 1 end]} + +console show + +# launch pd.tk here Added: branches/pd-devel/0.41.4/src/apple_events.tcl =================================================================== --- branches/pd-devel/0.41.4/src/apple_events.tcl (rev 0) +++ branches/pd-devel/0.41.4/src/apple_events.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -0,0 +1,36 @@ + +package provide apple_events 0.1 + +# from http://wiki.tcl.tk/12987 + +# minimum line thickness to anti-alias (default: 3) +set tk::mac::CGAntialiasLimit 2 + +# enable/disable anti-aliased text +set ::tk::mac::antialiasedtext 1 + +# kAEOpenDocuments +proc ::tk::mac::OpenDocument {} { +} + +# kEventAppHidden +proc ::tk::mac::OnHide {} { +} + +# kEventAppShown +proc ::tk::mac::OnShow {} { +} + +#kAEShowPreferences +proc ::tk::mac::ShowPreferences {} { +} + +#kAEQuitApplication +#proc exit {} { +# this proc overrides the built-in exit +#} + +proc spinCursor {widget count} { + $widget configure -cursor spinning$count + after 100 spinCursor [incr count] +} Modified: branches/pd-devel/0.41.4/src/pd.tk =================================================================== --- branches/pd-devel/0.41.4/src/pd.tk 2009-01-09 00:38:11 UTC (rev 10491) +++ branches/pd-devel/0.41.4/src/pd.tk 2009-01-09 05:10:16 UTC (rev 10492) @@ -11,6 +11,7 @@ #namespace import -force ttk::* # set . as first dir in auto_path +set auto_path [linsert $auto_path 0 "/Users/hans/code/pure-data/branches/pd-devel/0.41.4/src"] set auto_path [linsert $auto_path 0 "."] package require pd_connect @@ -93,14 +94,6 @@ } # ------------------------------------------------------------------------------ -# kludges to avoid changing C code - -proc .mbar.find {command number} { - # this should be changed in g_canvas.c, around line 800 - .menubar.find $command $number -} - -# ------------------------------------------------------------------------------ # canvas support functions ##### routine to ask user if OK and, if so, send a message on to Pd ###### @@ -137,6 +130,10 @@ # ------------------------------------------------------------------------------ # main proc main {argc argv} { + # Not all platforms have the console command + catch {console show} + post_tclinfo + puts stderr "ARGV: $argv" pdtk_post "Starting pd.tk with main($argc $argv)" init Modified: branches/pd-devel/0.41.4/src/pd_bindings.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-09 00:38:11 UTC (rev 10491) +++ branches/pd-devel/0.41.4/src/pd_bindings.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -50,6 +50,9 @@ # Tcl event bindings wm protocol . WM_DELETE_WINDOW "menu_quit" + + # do window maintenance when entering the Pd window (Window menu, scrollbars, etc) + #bind $name <Enter> {pdtk_pdwindowmaintenance} } proc ::pd_bindings::panel_bindings {name} { @@ -60,6 +63,8 @@ # bind $name <KeyPress-Escape> [format "%s_cancel %s" $panelname $name] # bind $name <KeyPress-Return> [format "%s_ok %s" $panelname $name] # bind $name <$modifier_key-Key-w> [format "%s_cancel %s" $panelname $name] + +# wm protocol $name WM_DELETE_WINDOW "$panelname_cancel" } proc ::pd_bindings::canvas_bindings {name} { @@ -104,9 +109,12 @@ bind $name <Control-Key-t> "menu_texteditor $name" } + # TODO add mouse button bindings + + # do window maintenance when entering a window (Window menu, scrollbars, etc) + #bind $name <Enter> {pdtk_canvaswindowmaintenance} + # Tcl event bindings wm protocol $name WM_DELETE_WINDOW "menu_close $name" - - # TODO add mouse button bindings } Modified: branches/pd-devel/0.41.4/src/pd_menucommands.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-09 00:38:11 UTC (rev 10491) +++ branches/pd-devel/0.41.4/src/pd_menucommands.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -53,6 +53,14 @@ } # ------------------------------------------------------------------------------ +# functions called from Edit menu + +proc ::pd_menucommands::menu_preferences {args} { + toplevel .preferences + wm title .preferences "Preferences" +} + +# ------------------------------------------------------------------------------ # window management functions Modified: branches/pd-devel/0.41.4/src/pd_menus.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-09 00:38:11 UTC (rev 10491) +++ branches/pd-devel/0.41.4/src/pd_menus.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -29,10 +29,13 @@ namespace export configure_pdwindow if {[tk windowingsystem] eq "aqua"} { - set accelerator "Meta" + set accelerator "Cmd" } else { set accelerator "Ctrl" } + + # turn off tearoff menus globally + option add *tearOff 0 } # ------------------------------------------------------------------------------ @@ -47,7 +50,7 @@ $rootmenu add command -label [say "Close"] -accelerator "$accelerator+W" $rootmenu add command -label [say "Save"] -accelerator "$accelerator+S" $rootmenu add command -label [say "Save As..."] -accelerator "$accelerator+Shift+S" - # $rootmenu add command -label [say "Save All"] + #$rootmenu add command -label [say "Save All"] $rootmenu add command -label [say "Revert to Saved"] $rootmenu add separator $rootmenu add command -label [say "Message"] @@ -183,6 +186,11 @@ # if { $editable == 0 } { # $name.m.edit entryconfigure "Edit mode" -indicatoron false # } + if {[tk windowingsystem] ne "aqua"} { + $rootmenu add separator + $rootmenu add command -label [say "Preferences"] \ + -command "menu_preferences" + } } proc ::pd_menus::create_put_menu {rootmenu name} { @@ -269,29 +277,39 @@ -command "placeholder menu_helpbrowser \$help_top_directory" } -proc ::pd_menus::create_apple_menu {rootmenu name} { - $rootmenu add command -label [say "About Pd..."] -command \ + +# for the Apple application menu on Mac OS X +# proc ::tk::mac::ShowPreferences {} { +# puts stderr "apple prefs menu item callback" +# puts stderr "::tk::mac::ShowPreferences " +# menu_preferences +# } + +# for Mac OS X only +proc ::pd_menus::make_apple_menu {rootmenu} { + puts stderr CREATE_APPLE_MENU + # TODO this should open a Pd patch called about.pd + menu .menubar.apple + .menubar.apple add command -label [say "About Pd"] -command \ "menu_doc_open doc/1.manual 1.introduction.txt" - menu $rootmenu.preferences -tearoff 0 - $rootmenu add cascade -label "Preferences" -menu $rootmenu.preferences - $rootmenu.preferences add command -label [say "Path..."] \ - -command {pd pd start-path-dialog \;} - $rootmenu.preferences add command -label [say "Startup..."] \ - -command {pd pd start-startup-dialog \;} - $rootmenu.preferences add command -label [say "Audio Settings..."] \ - -command {pd pd audio-properties \;} - $rootmenu.preferences add command -label [say "MIDI settings..."] \ - -command {pd pd midi-properties \;} + .menubar add cascade -label "Apple" -menu .menubar.apple + # TODO WTF?!? the preferences menu never shows up! } +# for Windows only +proc ::pd_menus::make_system_menu {rootmenu} { + $rootmenu add cascade -menu [menu $rootmenu.system] + # TODO add Close, Minimize, etc and whatever else is on the little menu + # that is on the top left corner of the window frame +} + proc ::pd_menus::create_menubar {rootmenu} { menu $rootmenu set menulist "file edit put find media window help" - if { [tk windowingsystem] eq "aqua" } { - set menulist "$menulist apple" - } + if { [tk windowingsystem] eq "aqua" } {make_apple_menu $rootmenu} + if { [tk windowingsystem] eq "win32" } {make_system_menu $rootmenu} foreach menuitem $menulist { - menu $rootmenu.$menuitem -tearoff 0 + menu $rootmenu.$menuitem $rootmenu add cascade -label [string totitle $menuitem] \ -menu $rootmenu.$menuitem [format create_%s_menu $menuitem] $rootmenu.$menuitem PLACEHOLDER Modified: branches/pd-devel/0.41.4/src/pkgIndex.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-01-09 00:38:11 UTC (rev 10491) +++ branches/pd-devel/0.41.4/src/pkgIndex.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -1,5 +1,5 @@ # Tcl package index file, version 1.1 -# This file is generated by the "pkg_mkIndex -lazy" command +# This file is generated by the "pkg_mkIndex" command # and sourced either when an application starts up or # by a "package unknown" script. It invokes the # "package ifneeded" command to set up package-related @@ -8,11 +8,11 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. -package ifneeded pd_bindings 0.1 [list tclPkgSetup $dir pd_bindings 0.1 {{pd_bindings.tcl source {::pd_bindings::canvas_bindings ::pd_bindings::panel_bindings ::pd_bindings::window_bindings}}}] -package ifneeded pd_connect 0.1 [list tclPkgSetup $dir pd_connect 0.1 {{pd_connect.tcl source {::pd_connect::connect_to_pd ::pd_connect::pd}}}] -package ifneeded pd_iemgui 0.1 [list tclPkgSetup $dir pd_iemgui 0.1 {{pd_iemgui.tcl source ::pd_iemgui::pdtk_iemgui_dialog}}] -package ifneeded pd_menucommands 0.1 [list tclPkgSetup $dir pd_menucommands 0.1 {{pd_menucommands.tcl source {::pd_menucommands::menu_bringalltofront ::pd_menucommands::menu_close ::pd_menucommands::menu_maximize ::pd_menucommands::menu_minimize ::pd_menucommands::menu_new ::pd_menucommands::menu_open}}}] -package ifneeded pd_post 0.1 [list tclPkgSetup $dir pd_post 0.1 {{pd_post.tcl source ::pd_post::pdtk_post}}] -package ifneeded pd_say 0.1 [list tclPkgSetup $dir pd_say 0.1 {{pd_say.tcl source {init_locale say say2 say_category say_namespace}}}] -package ifneeded wheredoesthisgo 0.1 [list tclPkgSetup $dir wheredoesthisgo 0.1 {{wheredoesthisgo.tcl source placeholder}}] +package ifneeded pd_bindings 0.1 [list source [file join $dir pd_bindings.tcl]] +package ifneeded pd_connect 0.1 [list source [file join $dir pd_connect.tcl]] +package ifneeded pd_iemgui 0.1 [list source [file join $dir pd_iemgui.tcl]] +package ifneeded pd_menucommands 0.1 [list source [file join $dir pd_menucommands.tcl]] package ifneeded pd_menus 0.1 [list source [file join $dir pd_menus.tcl]] +package ifneeded pd_post 0.1 [list source [file join $dir pd_post.tcl]] +package ifneeded pd_say 0.1 [list source [file join $dir pd_say.tcl]] +package ifneeded wheredoesthisgo 0.1 [list source [file join $dir wheredoesthisgo.tcl]] Modified: branches/pd-devel/0.41.4/src/pkg_mkIndex.tcl =================================================================== --- branches/pd-devel/0.41.4/src/pkg_mkIndex.tcl 2009-01-09 00:38:11 UTC (rev 10491) +++ branches/pd-devel/0.41.4/src/pkg_mkIndex.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -1,7 +1,7 @@ #!/usr/bin/tclsh puts stdout "Watch out, this doesn't work on packages with namespace import" -pkg_mkIndex -lazy -verbose -- [pwd] *.tcl *.[info sharedlibextension] +pkg_mkIndex -verbose -- [pwd] *.tcl *.[info sharedlibextension] ## this currently needs to be added to pkg_mkIndex manually, ug #package ifneeded pd_menus 0.1 [list source [file join $dir pd_menus.tcl]] Modified: branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl =================================================================== --- branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-09 00:38:11 UTC (rev 10491) +++ branches/pd-devel/0.41.4/src/wheredoesthisgo.tcl 2009-01-09 05:10:16 UTC (rev 10492) @@ -1,13 +1,31 @@ package provide wheredoesthisgo 0.1 -# a place to temporarily store things until they find a home +# a place to temporarily store things until they find a home or go away set help_top_directory "" + +proc post_tclinfo {} { + pdtk_post [concat Tcl library: [info library]] + pdtk_post [concat executable: [info nameofexecutable]] + pdtk_post [concat tclversion: [info tclversion]] + pdtk_post [concat patchlevel: [info patchlevel]] + pdtk_post [concat sharedlibextension: [info sharedlibextension]] +} + + proc placeholder {args} { # PLACEHOLDER ::pd_post::pdtk_post "PLACEHOLDER $args" } + +# ------------------------------------------------------------------------------ +# kludges to avoid changing C code + +proc .mbar.find {command number} { + # this should be changed in g_canvas.c, around line 800 + .menubar.find $command $number +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10491] branches/pd-devel/0.41.4/src/u_main.tk
by eighthave＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 10491 http://pure-data.svn.sourceforge.net/pure-data/?rev=10491&view=rev Author: eighthave Date: 2009-01-09 00:38:11 +0000 (Fri, 09 Jan 2009) Log Message: ----------- replaced by pd.tk in this branch Removed Paths: ------------- branches/pd-devel/0.41.4/src/u_main.tk Deleted: branches/pd-devel/0.41.4/src/u_main.tk =================================================================== --- branches/pd-devel/0.41.4/src/u_main.tk 2009-01-08 12:47:02 UTC (rev 10490) +++ branches/pd-devel/0.41.4/src/u_main.tk 2009-01-09 00:38:11 UTC (rev 10491) @@ -1,4397 +0,0 @@ -#!/usr/bin/wish -# Copyright (c) 1997-1999 Miller Puckette. -# For information on usage and redistribution, and for a DISCLAIMER OF ALL -# WARRANTIES, see the file, "LICENSE.txt," in this distribution. - -# changed by Thomas Musil 09.2001 -# between "pdtk_graph_dialog -- dialog window for graphs" -# and "pdtk_array_dialog -- dialog window for arrays" -# a new dialogbox was inserted, named: -# "pdtk_iemgui_dialog -- dialog window for iem guis" -# -# all this changes are labeled with #######iemlib########## - -# set pd_nt (bad name) 0 for unix, 1 for microsoft, and 2 for Mac OSX. -if { $tcl_platform(platform) == "windows" } { - set pd_nt 1 - set defaultFontFamily {Bitstream Vera Sans Mono} - set defaultFontWeight normal - font create menuFont -family Tahoma -size -11 -} elseif { $tcl_platform(os) == "Darwin" } { - set pd_nt 2 - set defaultFontFamily Monaco - set defaultFontWeight normal -} else { - set pd_nt 0 - set defaultFontFamily Courier - set defaultFontWeight bold -} - -# start Pd-extended font hacks ----------------------------- - -# Pd-0.39.2-extended hacks to make font/box sizes the same across platform -# puts stderr "tk scaling is [tk scaling]" -# tk scaling 1 - -# this font is for the Pd Window console text -font create console_font -family $defaultFontFamily -size -12 \ - -weight $defaultFontWeight -# this font is for text in Pd windows -font create text_font -family {Times} -size -14 -weight normal -# for text in Properties Panels and other panes -font create highlight_font -family $defaultFontFamily -size -14 -weight bold - -# end Pd-extended font hacks ----------------------------- - - -# Tearoff is set to true by default: -set pd_tearoff 1 - -# jsarlo -set pd_array_listview_pagesize 1000 -set pd_array_listview_id(0) 0 -set pd_array_listview_entry(0) 0 -set pd_array_listview_page(0) 0 -# end jsarlo - -if {$pd_nt == 1} { - global pd_guidir - global pd_tearoff - set pd_gui2 [string range $argv0 0 [expr [string last \\ $argv0 ] - 1]] - regsub -all \\\\ $pd_gui2 / pd_gui3 - set pd_guidir $pd_gui3/.. - load $pd_guidir/bin/pdtcl.dll - set pd_tearoff 1 -} - -if {$pd_nt == 2} { -# turn on James Tittle II's fast drawing - set tk::mac::useCGDrawing 1 -# anti-alias all lines that need it - set tk::mac::CGAntialiasLimit 2 - global pd_guidir - global pd_tearoff - set pd_gui2 [string range $argv0 0 [expr [string last / $argv0 ] - 1]] - set pd_guidir $pd_gui2/.. - load $pd_guidir/bin/libPdTcl.dylib - set pd_tearoff 0 - global pd_macready - set pd_macready 0 - global pd_macdropped - set pd_macdropped "" - # tk::mac::OpenDocument is called with the filenames put into the - # var args whenever docs are either dropped on the Pd.app icon or - # opened from the Finder. - # It uses menu_doc_open so it can handles numerous file types. - proc tk::mac::OpenDocument {args} { - global pd_macready pd_macdropped - foreach file $args { - if {$pd_macready != 0} { - pd [concat pd open [pdtk_enquote [file tail $file]] \ - [pdtk_enquote [file dirname $file]] \;] - menu_doc_open [file dirname $file] [file tail $file] - } else { - set pd_macdropped $args - } - } - } -} - -# hack so you can easily test-run this script in linux... define pd_guidir -# (which is normally defined at startup in pd under linux...) - -if {$pd_nt == 0} { - if {! [info exists pd_guidir]} { - global pd_guidir - puts stderr {setting pd_guidir to '.'} - set pd_guidir . - } -} - -set pd_deffont {courier 12 bold} - -set help_top_directory $pd_guidir/doc - -# it's unfortunate but we seem to have to turn off global bindings -# for Text objects to get control-s and control-t to do what we want for -# "text" dialogs below. Also we have to get rid of tab's changing the focus. - -bind all <Key-Tab> "" -bind all <<PrevWindow>> "" -bind Text <Control-t> {} -bind Text <Control-s> {} -# puts stderr [bind all] - -################## set up main window ######################### -# the menus are instantiated here for the main window -# for the patch windows, they are created by pdtk_canvas_new -menu .mbar -canvas .dummy -height 2p -width 6c - -frame .controls -pack .controls .dummy -side top -fill x -menu .mbar.file -tearoff $pd_tearoff -.mbar add cascade -label "File" -menu .mbar.file -menu .mbar.find -tearoff $pd_tearoff -.mbar add cascade -label "Find" -menu .mbar.find -menu .mbar.windows -postcommand [concat pdtk_fixwindowmenu] -tearoff $pd_tearoff -menu .mbar.audio -tearoff $pd_tearoff -if {$pd_nt != 2} { - .mbar add cascade -label "Windows" -menu .mbar.windows - .mbar add cascade -label "Media" -menu .mbar.audio - menu .mbar.help -tearoff $pd_tearoff - .mbar add cascade -label "Help" -menu .mbar.help -} else { - menu .mbar.apple -tearoff 0 - .mbar add cascade -label "Apple" -menu .mbar.apple -# arrange menus according to Apple HIG - .mbar add cascade -label "Media" -menu .mbar.audio - .mbar add cascade -label "Window" -menu .mbar.windows - menu .mbar.help -tearoff $pd_tearoff - .mbar add cascade -label "Help" -menu .mbar.help -} - -# fix menu font size on Windows with tk scaling = 1 -if {$pd_nt == 1} { - .mbar.file configure -font menuFont - .mbar.find configure -font menuFont - .mbar.windows configure -font menuFont - .mbar.audio configure -font menuFont - .mbar.help configure -font menuFont -} - -set ctrls_audio_on 0 -set ctrls_meter_on 0 -set ctrls_inlevel 0 -set ctrls_outlevel 0 - -frame .controls.switches -checkbutton .controls.switches.audiobutton -text {compute audio} \ - -variable ctrls_audio_on \ - -command {pd [concat pd dsp $ctrls_audio_on \;]} - -checkbutton .controls.switches.meterbutton -text {peak meters} \ - -variable ctrls_meter_on \ - -command {pd [concat pd meters $ctrls_meter_on \;]} - -pack .controls.switches.audiobutton .controls.switches.meterbutton \ - -side top -anchor w - -frame .controls.inout -frame .controls.inout.in -label .controls.inout.in.label -text IN -entry .controls.inout.in.level -textvariable ctrls_inlevel -width 3 -button .controls.inout.in.clip -text {CLIP} -state disabled -pack .controls.inout.in.label .controls.inout.in.level \ - .controls.inout.in.clip -side top -pady 2 - -frame .controls.inout.out -label .controls.inout.out.label -text OUT -entry .controls.inout.out.level -textvariable ctrls_outlevel -width 3 -button .controls.inout.out.clip -text {CLIP} -state disabled -pack .controls.inout.out.label .controls.inout.out.level \ - .controls.inout.out.clip -side top -pady 2 - -button .controls.dio -text "DIO\nerrors" \ - -command {pd [concat pd audiostatus \;]} - -pack .controls.inout.in .controls.inout.out -side left -padx 6 -pack .controls.inout -side left -padx 14 -pack .controls.switches -side right -pack .controls.dio -side right -padx 20 - - -frame .printout -text .printout.text -relief raised -bd 2 -font console_font \ - -yscrollcommand ".printout.scroll set" -width 80 -# .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" -scrollbar .printout.scroll -command ".printout.text yview" -pack .printout.scroll -side right -fill y -pack .printout.text -side left -fill both -expand 1 -pack .printout -side bottom -fill both -expand 1 - -proc pdtk_post {stuff} { - .printout.text insert end $stuff - .printout.text yview end-2char -} - -proc pdtk_standardkeybindings {id} { - global pd_nt - bind $id <Control-Key> {pdtk_pd_ctrlkey %W %K 0} - bind $id <Control-Shift-Key> {pdtk_pd_ctrlkey %W %K 1} - if {$pd_nt == 2} { - bind $id <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} - bind $id <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} - } -} - -pdtk_standardkeybindings . - -wm title . "Pd" -. configure -menu .mbar -width 200 -height 150 - -# Intercept closing the main pd window: MP 20060413: -wm protocol . WM_DELETE_WINDOW menu_quit - -############### set up global variables ################################ - -set untitled_number 1 -set untitled_directory [pwd] -set saveas_client doggy -set pd_opendir $untitled_directory -set pd_savedir $untitled_directory -set pd_undoaction no -set pd_redoaction no -set pd_undocanvas no - -################ utility functions ######################### - -# enquote a string to send it to a tcl function -proc pdtk_enquote {x} { - set foo [string map {"," "" ";" "" \" ""} $x] - set foo2 [string map {" " "\\ "} $foo] - concat $foo2 -} - -#enquote a string to send it to Pd. Blow off semi and comma; alias spaces -#we also blow off "{", "}", "\" because they'll just cause bad trouble later. -proc pdtk_unspace {x} { - set y [string map {" " "_" ";" "" "," "" "{" "" "}" "" "\\" ""} $x] - if {$y == ""} {set y "empty"} - concat $y -} - -#enquote a string for preferences (command strings etc.) -proc pdtk_encodedialog {x} { - concat +[string map {" " "+_" "$" "+d" ";" "+s" "," "+c" "+" "++"} $x] -} - -proc pdtk_debug {x} { - tk_messageBox -message $x -type ok -} - -proc pdtk_watchdog {} { - pd [concat pd watchdog \;] - after 2000 {pdtk_watchdog} -} - -proc pdtk_ping {} { - pd [concat pd ping \;] -} - -##### routine to ask user if OK and, if so, send a message on to Pd ###### -proc pdtk_check {x message default} { - set answer [tk_messageBox \-message $x \-type yesno -default $default \ - -icon question] - if {! [string compare $answer yes]} {pd $message} -} - -set menu_windowlist {} - -proc pdtk_fixwindowmenu {} { - global menu_windowlist - .mbar.windows delete 0 end - foreach i $menu_windowlist { - .mbar.windows add command -label [lindex $i 0] \ - -command [concat menu_domenuwindow [lindex $i 1]] - menu_fixwindowmenu [lindex $i 1] - } -} - -####### Odd little function to make better Mac accelerators ##### - -proc accel_munge {acc} { - global pd_nt - - if {$pd_nt == 2} { - if [string is upper [string index $acc end]] { - return [format "%s%s" "Shift+" \ - [string toupper [string map {Ctrl Meta} $acc] end]] - } else { - return [string toupper [string map {Ctrl Meta} $acc] end] - } - } else { - return $acc - } -} - - - -############### the "New" menu command ######################## -proc menu_new {} { - global untitled_number - global untitled_directory - pd [concat pd filename Untitled-$untitled_number $untitled_directory \;] - pd { - #N canvas; - #X pop 1; - } - set untitled_number [expr $untitled_number + 1] -} - -################## the "Open" menu command ######################### - -proc menu_open {} { - global pd_opendir - set filename [tk_getOpenFile -defaultextension .pd \ - -filetypes { {{pd files} {.pd}} {{max files} {.pat}}} \ - -initialdir $pd_opendir] - if {$filename != ""} {open_file $filename} -} - -proc open_file {filename} { - global pd_opendir - set directory [string range $filename 0 [expr [string last / $filename] - 1]] - set pd_opendir $directory - set basename [string range $filename [expr [string last / $filename] + 1] end] - if {[string last .pd $filename] >= 0} { - pd "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" - } -} - -catch { - package require tkdnd - dnd bindtarget . text/uri-list <Drop> { - foreach file %D {open_file $file} - } -} - -################## the "Message" menu command ######################### -proc menu_send {} { - toplevel .sendpanel - entry .sendpanel.entry -textvariable send_textvariable - pack .sendpanel.entry -side bottom -fill both -ipadx 100 - .sendpanel.entry select from 0 - .sendpanel.entry select adjust end - bind .sendpanel.entry <KeyPress-Return> { - pd [concat $send_textvariable \;] - } - pdtk_standardkeybindings .sendpanel.entry - focus .sendpanel.entry -} - -################## the "Quit" menu command ######################### -proc menu_really_quit {} {pd {pd quit;}} - -proc menu_quit {} {pd {pd verifyquit;}} - -######### the "Pd" menu command, which puts the Pd window on top ######## -proc menu_pop_pd {} {raise .} - -######### the "audio" menu command ############### -proc menu_audio {flag} {pd [concat pd dsp $flag \;]} - -######### the "documentation" menu command ############### - -set doc_number 1 - -# open text docs in a Pd window -proc menu_opentext {filename} { - global doc_number - global pd_guidir - global pd_myversion - set name [format ".help%d" $doc_number] - toplevel $name - text $name.text -relief raised -bd 2 -font text_font \ - -yscrollcommand "$name.scroll set" -background white - scrollbar $name.scroll -command "$name.text yview" - pack $name.scroll -side right -fill y - pack $name.text -side left -fill both -expand 1 - - set f [open $filename] - while {![eof $f]} { - set bigstring [read $f 1000] - regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2 - regsub -all PD_VERSION $bigstring2 $pd_myversion bigstring3 - $name.text insert end $bigstring3 - } - close $f - set doc_number [expr $doc_number + 1] -} - -# open HTML docs from the menu using the OS-default HTML viewer -proc menu_openhtml {filename} { - global pd_nt - - if {$pd_nt == 0} { - foreach candidate \ - { gnome-open xdg-open sensible-browser iceweasel firefox mozilla \ - galeon konqueror netscape lynx } { - set browser [lindex [auto_execok $candidate] 0] - if {[string length $browser]} { - puts stderr [format "%s %s" $browser $filename] - exec -- sh -c [format "%s %s" $browser $filename] & - break - } - } - } elseif {$pd_nt == 2} { - puts stderr [format "open %s" $filename] - exec sh -c [format "open %s" $filename] - } else { - exec rundll32 url.dll,FileProtocolHandler \ - [format "file://%s" $filename] & - } -} - -proc menu_doc_open {subdir basename} { - global pd_guidir - - set dirname $pd_guidir/$subdir - - if {[regexp ".*\.(txt|c)$" $basename]} { - menu_opentext $dirname/$basename - } elseif {[regexp ".*\.html?$" $basename]} { - menu_openhtml $dirname/$basename - } else { - pd [concat pd open [pdtk_enquote $basename] \ - [pdtk_enquote $dirname] \;] - } -} - - -################## help browser and support functions ######################### -proc menu_doc_browser {dir} { - global .mbar - if {![file isdirectory $dir]} { - puts stderr "menu_doc_browser non-directory $dir\n" - } - if { [winfo exists .help_browser.frame] } { - raise .help_browser - } else { - toplevel .help_browser -menu .mbar - wm title .help_browser "Pd Documentation Browser" - frame .help_browser.frame - pack .help_browser.frame -side top -fill both - doc_make_listbox .help_browser.frame $dir 0 - } - } - -proc doc_make_listbox {base dir count} { - # check for [file readable]? - #if { [info tclversion] >= 8.5 } { - # requires Tcl 8.5 but probably deals with special chars better -# destroy {expand}[lrange [winfo children $base] [expr {2 * $count}] end] - #} else { - if { [catch { eval destroy [lrange [winfo children $base] \ - [expr { 2 * $count }] end] } \ - errorMessage] } { - puts stderr "doc_make_listbox: error listing $dir\n" - } - #} - # exportselection 0 looks good, but selection gets easily out-of-sync - set current_listbox [listbox "[set b "$base.listbox$count"]-list" -yscrollcommand \ - [list "$b-scroll" set] -height 20 -exportselection 0] - pack $current_listbox [scrollbar "$b-scroll" -command [list $current_listbox yview]] \ - -side left -expand 1 -fill y -anchor w - foreach item [concat [lsort -dictionary [glob -directory $dir -nocomplain -types {d} -- *]] \ - [lsort -dictionary [glob -directory $dir -nocomplain -types {f} -- *]]] { - $current_listbox insert end "[file tail $item][expr {[file isdirectory $item] ? {/} : {}}]" - } - bind $current_listbox <Button-1> [list doc_navigate $dir $count %W %x %y] - bind $current_listbox <Double-Button-1> [list doc_double_button $dir $count %W %x %y] -} - -proc doc_navigate {dir count width x y} { - if {[set newdir [$width get [$width index "@$x,$y"]]] eq {}} { - return - } - set dir_to_open [file join $dir $newdir] - if {[file isdirectory $dir_to_open]} { - doc_make_listbox [winfo parent $width] $dir_to_open [incr count] - } -} - -proc doc_double_button {dir count width x y} { - global pd_guidir - if {[set newdir [$width get [$width index "@$x,$y"]]] eq {}} { - return - } - set dir_to_open [file join $dir $newdir] - if {[file isdirectory $dir_to_open]} { - doc_navigate $dir $count $width $x $y - } else { - regsub -- $pd_guidir [file dirname $dir_to_open] "" subdir - set file [file tail $dir_to_open] - if { [catch {menu_doc_open $subdir $file} fid] } { - puts stderr "Could not open $pd_guidir/$subdir/$file\n" - } - return; - } -} - -############# routine to add media, help, and apple menu items ############### - -proc menu_addstd {mbar} { - global pd_apilist pd_midiapilist pd_nt pd_tearoff -# the "Audio" menu - $mbar.audio add command -label {audio ON} -accelerator [accel_munge "Ctrl+/"] \ - -command {menu_audio 1} - $mbar.audio add command -label {audio OFF} -accelerator [accel_munge "Ctrl+."] \ - -command {menu_audio 0} - for {set x 0} {$x<[llength $pd_apilist]} {incr x} { - $mbar.audio add radiobutton -label [lindex [lindex $pd_apilist $x] 0] \ - -command {menu_audio 0} -variable pd_whichapi \ - -value [lindex [lindex $pd_apilist $x] 1]\ - -command {pd [concat pd audio-setapi $pd_whichapi \;]} - } - for {set x 0} {$x<[llength $pd_midiapilist]} {incr x} { - $mbar.audio add radiobutton -label [lindex [lindex $pd_midiapilist $x] 0] \ - -command {menu_midi 0} -variable pd_whichmidiapi \ - -value [lindex [lindex $pd_midiapilist $x] 1]\ - -command {pd [concat pd midi-setapi $pd_whichmidiapi \;]} - } - if {$pd_nt != 2} { - $mbar.audio add command -label {Audio settings...} \ - -command {pd pd audio-properties \;} - $mbar.audio add command -label {MIDI settings...} \ - -command {pd pd midi-properties \;} - } - - $mbar.audio add command -label {Test Audio and MIDI} \ - -command {menu_doc_open doc/7.stuff/tools testtone.pd} - $mbar.audio add command -label {Load Meter} \ - -command {menu_doc_open doc/7.stuff/tools load-meter.pd} - -# the MacOS X app menu - -# The menu on the main menubar named $whatever.apple while be treated -# as a special menu on MacOS X. Tcl/Tk assigns the $whatever.apple menu -# to the app-specific menu in MacOS X that is named after the app, -# so in our case, the Pd menu. <hans(a)at.or.at> -# See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm - if {$pd_nt == 2} { - $mbar.apple add command -label "About Pd..." -command \ - {menu_doc_open doc/1.manual 1.introduction.txt} - menu $mbar.apple.preferences -tearoff 0 - $mbar.apple add cascade -label "Preferences" -menu $mbar.apple.preferences - $mbar.apple.preferences add command -label "Path..." \ - -command {pd pd start-path-dialog \;} - $mbar.apple.preferences add command -label "Startup..." \ - -command {pd pd start-startup-dialog \;} - $mbar.apple.preferences add command -label "Audio Settings..." \ - -command {pd pd audio-properties \;} - $mbar.apple.preferences add command -label "MIDI settings..." \ - -command {pd pd midi-properties \;} - } - - - # the "Help" menu - if {$pd_nt != 2} { - $mbar.help add command -label {About Pd} \ - -command {menu_doc_open doc/1.manual 1.introduction.txt} - } - $mbar.help add command -label {Html ...} \ - -command {menu_doc_open doc/1.manual index.htm} - $mbar.help add command -label {Browser ...} \ - -command {menu_doc_browser $help_top_directory} -} - -#################### the "File" menu for the Pd window ############## - -.mbar.file add command -label New -command {menu_new} \ - -accelerator [accel_munge "Ctrl+n"] -.mbar.file add command -label Open -command {menu_open} \ - -accelerator [accel_munge "Ctrl+o"] -.mbar.file add separator -.mbar.file add command -label Message -command {menu_send} \ - -accelerator [accel_munge "Ctrl+m"] -# On MacOS X, these are in the standard HIG locations -# i.e. the Preferences menu under "Pd" -if {$pd_nt != 2} { -.mbar.file add command -label Path... \ - -command {pd pd start-path-dialog \;} -.mbar.file add command -label Startup... \ - -command {pd pd start-startup-dialog \;} -} -.mbar.file add separator -.mbar.file add command -label Quit -command {menu_quit} \ - -accelerator [accel_munge "Ctrl+q"] - -#################### the "Find" menu for the Pd window ############## -.mbar.find add command -label {Find last error} -command {menu_finderror} - -########### functions for menu functions on document windows ######## - -proc menu_save {name} { - pdtk_canvas_checkgeometry $name - pd [concat $name menusave \;] -} - -proc menu_saveas {name} { - pdtk_canvas_checkgeometry $name - pd [concat $name menusaveas \;] -} - -proc menu_print {name} { - set filename [tk_getSaveFile -initialfile pd.ps \ - -defaultextension .ps \ - -filetypes { {{postscript} {.ps}} }] - - if {$filename != ""} { - $name.c postscript -file $filename - } -} - -proc menu_close {name} { - pdtk_canvas_checkgeometry $name - pd [concat $name menuclose 0 \;] -} - -proc menu_really_close {name} { - pdtk_canvas_checkgeometry $name - pd [concat $name menuclose 1 \;] -} - -proc menu_undo {name} { - global pd_undoaction - global pd_redoaction - global pd_undocanvas - if {$name == $pd_undocanvas && $pd_undoaction != "no"} { - pd [concat $name undo \;] - } -} - -proc menu_redo {name} { - global pd_undoaction - global pd_redoaction - global pd_undocanvas - if {$name == $pd_undocanvas && $pd_redoaction != "no"} { - pd [concat $name redo \;] - } -} - -proc menu_cut {name} { - pd [concat $name cut \;] -} - -proc menu_copy {name} { - pd [concat $name copy \;] -} - -proc menu_paste {name} { - pd [concat $name paste \;] -} - -proc menu_duplicate {name} { - pd [concat $name duplicate \;] -} - -proc menu_selectall {name} { - pd [concat $name selectall \;] -} - -proc menu_texteditor {name} { - pd [concat $name texteditor \;] -} - -proc menu_font {name} { - pd [concat $name menufont \;] -} - -proc menu_tidyup {name} { - pd [concat $name tidy \;] -} - -proc menu_editmode {name} { - pd [concat $name editmode 0 \;] -} - -proc menu_object {name accel} { - pd [concat $name obj $accel \;] -} - -proc menu_message {name accel} { - pd [concat $name msg $accel \;] -} - -proc menu_floatatom {name accel} { - pd [concat $name floatatom $accel \;] -} - -proc menu_symbolatom {name accel} { - pd [concat $name symbolatom $accel \;] -} - -proc menu_comment {name accel} { - pd [concat $name text $accel \;] -} - -proc menu_graph {name} { - pd [concat $name graph \;] -} - -proc menu_array {name} { - pd [concat $name menuarray \;] -} - -############iemlib################## -proc menu_bng {name accel} { - pd [concat $name bng $accel \;] -} - -proc menu_toggle {name accel} { - pd [concat $name toggle $accel \;] -} - -proc menu_numbox {name accel} { - pd [concat $name numbox $accel \;] -} - -proc menu_vslider {name accel} { - pd [concat $name vslider $accel \;] -} - -proc menu_hslider {name accel} { - pd [concat $name hslider $accel \;] -} - -proc menu_hradio {name accel} { - pd [concat $name hradio $accel \;] -} - -proc menu_vradio {name accel} { - pd [concat $name vradio $accel \;] -} - -proc menu_vumeter {name accel} { - pd [concat $name vumeter $accel \;] -} - -proc menu_mycnv {name accel} { - pd [concat $name mycnv $accel \;] -} - -############iemlib################## - -# correct edit menu, enabling or disabling undo/redo -# LATER also cut/copy/paste -proc menu_fixeditmenu {name} { - global pd_undoaction - global pd_redoaction - global pd_undocanvas -# puts stderr [concat menu_fixeditmenu $name $pd_undocanvas $pd_undoaction] - if {$name == $pd_undocanvas && $pd_undoaction != "no"} { - $name.m.edit entryconfigure "Undo*" -state normal \ - -label [concat "Undo " $pd_undoaction] - } else { - $name.m.edit entryconfigure "Undo*" -state disabled -label "Undo" - } - if {$name == $pd_undocanvas && $pd_redoaction != "no"} { - $name.m.edit entryconfigure "Redo*" -state normal\ - -label [concat "Redo " $pd_redoaction] - } else { - $name.m.edit entryconfigure "Redo*" -state disabled - } -} - -# message from Pd to update the currently available undo/redo action -proc pdtk_undomenu {name undoaction redoaction} { - global pd_undoaction - global pd_redoaction - global pd_undocanvas -# puts stderr [concat pdtk_undomenu $name $undoaction $redoaction] - set pd_undocanvas $name - set pd_undoaction $undoaction - set pd_redoaction $redoaction - if {$name != "nobody"} { -# unpleasant way of avoiding a more unpleasant bug situation --atl 2002.11.25 - menu_fixeditmenu $name - } -} - -proc menu_windowparent {name} { - pd [concat $name findparent \;] -} - -proc menu_findagain {name} { - pd [concat $name findagain \;] -} - -proc menu_finderror {} { - pd [concat pd finderror \;] -} - -proc menu_domenuwindow {i} { - raise $i -} - -proc menu_fixwindowmenu {name} { - global menu_windowlist - global pd_tearoff - $name.m.windows add command - if $pd_tearoff { - $name.m.windows delete 4 end - } else { - $name.m.windows delete 3 end - } - foreach i $menu_windowlist { - $name.m.windows add command -label [lindex $i 0] \ - -command [concat menu_domenuwindow [lindex $i 1]] - } -} - -################## the "find" menu item ################### - -set find_canvas nobody -set find_string "" -set find_count 1 - -proc find_apply {name} { - global find_string - global find_canvas - regsub -all \; $find_string " _semi_ " find_string2 - regsub -all \, $find_string2 " _comma_ " find_string3 -# puts stderr [concat $find_canvas find $find_string3 \ -# \;] - pd [concat $find_canvas find $find_string3 \ - \;] - after 50 destroy $name -} - -proc find_cancel {name} { - after 50 destroy $name -} - -proc menu_findobject {canvas} { - global find_string - global find_canvas - global find_count - - set name [format ".find%d" $find_count] - set find_count [expr $find_count + 1] - - set find_canvas $canvas - - toplevel $name - - label $name.label -text {find...} - pack $name.label -side top - - entry $name.entry -textvariable find_string - pack $name.entry -side top - - frame $name.buttonframe - pack $name.buttonframe -side bottom -fill x -pady 2m - button $name.buttonframe.cancel -text {Cancel}\ - -command "find_cancel $name" - button $name.buttonframe.ok -text {OK}\ - -command "find_apply $name" - pack $name.buttonframe.cancel -side left -expand 1 - pack $name.buttonframe.ok -side left -expand 1 - - $name.entry select from 0 - $name.entry select adjust end - bind $name.entry <KeyPress-Return> [ concat find_apply $name] - pdtk_standardkeybindings $name.entry - focus $name.entry -} - - -############# pdtk_canvas_new -- create a new canvas ############### -proc pdtk_canvas_new {name width height geometry editable} { - global pd_opendir - global pd_tearoff - global pd_nt - global tcl_version - - toplevel $name -menu $name.m - # if we're a mac, refuse to make window so big you can't get to - # the resizing control - if {$pd_nt == 2} { - if {$width > [winfo screenwidth $name] - 80} { - set width [expr [winfo screenwidth $name] - 80] - } - if {$height > [winfo screenheight $name] - 80} { - set height [expr [winfo screenheight $name] - 80] - } - } - -# slide offscreen windows into view - if {$tcl_version >= 8.4} { - set geometry [split $geometry +] - set i 1 - foreach geo {width height} { - set screen($geo) [winfo screen$geo .] - if {[expr [lindex $geometry $i] + [set $geo]] > $screen($geo)} { - set pos($geo) [expr $screen($geo) - [set $geo]] - if {$pos($geo) < 0} {set pos($geo) 0} - lset geometry $i $pos($geo) - } - incr i - } - set geometry [join $geometry +] - } - wm geometry $name $geometry - canvas $name.c -width $width -height $height -background white \ - -yscrollcommand "$name.scrollvert set" \ - -xscrollcommand "$name.scrollhort set" \ - -scrollregion [concat 0 0 $width $height] - - scrollbar $name.scrollvert -command "$name.c yview" - scrollbar $name.scrollhort -command "$name.c xview" \ - -orient horizontal - - pack $name.scrollhort -side bottom -fill x - pack $name.scrollvert -side right -fill y - pack $name.c -side left -expand 1 -fill both - wm minsize $name 1 1 - wm geometry $name $geometry -# the file menu - -# The menus are instantiated here for the patch windows. -# For the main window, they are created on load, at the -# top of this file. - menu $name.m - menu $name.m.file -tearoff $pd_tearoff - $name.m add cascade -label File -menu $name.m.file - - $name.m.file add command -label New -command {menu_new} \ - -accelerator [accel_munge "Ctrl+n"] - - $name.m.file add command -label Open -command {menu_open} \ - -accelerator [accel_munge "Ctrl+o"] - - $name.m.file add separator - $name.m.file add command -label Message -command {menu_send} \ - -accelerator [accel_munge "Ctrl+m"] - - # arrange menus according to Apple HIG - # these are now part of Preferences... - if {$pd_nt != 2 } { - $name.m.file add command -label Path... \ - -command {pd pd start-path-dialog \;} - - $name.m.file add command -label Startup... \ - -command {pd pd start-startup-dialog \;} - } - - $name.m.file add separator - $name.m.file add command -label Close \ - -command [concat menu_close $name] \ - -accelerator [accel_munge "Ctrl+w"] - - $name.m.file add command -label Save -command [concat menu_save $name] \ - -accelerator [accel_munge "Ctrl+s"] - - $name.m.file add command -label "Save as..." \ - -command [concat menu_saveas $name] \ - -accelerator [accel_munge "Ctrl+S"] - - $name.m.file add command -label Print -command [concat menu_print $name] \ - -accelerator [accel_munge "Ctrl+p"] - - $name.m.file add separator - - $name.m.file add command -label Quit -command {menu_quit} \ - -accelerator [accel_munge "Ctrl+q"] - -# the edit menu - menu $name.m.edit -postcommand [concat menu_fixeditmenu $name] -tearoff $pd_tearoff - $name.m add cascade -label Edit -menu $name.m.edit - - $name.m.edit add command -label Undo -command [concat menu_undo $name] \ - -accelerator [accel_munge "Ctrl+z"] - - $name.m.edit add command -label Redo -command [concat menu_redo $name] \ - -accelerator [accel_munge "Ctrl+Z"] - - $name.m.edit add separator - - $name.m.edit add command -label Cut -command [concat menu_cut $name] \ - -accelerator [accel_munge "Ctrl+x"] - - $name.m.edit add command -label Copy -command [concat menu_copy $name] \ - -accelerator [accel_munge "Ctrl+c"] - - $name.m.edit add command -label Paste \ - -command [concat menu_paste $name] \ - -accelerator [accel_munge "Ctrl+v"] - - $name.m.edit add command -label Duplicate \ - -command [concat menu_duplicate $name] \ - -accelerator [accel_munge "Ctrl+d"] - - $name.m.edit add command -label {Select all} \ - -command [concat menu_selectall $name] \ - -accelerator [accel_munge "Ctrl+a"] - - $name.m.edit add separator - - $name.m.edit add command -label {Text Editor} \ - -command [concat menu_texteditor $name] \ - -accelerator [accel_munge "Ctrl+t"] - - $name.m.edit add command -label Font \ - -command [concat menu_font $name] - - $name.m.edit add command -label {Tidy Up} \ - -command [concat menu_tidyup $name] - - $name.m.edit add separator - -# Apple, Microsoft, and others put find functions in the Edit menu. - $name.m.edit add command -label {Find...} \ - -accelerator [accel_munge "Ctrl+f"] \ - -command [concat menu_findobject $name] - $name.m.edit add command -label {Find Again} \ - -accelerator [accel_munge "Ctrl+g"] \ - -command [concat menu_findagain $name] - $name.m.edit add command -label {Find last error} \ - -command [concat menu_finderror] - - $name.m.edit add separator - -############iemlib################## -# instead of "red = #BC3C60" we take "grey85", so there is no difference, -# if widget is selected or not. - - $name.m.edit add checkbutton -label "Edit mode" \ - -indicatoron true -selectcolor grey85 \ - -command [concat menu_editmode $name] \ - -accelerator [accel_munge "Ctrl+e"] - - if { $editable == 0 } { - $name.m.edit entryconfigure "Edit mode" -indicatoron false } - - -############iemlib################## - - -# the put menu - menu $name.m.put -tearoff $pd_tearoff - $name.m add cascade -label Put -menu $name.m.put - - $name.m.put add command -label Object \ - -command [concat menu_object $name 0] \ - -accelerator [accel_munge "Ctrl+1"] - - $name.m.put add command -label Message \ - -command [concat menu_message $name 0] \ - -accelerator [accel_munge "Ctrl+2"] - - $name.m.put add command -label Number \ - -command [concat menu_floatatom $name 0] \ - -accelerator [accel_munge "Ctrl+3"] - - $name.m.put add command -label Symbol \ - -command [concat menu_symbolatom $name 0] \ - -accelerator [accel_munge "Ctrl+4"] - - $name.m.put add command -label Comment \ - -command [concat menu_comment $name 0] \ - -accelerator [accel_munge "Ctrl+5"] - - $name.m.put add separator - -############iemlib################## - - $name.m.put add command -label Bang \ - -command [concat menu_bng $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+b"] - - $name.m.put add command -label Toggle \ - -command [concat menu_toggle $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+t"] - - $name.m.put add command -label Number2 \ - -command [concat menu_numbox $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+n"] - - $name.m.put add command -label Vslider \ - -command [concat menu_vslider $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+v"] - - $name.m.put add command -label Hslider \ - -command [concat menu_hslider $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+h"] - - $name.m.put add command -label Vradio \ - -command [concat menu_vradio $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+d"] - - $name.m.put add command -label Hradio \ - -command [concat menu_hradio $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+i"] - - $name.m.put add command -label VU \ - -command [concat menu_vumeter $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+u"] - - $name.m.put add command -label Canvas \ - -command [concat menu_mycnv $name 0] \ - -accelerator [accel_munge "Shift+Ctrl+c"] - -############iemlib################## - - $name.m.put add separator - - $name.m.put add command -label Graph \ - -command [concat menu_graph $name] - - $name.m.put add command -label Array \ - -command [concat menu_array $name] - -# the find menu -# Apple, Microsoft, and others put find functions in the Edit menu. -# But in order to move these items to the Edit menu, the Find menu -# handling needs to be dealt with, including this line in g_canvas.c: -# sys_vgui(".mbar.find delete %d\n", i); -# <hans(a)at.or.at> - menu $name.m.find -tearoff $pd_tearoff - $name.m add cascade -label Find -menu $name.m.find - - $name.m.find add command -label {Find...} \ - -accelerator [accel_munge "Ctrl+f"] \ - -command [concat menu_findobject $name] - $name.m.find add command -label {Find Again} \ - -accelerator [accel_munge "Ctrl+g"] \ - -command [concat menu_findagain $name] - $name.m.find add command -label {Find last error} \ - -command [concat menu_finderror] - -# the window menu - menu $name.m.windows -postcommand [concat menu_fixwindowmenu $name] \ - -tearoff $pd_tearoff - - $name.m.windows add command -label {parent window}\ - -command [concat menu_windowparent $name] - $name.m.windows add command -label {Pd window} -command menu_pop_pd - $name.m.windows add separator - -# the audio menu - menu $name.m.audio -tearoff $pd_tearoff - - if {$pd_nt != 2} { - $name.m add cascade -label Windows -menu $name.m.windows - $name.m add cascade -label Media -menu $name.m.audio - } else { - $name.m add cascade -label Media -menu $name.m.audio - $name.m add cascade -label Window -menu $name.m.windows -# the MacOS X app menu - menu $name.m.apple -tearoff $pd_tearoff - $name.m add cascade -label "Apple" -menu $name.m.apple - } - -# the help menu - - menu $name.m.help -tearoff $pd_tearoff - $name.m add cascade -label Help -menu $name.m.help - - menu_addstd $name.m - -# the popup menu - menu $name.popup -tearoff false - $name.popup add command -label {Properties} \ - -command [concat popup_action $name 0] - $name.popup add command -label {Open} \ - -command [concat popup_action $name 1] - $name.popup add command -label {Help} \ - -command [concat popup_action $name 2] - -# fix menu font size on Windows with tk scaling = 1 -if {$pd_nt == 1} { - $name.m.file configure -font menuFont - $name.m.edit configure -font menuFont - $name.m.find configure -font menuFont - $name.m.put configure -font menuFont - $name.m.windows configure -font menuFont - $name.m.audio configure -font menuFont - $name.m.help configure -font menuFont - $name.popup configure -font menuFont -} - -# WM protocol - wm protocol $name WM_DELETE_WINDOW [concat menu_close $name] - -# bindings. -# this is idiotic -- how do you just sense what mod keys are down and -# pass them on? I can't find it anywhere. -# Here we encode shift as 1, control 2, alt 4, in agreement -# with definitions in g_canvas.c. The third button gets "8" but we don't -# bother with modifiers there. -# We don't handle multiple clicks yet. - - bind $name.c <Button> {pdtk_canvas_click %W %x %y %b 0} - bind $name.c <Shift-Button> {pdtk_canvas_click %W %x %y %b 1} - bind $name.c <Control-Shift-Button> {pdtk_canvas_click %W %x %y %b 3} - # Alt key is called Option on the Mac - if {$pd_nt == 2} { - bind $name.c <Option-Button> {pdtk_canvas_click %W %x %y %b 4} - bind $name.c <Option-Shift-Button> {pdtk_canvas_click %W %x %y %b 5} - bind $name.c <Option-Control-Button> {pdtk_canvas_click %W %x %y %b 6} - bind $name.c <Mod1-Button> {pdtk_canvas_click %W %x %y %b 6} - bind $name.c <Option-Control-Shift-Button> \ - {pdtk_canvas_click %W %x %y %b 7} - } else { - bind $name.c <Alt-Button> {pdtk_canvas_click %W %x %y %b 4} - bind $name.c <Alt-Shift-Button> {pdtk_canvas_click %W %x %y %b 5} - bind $name.c <Alt-Control-Button> {pdtk_canvas_click %W %x %y %b 6} - bind $name.c <Alt-Control-Shift-Button> \ - {pdtk_canvas_click %W %x %y %b 7} - } - global pd_nt -# button 2 is the right button on Mac; on other platforms it's button 3. - if {$pd_nt == 2} { - bind $name.c <Button-2> {pdtk_canvas_click %W %x %y %b 8} - bind $name.c <Control-Button> {pdtk_canvas_click %W %x %y %b 8} - } else { - bind $name.c <Button-3> {pdtk_canvas_click %W %x %y %b 8} - bind $name.c <Control-Button> {pdtk_canvas_click %W %x %y %b 2} - } -#on linux, button 2 "pastes" from the X windows clipboard - if {$pd_nt == 0} { - bind $name.c <Button-2> {\ - pdtk_canvas_click %W %x %y %b 0;\ - pdtk_canvas_mouseup %W %x %y %b;\ - pdtk_pastetext} - } - - bind $name.c <ButtonRelease> {pdtk_canvas_mouseup %W %x %y %b} - bind $name.c <Control-Key> {pdtk_canvas_ctrlkey %W %K 0} - bind $name.c <Control-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} -# bind $name.c <Mod1-Key> {puts stderr [concat mod1 %W %K %A]} - if {$pd_nt == 2} { - bind $name.c <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} - bind $name.c <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} - } - bind $name.c <Key> {pdtk_canvas_key %W %K %A 0} - bind $name.c <Shift-Key> {pdtk_canvas_key %W %K %A 1} - bind $name.c <KeyRelease> {pdtk_canvas_keyup %W %K %A} - bind $name.c <Motion> {pdtk_canvas_motion %W %x %y 0} - bind $name.c <Control-Motion> {pdtk_canvas_motion %W %x %y 2} - if {$pd_nt == 2} { - bind $name.c <Option-Motion> {pdtk_canvas_motion %W %x %y 4} - } else { - bind $name.c <Alt-Motion> {pdtk_canvas_motion %W %x %y 4} - } - bind $name.c <Map> {pdtk_canvas_map %W} - bind $name.c <Unmap> {pdtk_canvas_unmap %W} - focus $name.c - - switch $pd_nt { 0 { - bind $name.c <Button-4> "pdtk_canvas_scroll $name.c y -1" - bind $name.c <Button-5> "pdtk_canvas_scroll $name.c y +1" - bind $name.c <Shift-Button-4> "pdtk_canvas_scroll $name.c x -1" - bind $name.c <Shift-Button-5> "pdtk_canvas_scroll $name.c x +1" - } default { - bind $name.c <MouseWheel> \ - "pdtk_canvas_scroll $name.c y \[expr -abs(%D)/%D\]" - bind $name.c <Shift-MouseWheel> \ - "pdtk_canvas_scroll $name.c x \[expr -abs(%D)/%D\]" - }} - - catch { - dnd bindtarget $name.c text/uri-list <Drop> \ - "pdtk_canvas_makeobjs $name %D %x %y" - } - -# puts stderr "all done" -# after 1 [concat raise $name] - global pdtk_canvas_mouseup_name - set pdtk_canvas_mouseup_name "" -} - -#### jsarlo ##### -proc pdtk_array_listview_setpage {arrayName page} { - global pd_array_listview_page - set pd_array_listview_page($arrayName) $page -} - -proc pdtk_array_listview_changepage {arrayName np} { - global pd_array_listview_page - pdtk_array_listview_setpage \ - $arrayName [expr $pd_array_listview_page($arrayName) + $np] - pdtk_array_listview_fillpage $arrayName -} - -proc pdtk_array_listview_fillpage {arrayName} { - global pd_array_listview_page - global pd_array_listview_id - set windowName [format ".%sArrayWindow" $arrayName] - set topItem [expr [lindex [$windowName.lb yview] 0] * \ - [$windowName.lb size]] - - if {[winfo exists $windowName]} { - set cmd "$pd_array_listview_id($arrayName) \ - arrayviewlistfillpage \ - $pd_array_listview_page($arrayName) \ - $topItem" - - pd [concat $cmd \;] - } -} - -proc pdtk_array_listview_new {id arrayName page} { - global pd_nt - global pd_array_listview_page - global pd_array_listview_id - global fontname fontweight - set pd_array_listview_page($arrayName) $page - set pd_array_listview_id($arrayName) $id - set windowName [format ".%sArrayWindow" $arrayName] - if [winfo exists $windowName] then [destroy $windowName] - toplevel $windowName - wm protocol $windowName WM_DELETE_WINDOW \ - "pdtk_array_listview_close $id $arrayName" - wm title $windowName [concat $arrayName "(list view)"] - # FIXME - set font 12 - set $windowName.lb [listbox $windowName.lb -height 20 -width 25\ - -selectmode extended \ - -relief solid -background white -borderwidth 1 \ - -font [format {{%s} %d %s} $fontname $font $fontweight]\ - -yscrollcommand "$windowName.lb.sb set"] - set $windowName.lb.sb [scrollbar $windowName.lb.sb \ - -command "$windowName.lb yview" -orient vertical] - place configure $windowName.lb.sb -relheight 1 -relx 0.9 -relwidth 0.1 - pack $windowName.lb -expand 1 -fill both - bind $windowName.lb <Double-ButtonPress-1> \ - "pdtk_array_listview_edit $arrayName $page $font" - # handle copy/paste - if {$pd_nt == 0} { - selection handle $windowName.lb \ - "pdtk_array_listview_lbselection $arrayName" - } else { - if {$pd_nt == 1} { - bind $windowName.lb <ButtonPress-3> \ - "pdtk_array_listview_popup $arrayName" - } - } - set $windowName.prevBtn [button $windowName.prevBtn -text "<-" \ - -command "pdtk_array_listview_changepage $arrayName -1"] - set $windowName.nextBtn [button $windowName.nextBtn -text "->" \ - -command "pdtk_array_listview_changepage $arrayName 1"] - pack $windowName.prevBtn -side left -ipadx 20 -pady 10 -anchor s - pack $windowName.nextBtn -side right -ipadx 20 -pady 10 -anchor s - focus $windowName -} - -proc pdtk_array_listview_lbselection {arrayName off size} { - set windowName [format ".%sArrayWindow" $arrayName] - set itemNums [$windowName.lb curselection] - set cbString "" - for {set i 0} {$i < [expr [llength $itemNums] - 1]} {incr i} { - set listItem [$windowName.lb get [lindex $itemNums $i]] - append cbString [string range $listItem \ - [expr [string first ") " $listItem] + 2] \ - end] - append cbString "\n" - } - set listItem [$windowName.lb get [lindex $itemNums $i]] - append cbString [string range $listItem \ - [expr [string first ") " $listItem] + 2] \ - end] - set last $cbString -} - -# Win32 uses a popup menu for copy/paste -proc pdtk_array_listview_popup {arrayName} { - set windowName [format ".%sArrayWindow" $arrayName] - if [winfo exists $windowName.popup] then [destroy $windowName.popup] - menu $windowName.popup -tearoff false - $windowName.popup add command -label {Copy} \ - -command "pdtk_array_listview_copy $arrayName; \ - destroy $windowName.popup" - $windowName.popup add command -label {Paste} \ - -command "pdtk_array_listview_paste $arrayName; \ - destroy $windowName.popup" - tk_popup $windowName.popup [winfo pointerx $windowName] \ - [winfo pointery $windowName] 0 -} - -proc pdtk_array_listview_copy {arrayName} { - set windowName [format ".%sArrayWindow" $arrayName] - set itemNums [$windowName.lb curselection] - set cbString "" - for {set i 0} {$i < [expr [llength $itemNums] - 1]} {incr i} { - set listItem [$windowName.lb get [lindex $itemNums $i]] - append cbString [string range $listItem \ - [expr [string first ") " $listItem] + 2] \ - end] - append cbString "\n" - } - set listItem [$windowName.lb get [lindex $itemNums $i]] - append cbString [string range $listItem \ - [expr [string first ") " $listItem] + 2] \ - end] - clipboard clear - clipboard append $cbString -} - -proc pdtk_array_listview_paste {arrayName} { - global pd_array_listview_page - global pd_array_listview_pagesize - set cbString [selection get -selection CLIPBOARD] - set lbName [format ".%sArrayWindow.lb" $arrayName] - set itemNum [lindex [$lbName curselection] 0] - set splitChars ", \n" - set itemString [split $cbString $splitChars] - set flag 1 - for {set i 0; set counter 0} {$i < [llength $itemString]} {incr i} { - if {[lindex $itemString $i] != {}} { - pd [concat $arrayName [expr $itemNum + \ - [expr $counter + \ - [expr $pd_array_listview_pagesize \ - * $pd_array_listview_page($arrayName)]]] \ - [lindex $itemString $i] \;] - incr counter - set flag 0 - } - } -} - -proc pdtk_array_listview_edit {arrayName page font} { - global pd_array_listview_entry - global pd_nt - global fontname fontweight - set lbName [format ".%sArrayWindow.lb" $arrayName] - if {[winfo exists $lbName.entry]} { - pdtk_array_listview_update_entry \ - $arrayName $pd_array_listview_entry($arrayName) - unset pd_array_listview_entry($arrayName) - } - set itemNum [$lbName index active] - set pd_array_listview_entry($arrayName) $itemNum - set bbox [$lbName bbox $itemNum] - set y [expr [lindex $bbox 1] - 4] - set $lbName.entry [entry $lbName.entry \ - -font [format {{%s} %d %s} $fontname $font $fontweight]] - $lbName.entry insert 0 [] - place configure $lbName.entry -relx 0 -y $y -relwidth 1 - lower $lbName.entry - focus $lbName.entry - bind $lbName.entry <Return> \ - "pdtk_array_listview_update_entry $arrayName $itemNum;" -} - -proc pdtk_array_listview_update_entry {arrayName itemNum} { - global pd_array_listview_page - global pd_array_listview_pagesize - set lbName [format ".%sArrayWindow.lb" $arrayName] - set splitChars ", \n" - set itemString [split [$lbName.entry get] $splitChars] - set flag 1 - for {set i 0; set counter 0} {$i < [llength $itemString]} {incr i} { - if {[lindex $itemString $i] != {}} { - pd [concat $arrayName [expr $itemNum + \ - [expr $counter + \ - [expr $pd_array_listview_pagesize \ - * $pd_array_listview_page($arrayName)]]] \ - [lindex $itemString $i] \;] - incr counter - set flag 0 - } - } - pdtk_array_listview_fillpage $arrayName - destroy $lbName.entry -} - -proc pdtk_array_listview_closeWindow {arrayName} { - set windowName [format ".%sArrayWindow" $arrayName] - destroy $windowName -} - -proc pdtk_array_listview_close {id arrayName} { - pdtk_array_listview_closeWindow $arrayName - set cmd [concat $id "arrayviewclose" \;] - pd $cmd -} -##### end jsarlo ##### - -#################### event binding procedures ################ - -#get the name of the toplevel window for a canvas; this is also -#the name of the canvas object in Pd. - -proc canvastosym {name} { - string range $name 0 [expr [string length $name] - 3] -} - -set pdtk_lastcanvasconfigured "" -set pdtk_lastcanvasconfiguration "" -set pdtk_lastcanvasconfiguration2 "" - -proc pdtk_canvas_checkgeometry {topname} { - set boo [winfo geometry $topname.c] - set boo2 [wm geometry $topname] - global pdtk_lastcanvasconfigured - global pdtk_lastcanvasconfiguration - global pdtk_lastcanvasconfiguration2 - if {$topname != $pdtk_lastcanvasconfigured || \ - $boo != $pdtk_lastcanvasconfiguration || \ - $boo2 != $pdtk_lastcanvasconfiguration2} { - set pdtk_lastcanvasconfigured $topname - set pdtk_lastcanvasconfiguration $boo - set pdtk_lastcanvasconfiguration2 $boo2 - pd $topname relocate $boo $boo2 \; - } -} - -proc pdtk_canvas_click {name x y b f} { - global pd_nt - if {$pd_nt == 0} {focus $name} - pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b $f \; -} - -proc pdtk_canvas_shiftclick {name x y b} { - pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 1 \; -} - -proc pdtk_canvas_ctrlclick {name x y b} { - pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 2 \; -} - -proc pdtk_canvas_altclick {name x y b} { - pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 3 \; -} - -proc pdtk_canvas_dblclick {name x y b} { - pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b 4 \; -} - -set pdtk_canvas_mouseup_name 0 -set pdtk_canvas_mouseup_xminval 0 -set pdtk_canvas_mouseup_xmaxval 0 -set pdtk_canvas_mouseup_yminval 0 -set pdtk_canvas_mouseup_ymaxval 0 - -proc pdtk_canvas_mouseup {name x y b} { - pd [concat [canvastosym $name] mouseup [$name canvasx $x] \ - [$name canvasy $y] $b \;] -} - -proc pdtk_canvas_getscroll {name} { - global pdtk_canvas_mouseup_name - global pdtk_canvas_mouseup_xminval - global pdtk_canvas_mouseup_xmaxval - global pdtk_canvas_mouseup_yminval - global pdtk_canvas_mouseup_ymaxval - - set size [$name bbox all] - if {$size != ""} { - set xminval 0 - set yminval 0 - set xmaxval 100 - set ymaxval 100 - set x1 [lindex $size 0] - set x2 [lindex $size 2] - set y1 [lindex $size 1] - set y2 [lindex $size 3] - - if {$x1 < 0} {set xminval $x1} - if {$y1 < 0} {set yminval $y1} - - if {$x2 > 100} {set xmaxval $x2} - if {$y2 > 100} {set ymaxval $y2} - - if {$pdtk_canvas_mouseup_name != $name || \ - $pdtk_canvas_mouseup_xminval != $xminval || \ - $pdtk_canvas_mouseup_xmaxval != $xmaxval || \ - $pdtk_canvas_mouseup_yminval != $yminval || \ - $pdtk_canvas_mouseup_ymaxval != $ymaxval } { - - set newsize "$xminval $yminval $xmaxval $ymaxval" - $name configure -scrollregion $newsize - set pdtk_canvas_mouseup_name $name - set pdtk_canvas_mouseup_xminval $xminval - set pdtk_canvas_mouseup_xmaxval $xmaxval - set pdtk_canvas_mouseup_yminval $yminval - set pdtk_canvas_mouseup_ymaxval $ymaxval - } - - } - pdtk_canvas_checkgeometry [canvastosym $name] -} - -proc pdtk_canvas_key {name key iso shift} { -# puts stderr [concat down key= $key iso= $iso] -# .controls.switches.meterbutton configure -text $key -# HACK for MAC OSX -- backspace seems different; I don't understand why. -# invesigate this LATER... - global pd_nt - if {$pd_nt == 2} { - if {$key == "BackSpace"} { - set key 8 - set keynum 8 - } - if {$key == "Delete"} { - set key 8 - set keynum 8 - } - } - if {$key == "KP_Delete"} { - set key 127 - set keynum 127 - } - if {$iso != ""} { - scan $iso %c keynum - pd [canvastosym $name] key 1 $keynum $shift\; - } else { - pd [canvastosym $name] key 1 $key $shift\; - } -} - -proc pdtk_canvas_keyup {name key iso} { -# puts stderr [concat up key= $key iso= $iso] - if {$iso != ""} { - scan $iso %c keynum - pd [canvastosym $name] key 0 $keynum 0 \; - } else { - pd [canvastosym $name] key 0 $key 0 \; - } -} - -proc pdtk_canvas_ctrlkey {name key shift} { -# first get rid of ".c" suffix; we'll refer to the toplevel instead - set topname [string trimright $name .c] -# puts stderr [concat ctrl-key $key $topname] - - if {$key == "1"} {menu_object $topname 1} - if {$key == "2"} {menu_message $topname 1} - if {$key == "3"} {menu_floatatom $topname 1} - if {$key == "4"} {menu_symbolatom $topname 1} - if {$key == "5"} {menu_comment $topname 1} - if {$key == "slash"} {menu_audio 1} - if {$key == "period"} {menu_audio 0} - if {$shift == 1} { - if {$key == "q" || $key == "Q"} {menu_really_quit} - if {$key == "w" || $key == "W"} {menu_really_close $topname} - if {$key == "s" || $key == "S"} {menu_saveas $topname} - if {$key == "z" || $key == "Z"} {menu_redo $topname} - if {$key == "b" || $key == "B"} {menu_bng $topname 1} - if {$key == "t" || $key == "T"} {menu_toggle $topname 1} - if {$key == "n" || $key == "N"} {menu_numbox $topname 1} - if {$key == "v" || $key == "V"} {menu_vslider $topname 1} - if {$key == "h" || $key == "H"} {menu_hslider $topname 1} - if {$key == "i" || $key == "I"} {menu_hradio $topname 1} - if {$key == "d" || $key == "D"} {menu_vradio $topname 1} - if {$key == "u" || $key == "U"} {menu_vumeter $topname 1} - if {$key == "c" || $key == "C"} {menu_mycnv $topname 1} - } else { - if {$key == "e" || $key == "E"} {menu_editmode $topname} - if {$key == "q" || $key == "Q"} {menu_quit} - if {$key == "s" || $key == "S"} {menu_save $topname} - if {$key == "z" || $key == "Z"} {menu_undo $topname} - if {$key == "n" || $key == "N"} {menu_new} - if {$key == "o" || $key == "O"} {menu_open} - if {$key == "m" || $key == "M"} {menu_send} - if {$key == "w" || $key == "W"} {menu_close $topname} - if {$key == "p" || $key == "P"} {menu_print $topname} - if {$key == "x" || $key == "X"} {menu_cut $topname} - if {$key == "c" || $key == "C"} {menu_copy $topname} - if {$key == "v" || $key == "V"} {menu_paste $topname} - if {$key == "d" || $key == "D"} {menu_duplicate $topname} - if {$key == "a" || $key == "A"} {menu_selectall $topname} - if {$key == "t" || $key == "T"} {menu_texteditor $topname} - if {$key == "f" || $key == "F"} {menu_findobject $topname} - if {$key == "g" || $key == "G"} {menu_findagain $topname} - } -} - -proc pdtk_canvas_scroll {canvas xy distance} { - $canvas [list $xy]view scroll $distance units -} - -proc pdtk_canvas_motion {name x y mods} { -# puts stderr [concat [canvastosym $name] $name $x $y] - pd [canvastosym $name] motion [$name canvasx $x] [$name canvasy $y] $mods \; -} - -# "map" event tells us when the canvas becomes visible (arg is "0") or -# invisible (arg is ""). Invisibility means the Window Manager has minimized -# us. We don't get a final "unmap" event when we destroy the window. -proc pdtk_canvas_map {name} { -# puts stderr [concat map $name] - pd [canvastosym $name] map 1 \; -} - -proc pdtk_canvas_unmap {name} { -# puts stderr [concat unmap $name] - pd [canvastosym $name] map 0 \; -} - -proc pdtk_canvas_makeobjs {name files x y} { - set c 0 - for {set n 0} {$n < [llength $files]} {incr n} { - if {[regexp {.*/(.+).pd$} [lindex $files $n] file obj] == 1} { - pd $name obj $x [expr $y + ($c * 30)] [pdtk_enquote $obj] \; - incr c - } - } -} - -set saveas_dir nowhere - -############ pdtk_canvas_saveas -- run a saveas dialog ############## - -proc pdtk_canvas_saveas {name initfile initdir} { - global pd_nt - set filename [tk_getSaveFile -initialfile $initfile \ - -initialdir $initdir -defaultextension .pd \ - -filetypes { {{pd files} {.pd}} {{max files} {.pat}} }] - - if {$filename != ""} { -# yes, we need the extent even if we're on a mac. - if {$pd_nt == 2} { - if {[string last .pd $filename] < 0 && \ - [string last .PD $filename] < 0 && \ - [string last .pat $filename] < 0 && \ - [string last .PAT $filename] < 0} { - set filename $filename.pd - if {[file exists $filename]} { - set answer [tk_messageBox \ - \-message [concat overwrite $filename "?"] \ - \-type yesno \-icon question] - if {! [string compare $answer no]} {return} - } - } - } - - set directory [string range $filename 0 \ - [expr [string last / $filename ] - 1]] - set basename [string range $filename \ - [expr [string last / $filename ] + 1] end] - pd [concat $name savetofile [pdtk_enquote $basename] \ - [pdtk_enquote $directory] \;] -# pd [concat $name savetofile $basename $directory \;] - } -} - -############ pdtk_canvas_dofont -- run a font and resize dialog ######### - -set fontsize 0 -set stretchval 0 -set whichstretch 0 - -proc dofont_apply {name} { - global fontsize - global stretchval - global whichstretch - set cmd [concat $name font $fontsize $stretchval $whichstretch \;] -# puts stderr $cmd - pd $cmd -} - -proc dofont_cancel {name} { - set cmd [concat $name cancel \;] -# puts stderr $cmd - pd $cmd -} - -proc pdtk_canvas_dofont {name initsize} { - - global fontsize - set fontsize $initsize - - global stretchval - set stretchval 100 - - global whichstretch - set whichstretch 1 - - toplevel $name - wm title $name {FONT BOMB} - wm protocol $name WM_DELETE_WINDOW [concat dofont_cancel $name] - - frame $name.buttonframe - pack $name.buttonframe -side bottom -fill x -pady 2m - button $name.buttonframe.cancel -text {Cancel}\ - -command "dofont_cancel $name" - button $name.buttonframe.ok -text {Do it}\ - -command "dofont_apply $name" - pack $name.buttonframe.cancel -side left -expand 1 - pack $name.buttonframe.ok -side left -expand 1 - - frame $name.radiof - pack $name.radiof -side left - - label $name.radiof.label -text {Font Size:} - pack $name.radiof.label -side top - - radiobutton $name.radiof.radio8 -value 8 -variable fontsize -text "8" - radiobutton $name.radiof.radio10 -value 10 -variable fontsize -text "10" - radiobutton $name.radiof.radio12 -value 12 -variable fontsize -text "12" - radiobutton $name.radiof.radio16 -value 16 -variable fontsize -text "16" - radiobutton $name.radiof.radio24 -value 24 -variable fontsize -text "24" - radiobutton $name.radiof.radio36 -value 36 -variable fontsize -text "36" - pack $name.radiof.radio8 -side top -anchor w - pack $name.radiof.radio10 -side top -anchor w - pack $name.radiof.radio12 -side top -anchor w - pack $name.radiof.radio16 -side top -anchor w - pack $name.radiof.radio24 -side top -anchor w - pack $name.radiof.radio36 -side top -anchor w - - frame $name.stretchf - pack $name.stretchf -side left - - label $name.stretchf.label -text {Stretch:} - pack $name.stretchf.label -side top - - entry $name.stretchf.entry -textvariable stretchval -width 5 - pack $name.stretchf.entry -side left - - radiobutton $name.stretchf.radio1 \ - -value 1 -variable whichstretch -text "X and Y" - radiobutton $name.stretchf.radio2 \ - -value 2 -variable whichstretch -text "X only" - radiobutton $name.stretchf.radio3 \ - -value 3 -variable whichstretch -text "Y only" - - pack $name.stretchf.radio1 -side top -anchor w - pack $name.stretchf.radio2 -side top -anchor w - pack $name.stretchf.radio3 -side top -anchor w - -} - -############ pdtk_gatom_dialog -- run a gatom dialog ######### - -# dialogs like this one can come up in many copies; but in TK the easiest -# way to get data from an "entry", etc., is to set an associated variable -# name. This is especially true for grouped "radio buttons". So we have -# to synthesize variable names for each instance of the dialog. The dialog -# gets a TK pathname $id, from which it strips the leading "." to make a -# variable suffix $vid. Then you can get the actual value out by asking for -# [eval concat $$variablename]. There should be an easier way but I don't see -# it yet. - -proc gatom_escape {sym} { - if {[string length $sym] == 0} { - set ret "-" -# puts stderr [concat escape1 $sym $ret] - } else { - if {[string equal -length 1 $sym "-"]} { - set ret [string replace $sym 0 0 "--"] -# puts stderr [concat escape $sym $ret] - } else { - set ret [string map {"$" "#"} $sym] -# puts stderr [concat unescape $sym $ret] - } - } - pdtk_unspace $ret -} - -proc gatom_unescape {sym} { - if {[string equal -length 1 $sym "-"]} { - set ret [string replace $sym 0 0 ""] -# puts stderr [concat unescape $sym $ret] - } else { - set ret [string map {"#" "$"} $sym] -# puts stderr [concat unescape $sym $ret] - } - concat $ret -} - -proc dogatom_apply {id} { - set vid [string trimleft $id .] - - set var_gatomwidth [concat gatomwidth_$vid] - global $var_gatomwidth - set var_gatomlo [concat gatomlo_$vid] - global $var_gatomlo - set var_gatomhi [concat gatomhi_$vid] - global $var_gatomhi - set var_gatomwherelabel [concat gatomwherelabel_$vid] - global $var_gatomwherelabel - set var_gatomlabel [concat gatomlabel_$vid] - global $var_gatomlabel - set var_gatomsymfrom [concat gatomsymfrom_$vid] - global $var_gatomsymfrom - set var_gatomsymto [concat gatomsymto_$vid] - global $var_gatomsymto - -# set cmd [concat $id param $gatomwidth $gatomlo $gatomhi \;] - - set cmd [concat $id param \ - [eval concat $$var_gatomwidth] \ - [eval concat $$var_gatomlo] \ - [eval concat $$var_gatomhi] \ - [eval gatom_escape $$var_gatomlabel] \ - [eval concat $$var_gatomwherelabel] \ - [eval gatom_escape $$var_gatomsymfrom] \ - [eval gatom_escape $$var_gatomsymto] \ - \;] - -# puts stderr $cmd - pd $cmd -} - -proc dogatom_cancel {name} { - set cmd [concat $name cancel \;] -# puts stderr $cmd - pd $cmd -} - -proc dogatom_ok {name} { - dogatom_apply $name - dogatom_cancel $name -} - -proc pdtk_gatom_dialog {id initwidth initlo inithi \ - wherelabel label symfrom symto} { - - set vid [string trimleft $id .] - - global pd_nt - - set var_gatomwidth [concat gatomwidth_$vid] - global $var_gatomwidth - set var_gatomlo [concat gatomlo_$vid] - global $var_gatomlo - set var_gatomhi [concat gatomhi_$vid] - global $var_gatomhi - set var_gatomwherelabel [concat gatomwherelabel_$vid] - global $var_gatomwherelabel - set var_gatomlabel [concat gatomlabel_$vid] - global $var_gatomlabel - set var_gatomsymfrom [concat gatomsymfrom_$vid] - global $var_gatomsymfrom - set var_gatomsymto [concat gatomsymto_$vid] - global $var_gatomsymto - - set $var_gatomwidth $initwidth - set $var_gatomlo $initlo - set $var_gatomhi $inithi - set $var_gatomwherelabel $wherelabel - set $var_gatomlabel [gatom_unescape $label] - set $var_gatomsymfrom [gatom_unescape $symfrom] - set $var_gatomsymto [gatom_unescape $symto] - - toplevel $id - wm title $id "atom box properties" - wm resizable $id 0 0 - wm protocol $id WM_DELETE_WINDOW [concat dogatom_cancel $id] - - frame $id.params -height 7 - pack $id.params -side top - label $id.params.entryname -text "width" - entry $id.params.entry -textvariable $var_gatomwidth -width 4 - pack $id.params.entryname $id.params.entry -side left - - labelframe $id.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ - -font highlight_font - pack $id.limits -side top -fill x - frame $id.limits.lower - pack $id.limits.lower -side left - label $id.limits.lower.entryname -text "lower" - entry $id.limits.lower.entry -textvariable $var_gatomlo -width 8 - pack $id.limits.lower.entryname $id.limits.lower.entry -side left - frame $id.limits.upper - pack $id.limits.upper -side left - frame $id.limits.upper.spacer -width 20 - label $id.limits.upper.entryname -text "upper" - entry $id.limits.upper.entry -textvariable $var_gatomhi -width 8 - pack $id.limits.upper.spacer $id.limits.upper.entryname \ - $id.limits.upper.entry -side left - - frame $id.spacer1 -height 7 - pack $id.spacer1 -side top - - labelframe $id.label -text "label" -padx 5 -pady 4 -borderwidth 1 \ - -font highlight_font - pack $id.label -side top -fill x - frame $id.label.name - pack $id.label.name -side top - entry $id.label.name.entry -textvariable $var_gatomlabel -width 33 - pack $id.label.name.entry -side left - frame $id.label.radio - pack $id.label.radio -side top - radiobutton $id.label.radio.left -value 0 \ - -variable $var_gatomwherelabel \ - -text "left " -justify left - radiobutton $id.label.radio.right -value 1 \ - -variable $var_gatomwherelabel \ - -text "right" -justify left - radiobutton $id.label.radio.top -value 2 \ - -variable $var_gatomwherelabel \ - -text "top" -justify left - radiobutton $id.label.radio.bottom -value 3 \ - -variable $var_gatomwherelabel \ - -text "bottom" -justify left - pack $id.label.radio.left -side left -anchor w - pack $id.label.radio.right -side right -anchor w - pack $id.label.radio.top -side top -anchor w - pack $id.label.radio.bottom -side bottom -anchor w - - frame $id.spacer2 -height 7 - pack $id.spacer2 -side top - - labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ - -font highlight_font - pack $id.s_r -side top -fill x - frame $id.s_r.paramsymto - pack $id.s_r.paramsymto -side top -anchor e - label $id.s_r.paramsymto.entryname -text "send symbol" - entry $id.s_r.paramsymto.entry -textvariable $var_gatomsymto -width 21 - pack $id.s_r.paramsymto.entry $id.s_r.paramsymto.entryname -side right - - frame $id.s_r.paramsymfrom - pack $id.s_r.paramsymfrom -side top -anchor e - label $id.s_r.paramsymfrom.entryname -text "receive symbol" - entry $id.s_r.paramsymfrom.entry -textvariable $var_gatomsymfrom -width 21 - pack $id.s_r.paramsymfrom.entry $id.s_r.paramsymfrom.entryname -side right - - frame $id.buttonframe -pady 5 - pack $id.buttonframe -side top -fill x -pady 2m - button $id.buttonframe.cancel -text {Cancel}\ - -command "dogatom_cancel $id" - pack $id.buttonframe.cancel -side left -expand 1 - button $id.buttonframe.apply -text {Apply}\ - -command "dogatom_apply $id" - pack $id.buttonframe.apply -side left -expand 1 - button $id.buttonframe.ok -text {OK}\ - -command "dogatom_ok $id" - pack $id.buttonframe.ok -side left -expand 1 - - bind $id.limits.upper.entry <KeyPress-Return> [concat dogatom_ok $id] - bind $id.limits.lower.entry <KeyPress-Return> [concat dogatom_ok $id] - bind $id.params.entry <KeyPress-Return> [concat dogatom_ok $id] - pdtk_standardkeybindings $id.limits.upper.entry - pdtk_standardkeybindings $id.limits.lower.entry - pdtk_standardkeybindings $id.params.entry - $id.params.entry select from 0 - $id.params.entry select adjust end - focus $id.params.entry -} - -############ pdtk_canvas_popup -- popup menu for canvas ######### - -set popup_xpix 0 -set popup_ypix 0 - -proc popup_action {name action} { - global popup_xpix popup_ypix - set cmd [concat $name done-popup $action $popup_xpix $popup_ypix \;] -# puts stderr $cmd - pd $cmd -} - -proc pdtk_canvas_popup {name xpix ypix canprop canopen} { - global popup_xpix popup_ypix - set popup_xpix $xpix - set popup_ypix $ypix - if {$canprop == 0} {$name.popup entryconfigure 0 -state disabled} - if {$canprop == 1} {$name.popup entryconfigure 0 -state active} - if {$canopen == 0} {$name.popup entryconfigure 1 -state disabled} - if {$canopen == 1} {$name.popup entryconfigure 1 -state active} - tk_popup $name.popup [expr $xpix + [winfo rootx $name.c]] \ - [expr $ypix + [winfo rooty $name.c]] 0 -} - - -# begin of change "iemlib" -############ pdtk_iemgui_dialog -- dialog window for iem guis ######### - -set iemgui_define_min_flashhold 50 -set iemgui_define_min_flashbreak 10 -set iemgui_define_min_fontsize 4 - -proc iemgui_clip_dim {id} { - set vid [string trimleft $id .] - - set var_iemgui_wdt [concat iemgui_wdt_$vid] - global $var_iemgui_wdt - set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] - global $var_iemgui_min_wdt - set var_iemgui_hgt [concat iemgui_hgt_$vid] - global $var_iemgui_hgt - set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] - global $var_iemgui_min_hgt - - if {[eval concat $$var_iemgui_wdt] < [eval concat $$var_iemgui_min_wdt]} { - set $var_iemgui_wdt [eval concat $$var_iemgui_min_wdt] - $id.dim.w_ent configure -textvariable $var_iemgui_wdt - } - if {[eval concat $$var_iemgui_hgt] < [eval concat $$var_iemgui_min_hgt]} { - set $var_iemgui_hgt [eval concat $$var_iemgui_min_hgt] - $id.dim.h_ent configure -textvariable $var_iemgui_hgt - } -} - -proc iemgui_clip_num {id} { - set vid [string trimleft $id .] - - set var_iemgui_num [concat iemgui_num_$vid] - global $var_iemgui_num - - if {[eval concat $$var_iemgui_num] > 2000} { - set $var_iemgui_num 2000 - $id.para.num_ent configure -textvariable $var_iemgui_num - } - if {[eval concat $$var_iemgui_num] < 1} { - set $var_iemgui_num 1 - $id.para.num_ent configure -textvariable $var_iemgui_num - } -} - -proc iemgui_sched_rng {id} { - set vid [string trimleft $id .] - - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_rng_sch [concat iemgui_rng_sch_$vid] - global $var_iemgui_rng_sch - - global iemgui_define_min_flashhold - global iemgui_define_min_flashbreak - - if {[eval concat $$var_iemgui_rng_sch] == 2} { - if {[eval concat $$var_iemgui_max_rng] < [eval concat $$var_iemgui_min_rng]} { - set hhh [eval concat $$var_iemgui_min_rng] - set $var_iemgui_min_rng [eval concat $$var_iemgui_max_rng] - set $var_iemgui_max_rng $hhh - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng } - if {[eval concat $$var_iemgui_max_rng] < $iemgui_define_min_flashhold} { - set $var_iemgui_max_rng $iemgui_define_min_flashhold - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - } - if {[eval concat $$var_iemgui_min_rng] < $iemgui_define_min_flashbreak} { - set $var_iemgui_min_rng $iemgui_define_min_flashbreak - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng - } - } - if {[eval concat $$var_iemgui_rng_sch] == 1} { - if {[eval concat $$var_iemgui_min_rng] == 0.0} { - set $var_iemgui_min_rng 1.0 - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng - } - } -} - -proc iemgui_verify_rng {id} { - set vid [string trimleft $id .] - - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - - if {[eval concat $$var_iemgui_lin0_log1] == 1} { - if {[eval concat $$var_iemgui_max_rng] == 0.0 && [eval concat $$var_iemgui_min_rng] == 0.0} { - set $var_iemgui_max_rng 1.0 - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - } - if {[eval concat $$var_iemgui_max_rng] > 0} { - if {[eval concat $$var_iemgui_min_rng] <= 0} { - set $var_iemgui_min_rng [expr [eval concat $$var_iemgui_max_rng] * 0.01] - $id.rng.min_ent configure -textvariable $var_iemgui_min_rng - } - } else { - if {[eval concat $$var_iemgui_min_rng] > 0} { - set $var_iemgui_max_rng [expr [eval concat $$var_iemgui_min_rng] * 0.01] - $id.rng.max_ent configure -textvariable $var_iemgui_max_rng - } - } - } -} - -proc iemgui_clip_fontsize {id} { - set vid [string trimleft $id .] - - set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] - global $var_iemgui_gn_fs - - global iemgui_define_min_fontsize - - if {[eval concat $$var_iemgui_gn_fs] < $iemgui_define_min_fontsize} { - set $var_iemgui_gn_fs $iemgui_define_min_fontsize - $id.label.fs_ent configure -textvariable $var_iemgui_gn_fs - } -} - -proc iemgui_set_col_example {id} { - set vid [string trimleft $id .] - - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - $id.colors.sections.lb_bk configure \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] - - if { [eval concat $$var_iemgui_fcol] >= 0 } { - $id.colors.sections.fr_bk configure \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] - } else { - $id.colors.sections.fr_bk configure \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]]} -} - -proc iemgui_preset_col {id presetcol} { - set vid [string trimleft $id .] - - set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] - global $var_iemgui_l2_f1_b0 - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - if { [eval concat $$var_iemgui_l2_f1_b0] == 0 } { set $var_iemgui_bcol $presetcol } - if { [eval concat $$var_iemgui_l2_f1_b0] == 1 } { set $var_iemgui_fcol $presetcol } - if { [eval concat $$var_iemgui_l2_f1_b0] == 2 } { set $var_iemgui_lcol $presetcol } - iemgui_set_col_example $id -} - -proc iemgui_choose_col_bkfrlb {id} { - set vid [string trimleft $id .] - - set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] - global $var_iemgui_l2_f1_b0 - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - if {[eval concat $$var_iemgui_l2_f1_b0] == 0} { - set $var_iemgui_bcol [expr [eval concat $$var_iemgui_bcol] & 0xFCFCFC] - set helpstring [tk_chooseColor -title "Background-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_bcol]]] - if { $helpstring != "" } { - set $var_iemgui_bcol [string replace $helpstring 0 0 "0x"] - set $var_iemgui_bcol [expr [eval concat $$var_iemgui_bcol] & 0xFCFCFC] } - } - if {[eval concat $$var_iemgui_l2_f1_b0] == 1} { - set $var_iemgui_fcol [expr [eval concat $$var_iemgui_fcol] & 0xFCFCFC] - set helpstring [tk_chooseColor -title "Front-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_fcol]]] - if { $helpstring != "" } { - set $var_iemgui_fcol [string replace $helpstring 0 0 "0x"] - set $var_iemgui_fcol [expr [eval concat $$var_iemgui_fcol] & 0xFCFCFC] } - } - if {[eval concat $$var_iemgui_l2_f1_b0] == 2} { - set $var_iemgui_lcol [expr [eval concat $$var_iemgui_lcol] & 0xFCFCFC] - set helpstring [tk_chooseColor -title "Label-Color" -initialcolor [format "#%6.6x" [eval concat $$var_iemgui_lcol]]] - if { $helpstring != "" } { - set $var_iemgui_lcol [string replace $helpstring 0 0 "0x"] - set $var_iemgui_lcol [expr [eval concat $$var_iemgui_lcol] & 0xFCFCFC] } - } - iemgui_set_col_example $id -} - -proc iemgui_lilo {id} { - set vid [string trimleft $id .] - - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] - global $var_iemgui_lilo0 - set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] - global $var_iemgui_lilo1 - - iemgui_sched_rng $id - - if {[eval concat $$var_iemgui_lin0_log1] == 0} { - set $var_iemgui_lin0_log1 1 - $id.para.lilo configure -text [eval concat $$var_iemgui_lilo1] - iemgui_verify_rng $id - iemgui_sched_rng $id - } else { - set $var_iemgui_lin0_log1 0 - $id.para.lilo configure -text [eval concat $$var_iemgui_lilo0] - } -} - -proc iemgui_toggle_font {id gn_f} { - set vid [string trimleft $id .] - - set var_iemgui_gn_f [concat iemgui_gn_f_$vid] - global $var_iemgui_gn_f - global fontname fontweight - - set $var_iemgui_gn_f $gn_f - - switch -- $gn_f { - 0 { set current_font $fontname} - 1 { set current_font "Helvetica" } - 2 { set current_font "Times" } - } - set current_font_spec "{$current_font} 12 $fontweight" - - $id.label.fontpopup_label configure -text $current_font \ - -font $current_font_spec - $id.label.name_entry configure -font $current_font_spec - $id.colors.sections.fr_bk configure -font $current_font_spec - $id.colors.sections.lb_bk configure -font $current_font_spec -} - -proc iemgui_lb {id} { - set vid [string trimleft $id .] - - set var_iemgui_loadbang [concat iemgui_loadbang_$vid] - global $var_iemgui_loadbang - - if {[eval concat $$var_iemgui_loadbang] == 0} { - set $var_iemgui_loadbang 1 - $id.para.lb configure -text "init" - } else { - set $var_iemgui_loadbang 0 - $id.para.lb configure -text "no init" - } -} - -proc iemgui_stdy_jmp {id} { - set vid [string trimleft $id .] - - set var_iemgui_steady [concat iemgui_steady_$vid] - global $var_iemgui_steady - - if {[eval concat $$var_iemgui_steady]} { - set $var_iemgui_steady 0 - $id.para.stdy_jmp configure -text "jump on click" - } else { - set $var_iemgui_steady 1 - $id.para.stdy_jmp configure -text "steady on click" - } -} - -proc iemgui_apply {id} { - set vid [string trimleft $id .] - - set var_iemgui_wdt [concat iemgui_wdt_$vid] - global $var_iemgui_wdt - set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] - global $var_iemgui_min_wdt - set var_iemgui_hgt [concat iemgui_hgt_$vid] - global $var_iemgui_hgt - set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] - global $var_iemgui_min_hgt - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] - global $var_iemgui_lilo0 - set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] - global $var_iemgui_lilo1 - set var_iemgui_loadbang [concat iemgui_loadbang_$vid] - global $var_iemgui_loadbang - set var_iemgui_num [concat iemgui_num_$vid] - global $var_iemgui_num - set var_iemgui_steady [concat iemgui_steady_$vid] - global $var_iemgui_steady - set var_iemgui_snd [concat iemgui_snd_$vid] - global $var_iemgui_snd - set var_iemgui_rcv [concat iemgui_rcv_$vid] - global $var_iemgui_rcv - set var_iemgui_gui_nam [concat iemgui_gui_nam_$vid] - global $var_iemgui_gui_nam - set var_iemgui_gn_dx [concat iemgui_gn_dx_$vid] - global $var_iemgui_gn_dx - set var_iemgui_gn_dy [concat iemgui_gn_dy_$vid] - global $var_iemgui_gn_dy - set var_iemgui_gn_f [concat iemgui_gn_f_$vid] - global $var_iemgui_gn_f - set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] - global $var_iemgui_gn_fs - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - iemgui_clip_dim $id - iemgui_clip_num $id - iemgui_sched_rng $id - iemgui_verify_rng $id - iemgui_sched_rng $id - iemgui_clip_fontsize $id - - if {[eval concat $$var_iemgui_snd] == ""} {set hhhsnd "empty"} else {set hhhsnd [eval concat $$var_iemgui_snd]} - if {[eval concat $$var_iemgui_rcv] == ""} {set hhhrcv "empty"} else {set hhhrcv [eval concat $$var_iemgui_rcv]} - if {[eval concat $$var_iemgui_gui_nam] == ""} {set hhhgui_nam "empty" - } else { - set hhhgui_nam [eval concat $$var_iemgui_gui_nam]} - - if {[string index $hhhsnd 0] == "$"} { - set hhhsnd [string replace $hhhsnd 0 0 #] } - if {[string index $hhhrcv 0] == "$"} { - set hhhrcv [string replace $hhhrcv 0 0 #] } - if {[string index $hhhgui_nam 0] == "$"} { - set hhhgui_nam [string replace $hhhgui_nam 0 0 #] } - - set hhhsnd [pdtk_unspace $hhhsnd] - set hhhrcv [pdtk_unspace $hhhrcv] - set hhhgui_nam [pdtk_unspace $hhhgui_nam] - - pd [concat $id dialog \ - [eval concat $$var_iemgui_wdt] \ - [eval concat $$var_iemgui_hgt] \ - [eval concat $$var_iemgui_min_rng] \ - [eval concat $$var_iemgui_max_rng] \ - [eval concat $$var_iemgui_lin0_log1] \ - [eval concat $$var_iemgui_loadbang] \ - [eval concat $$var_iemgui_num] \ - $hhhsnd \ - $hhhrcv \ - $hhhgui_nam \ - [eval concat $$var_iemgui_gn_dx] \ - [eval concat $$var_iemgui_gn_dy] \ - [eval concat $$var_iemgui_gn_f] \ - [eval concat $$var_iemgui_gn_fs] \ - [eval concat $$var_iemgui_bcol] \ - [eval concat $$var_iemgui_fcol] \ - [eval concat $$var_iemgui_lcol] \ - [eval concat $$var_iemgui_steady] \ - \;] -} - -proc iemgui_cancel {id} {pd [concat $id cancel \;]} - -proc iemgui_ok {id} { - iemgui_apply $id - iemgui_cancel $id -} - -proc pdtk_iemgui_dialog {id mainheader \ - dim_header wdt min_wdt wdt_label hgt min_hgt hgt_label \ - rng_header min_rng min_rng_label max_rng max_rng_label rng_sched \ - lin0_log1 lilo0_label lilo1_label loadbang steady num_label num \ - snd rcv \ - gui_name \ - gn_dx gn_dy \ - gn_f gn_fs \ - bcol fcol lcol} { - - set vid [string trimleft $id .] - - global pd_nt - global fontname fontweight - - set var_iemgui_wdt [concat iemgui_wdt_$vid] - global $var_iemgui_wdt - set var_iemgui_min_wdt [concat iemgui_min_wdt_$vid] - global $var_iemgui_min_wdt - set var_iemgui_hgt [concat iemgui_hgt_$vid] - global $var_iemgui_hgt - set var_iemgui_min_hgt [concat iemgui_min_hgt_$vid] - global $var_iemgui_min_hgt - set var_iemgui_min_rng [concat iemgui_min_rng_$vid] - global $var_iemgui_min_rng - set var_iemgui_max_rng [concat iemgui_max_rng_$vid] - global $var_iemgui_max_rng - set var_iemgui_rng_sch [concat iemgui_rng_sch_$vid] - global $var_iemgui_rng_sch - set var_iemgui_lin0_log1 [concat iemgui_lin0_log1_$vid] - global $var_iemgui_lin0_log1 - set var_iemgui_lilo0 [concat iemgui_lilo0_$vid] - global $var_iemgui_lilo0 - set var_iemgui_lilo1 [concat iemgui_lilo1_$vid] - global $var_iemgui_lilo1 - set var_iemgui_loadbang [concat iemgui_loadbang_$vid] - global $var_iemgui_loadbang - set var_iemgui_num [concat iemgui_num_$vid] - global $var_iemgui_num - set var_iemgui_steady [concat iemgui_steady_$vid] - global $var_iemgui_steady - set var_iemgui_snd [concat iemgui_snd_$vid] - global $var_iemgui_snd - set var_iemgui_rcv [concat iemgui_rcv_$vid] - global $var_iemgui_rcv - set var_iemgui_gui_nam [concat iemgui_gui_nam_$vid] - global $var_iemgui_gui_nam - set var_iemgui_gn_dx [concat iemgui_gn_dx_$vid] - global $var_iemgui_gn_dx - set var_iemgui_gn_dy [concat iemgui_gn_dy_$vid] - global $var_iemgui_gn_dy - set var_iemgui_gn_f [concat iemgui_gn_f_$vid] - global $var_iemgui_gn_f - set var_iemgui_gn_fs [concat iemgui_gn_fs_$vid] - global $var_iemgui_gn_fs - set var_iemgui_l2_f1_b0 [concat iemgui_l2_f1_b0_$vid] - global $var_iemgui_l2_f1_b0 - set var_iemgui_bcol [concat iemgui_bcol_$vid] - global $var_iemgui_bcol - set var_iemgui_fcol [concat iemgui_fcol_$vid] - global $var_iemgui_fcol - set var_iemgui_lcol [concat iemgui_lcol_$vid] - global $var_iemgui_lcol - - set $var_iemgui_wdt $wdt - set $var_iemgui_min_wdt $min_wdt - set $var_iemgui_hgt $hgt - set $var_iemgui_min_hgt $min_hgt - set $var_iemgui_min_rng $min_rng - set $var_iemgui_max_rng $max_rng - set $var_iemgui_rng_sch $rng_sched - set $var_iemgui_lin0_log1 $lin0_log1 - set $var_iemgui_lilo0 $lilo0_label - set $var_iemgui_lilo1 $lilo1_label - set $var_iemgui_loadbang $loadbang - set $var_iemgui_num $num - set $var_iemgui_steady $steady - if {$snd == "empty"} {set $var_iemgui_snd [format ""] - } else {set $var_iemgui_snd [format "%s" $snd]} - if {$rcv == "empty"} {set $var_iemgui_rcv [format ""] - } else {set $var_iemgui_rcv [format "%s" $rcv]} - if {$gui_name == "empty"} {set $var_iemgui_gui_nam [format ""] - } else {set $var_iemgui_gui_nam [format "%s" $gui_name]} - - if {[string index [eval concat $$var_iemgui_snd] 0] == "#"} { - set $var_iemgui_snd [string replace [eval concat $$var_iemgui_snd] 0 0 $] } - if {[string index [eval concat $$var_iemgui_rcv] 0] == "#"} { - set $var_iemgui_rcv [string replace [eval concat $$var_iemgui_rcv] 0 0 $] } - if {[string index [eval concat $$var_iemgui_gui_nam] 0] == "#"} { - set $var_iemgui_gui_nam [string replace [eval concat $$var_iemgui_gui_nam] 0 0 $] } - set $var_iemgui_gn_dx $gn_dx - set $var_iemgui_gn_dy $gn_dy - set $var_iemgui_gn_f $gn_f - set $var_iemgui_gn_fs $gn_fs - - set $var_iemgui_bcol $bcol - set $var_iemgui_fcol $fcol - set $var_iemgui_lcol $lcol - - set $var_iemgui_l2_f1_b0 0 - - toplevel $id - wm title $id [format "%s Properties" $mainheader] - wm resizable $id 0 0 - wm protocol $id WM_DELETE_WINDOW [concat iemgui_cancel $id] - - frame $id.dim - pack $id.dim -side top - label $id.dim.head -text $dim_header - label $id.dim.w_lab -text $wdt_label -width 6 - entry $id.dim.w_ent -textvariable $var_iemgui_wdt -width 5 - label $id.dim.dummy1 -text " " -width 10 - label $id.dim.h_lab -text $hgt_label -width 6 - entry $id.dim.h_ent -textvariable $var_iemgui_hgt -width 5 - pack $id.dim.head -side top - pack $id.dim.w_lab $id.dim.w_ent $id.dim.dummy1 -side left - if { $hgt_label != "empty" } { - pack $id.dim.h_lab $id.dim.h_ent -side left} - - frame $id.rng - pack $id.rng -side top - label $id.rng.head -text $rng_header - label $id.rng.min_lab -text $min_rng_label -width 6 - entry $id.rng.min_ent -textvariable $var_iemgui_min_rng -width 9 - label $id.rng.dummy1 -text " " -width 1 - label $id.rng.max_lab -text $max_rng_label -width 8 - entry $id.rng.max_ent -textvariable $var_iemgui_max_rng -width 9 - if { $rng_header != "empty" } { - pack $id.rng.head -side top - if { $min_rng_label != "empty" } { - pack $id.rng.min_lab $id.rng.min_ent -side left} - if { $max_rng_label != "empty" } { - pack $id.rng.dummy1 \ - $id.rng.max_lab $id.rng.max_ent -side left} } - - if { [eval concat $$var_iemgui_lin0_log1] >= 0 || [eval concat $$var_iemgui_loadbang] >= 0 || [eval concat $$var_iemgui_num] > 0 || [eval concat $$var_iemgui_steady] >= 0 } { - label $id.space1 -text "" - pack $id.space1 -side top } - - frame $id.para - pack $id.para -side top - label $id.para.dummy2 -text "" -width 1 - label $id.para.dummy3 -text "" -width 1 - if {[eval concat $$var_iemgui_lin0_log1] == 0} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo0] -width 5 -command "iemgui_lilo $id" } - if {[eval concat $$var_iemgui_lin0_log1] == 1} { - button $id.para.lilo -text [eval concat $$var_iemgui_lilo1] -width 5 -command "iemgui_lilo $id" } - if {[eval concat $$var_iemgui_loadbang] == 0} { - button $id.para.lb -text "no init" -width 5 -command "iemgui_lb $id" } - if {[eval concat $$var_iemgui_loadbang] == 1} { - button $id.para.lb -text "init" -width 5 -command "iemgui_lb $id" } - label $id.para.num_lab -text $num_label -width 9 - entry $id.para.num_ent -textvariable $var_iemgui_num -width 4 - if {[eval concat $$var_iemgui_steady] == 0} { - button $id.para.stdy_jmp -text "jump on click" -width 11 -command "iemgui_stdy_jmp $id" } - if {[eval concat $$var_iemgui_steady] == 1} { - button $id.para.stdy_jmp -text "steady on click" -width 11 -command "iemgui_stdy_jmp $id" } - if {[eval concat $$var_iemgui_lin0_log1] >= 0} { - pack $id.para.lilo -side left -expand 1} - if {[eval concat $$var_iemgui_loadbang] >= 0} { - pack $id.para.dummy2 $id.para.lb -side left -expand 1} - if {[eval concat $$var_iemgui_num] > 0} { - pack $id.para.dummy3 $id.para.num_lab $id.para.num_ent -side left -expand 1} - if {[eval concat $$var_iemgui_steady] >= 0} { - pack $id.para.dummy3 $id.para.stdy_jmp -side left -expand 1} - - frame $id.spacer0 -height 4 - pack $id.spacer0 -side top - - labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \ - -font highlight_font - pack $id.s_r -side top -fill x -ipadx 5 - frame $id.s_r.send - pack $id.s_r.send -side top - label $id.s_r.send.lab -text " send-symbol:" -width 12 -justify right - entry $id.s_r.send.ent -textvariable $var_iemgui_snd -width 22 - if { $snd != "nosndno" } { - pack $id.s_r.send.lab $id.s_r.send.ent -side left} - - frame $id.s_r.receive - pack $id.s_r.receive -side top - label $id.s_r.receive.lab -text "receive-symbol:" -width 12 -justify right - entry $id.s_r.receive.ent -textvariable $var_iemgui_rcv -width 22 - if { $rcv != "norcvno" } { - pack $id.s_r.receive.lab $id.s_r.receive.ent -side left} - -# get the current font name from the int given from C-space (gn_f) - set current_font $fontname - if {[eval concat $$var_iemgui_gn_f] == 1} \ - { set current_font "Helvetica" } - if {[eval concat $$var_iemgui_gn_f] == 2} \ - { set current_font "Times" } - - frame $id.spacer1 -height 7 - pack $id.spacer1 -side top - - labelframe $id.label -borderwidth 1 -text "label" -pady 4 \ - -font highlight_font - pack $id.label -side top -fill x - entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ - -font [list $current_font 12 $fontweight] - pack $id.label.name_entry -side top -expand yes -fill both -padx 5 - - frame $id.label.xy -padx 27 -pady 1 - pack $id.label.xy -side top - label $id.label.xy.x_lab -text "x offset" -width 6 - entry $id.label.xy.x_entry -textvariable $var_iemgui_gn_dx -width 5 - label $id.label.xy.dummy1 -text " " -width 2 - label $id.label.xy.y_lab -text "y offset" -width 6 - entry $id.label.xy.y_entry -textvariable $var_iemgui_gn_dy -width 5 - pack $id.label.xy.x_lab $id.label.xy.x_entry $id.label.xy.dummy1 \ - $id.label.xy.y_lab $id.label.xy.y_entry -side left -anchor e - - label $id.label.fontpopup_label -text $current_font \ - -relief groove -font [list $current_font 12 $fontweight] -padx 5 - pack $id.label.fontpopup_label -side left -anchor w -expand yes -fill x - label $id.label.fontsize_label -text "size" -width 4 - entry $id.label.fontsize_entry -textvariable $var_iemgui_gn_fs -width 5 - pack $id.label.fontsize_entry $id.label.fontsize_label \ - -side right -anchor e -padx 5 -pady 5 - menu $id.popup - $id.popup add command \ - -label $fontname \ - -font [format {{%s} 12 %s} $fontname $fontweight] \ - -command "iemgui_toggle_font $id 0" - $id.popup add command \ - -label "Helvetica" \ - -font [format {Helvetica 12 %s} $fontweight] \ - -command "iemgui_toggle_font $id 1" - $id.popup add command \ - -label "Times" \ - -font [format {Times 12 %s} $fontweight] \ - -command "iemgui_toggle_font $id 2" - bind $id.label.fontpopup_label <Button> \ - [list tk_popup $id.popup %X %Y] - - frame $id.spacer2 -height 7 - pack $id.spacer2 -side top - - labelframe $id.colors -borderwidth 1 -text "colors" -font highlight_font - pack $id.colors -fill x -ipadx 5 -ipady 4 - - frame $id.colors.select - pack $id.colors.select -side top - radiobutton $id.colors.select.radio0 -value 0 -variable \ - $var_iemgui_l2_f1_b0 -text "background" -width 10 -justify left - radiobutton $id.colors.select.radio1 -value 1 -variable \ - $var_iemgui_l2_f1_b0 -text "front" -width 5 -justify left - radiobutton $id.colors.select.radio2 -value 2 -variable \ - $var_iemgui_l2_f1_b0 -text "label" -width 5 -justify left - if { [eval concat $$var_iemgui_fcol] >= 0 } { - pack $id.colors.select.radio0 $id.colors.select.radio1 \ - $id.colors.select.radio2 -side left - } else { - pack $id.colors.select.radio0 $id.colors.select.radio2 -side left \ - } - - frame $id.colors.sections - pack $id.colors.sections -side top - button $id.colors.sections.but -text "compose color" -width 12 \ - -command "iemgui_choose_col_bkfrlb $id" - pack $id.colors.sections.but -side left -anchor w -padx 10 -pady 5 \ - -expand yes -fill x - if { [eval concat $$var_iemgui_fcol] >= 0 } { - label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_fcol]] \ - -font [list $current_font 12 $fontweight] -padx 2 -pady 2 -relief ridge - } else { - label $id.colors.sections.fr_bk -text "o=||=o" -width 6 \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -font [list $current_font 12 $fontweight] -padx 2 -pady 2 -relief ridge - } - label $id.colors.sections.lb_bk -text "testlabel" -width 9 \ - -background [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -activebackground [format "#%6.6x" [eval concat $$var_iemgui_bcol]] \ - -foreground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ - -activeforeground [format "#%6.6x" [eval concat $$var_iemgui_lcol]] \ - -font [list $current_font 12 $fontweight] -padx 2 -pady 2 -relief ridge - pack $id.colors.sections.lb_bk $id.colors.sections.fr_bk \ - -side right -anchor e -expand yes -fill both -pady 7 - -# color scheme by Mary Ann Benedetto http://piR2.org - frame $id.colors.r1 - pack $id.colors.r1 -side top - foreach i { 0 1 2 3 4 5 6 7 8 9} \ - hexcol { 0xFFFFFF 0xDFDFDF 0xBBBBBB 0xFFC7C6 0xFFE3C6 \ - 0xFEFFC6 0xC6FFC7 0xc6FEFF 0xC7C6FF 0xE3C6FF } \ - { - label $id.colors.r1.c$i -background [format "#%6.6x" $hexcol] \ - -activebackground [format "#%6.6x" $hexcol] -relief ridge \ - -padx 7 -pady 0 - bind $id.colors.r1.c$i <Button> [format "iemgui_preset_col %s %d" $id $hexcol] - } - pack $id.colors.r1.c0 $id.colors.r1.c1 $id.colors.r1.c2 $id.colors.r1.c3 \ - $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \ - $id.colors.r1.c8 $id.colors.r1.c9 -side left - - frame $id.colors.r2 - pack $id.colors.r2 -side top - foreach i { 0 1 2 3 4 5 6 7 8 9 } \ - hexcol { 0x9F9F9F 0x7C7C7C 0x606060 0xFF0400 0xFF8300 \ - 0xFAFF00 0x00FF04 0x00FAFF 0x0400FF 0x9C00FF } \ - { - label $id.colors.r2.c$i -background [format "#%6.6x" $hexcol] \ - -activebackground [format "#%6.6x" $hexcol] -relief ridge \ - -padx 7 -pady 0 @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10490] branches/pd
by zmoelnig＠users.sourceforge.net 08 Jan '09

08 Jan '09

Revision: 10490 http://pure-data.svn.sourceforge.net/pure-data/?rev=10490&view=rev Author: zmoelnig Date: 2009-01-08 12:47:02 +0000 (Thu, 08 Jan 2009) Log Message: ----------- renamed to standard naming scheme Added Paths: ----------- branches/pd/0.40-3/ Removed Paths: ------------- branches/pd/pd-0.40-3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10489] branches/pd
by zmoelnig＠users.sourceforge.net 08 Jan '09

08 Jan '09

Revision: 10489 http://pure-data.svn.sourceforge.net/pure-data/?rev=10489&view=rev Author: zmoelnig Date: 2009-01-08 12:46:40 +0000 (Thu, 08 Jan 2009) Log Message: ----------- renamed to standard naming scheme Added Paths: ----------- branches/pd/0.40-2/ Removed Paths: ------------- branches/pd/pd-0.40-2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data:[10488] branches/pd
by zmoelnig＠users.sourceforge.net 08 Jan '09

08 Jan '09

Revision: 10488 http://pure-data.svn.sourceforge.net/pure-data/?rev=10488&view=rev Author: zmoelnig Date: 2009-01-08 12:46:09 +0000 (Thu, 08 Jan 2009) Log Message: ----------- renamed to standard naming scheme Added Paths: ----------- branches/pd/0.39/ Removed Paths: ------------- branches/pd/pd-0.39/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2009