Pd-cvs July 2005

pd-cvs@lists.iem.at

14 participants
187 discussions

pd/extra/pique makefile, NONE, 1.2.8.2 pique.c, NONE, 1.2.4.2 pique.c.old, NONE, 1.1.1.1.12.2
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra/pique In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21746/pique Added Files: Tag: devel_0_39 makefile pique.c pique.c.old Log Message: missing extra files --- NEW FILE: pique.c --- /* Copyright (c) 1999 Miller Puckette. The contents of this file are free for any use, but BOTH THE AUTHOR AND UCSD DISCLAIM ALL WARRANTIES related to it. Although not written in Java, this still should not be used to control any machinery containing a sharp blade or combustible materiel, or as part of any life support system or weapon. */ #include "m_pd.h" #include <math.h> #include <stdio.h> #ifdef NT #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) #endif static t_class *pique_class; typedef struct _pique { t_object x_obj; int x_n; float x_errthresh; float *x_freq; float *x_amp; float *x_ampre; float *x_ampim; } t_pique; static void *pique_new(t_floatarg f) { int n = f; t_pique *x = (t_pique *)pd_new(pique_class); if (n < 1) n = 100; x->x_n = n; x->x_errthresh = 0; x->x_freq = t_getbytes(n * sizeof(*x->x_freq)); x->x_amp = t_getbytes(n * sizeof(*x->x_amp)); x->x_ampre = t_getbytes(n * sizeof(*x->x_ampre)); x->x_ampim = t_getbytes(n * sizeof(*x->x_ampim)); outlet_new(&x->x_obj, &s_list); return (x); } static float hanning(float pidetune, float sinpidetune) { float pi = 3.14159; if (pidetune < 0.01 && pidetune > -0.01) return (1); else if (pidetune > 3.14 && pidetune < 3.143) return (0.5); else if (pidetune < -3.14 && pidetune > -3.143) return (0.5); else return (sinpidetune/pidetune - 0.5 * (sinpidetune/(pidetune+pi) + sinpidetune/(pidetune-pi))); } static float peakerror(float *fpreal, float *fpimag, float pidetune, float norm, float peakreal, float peakimag) { float sinpidetune = sin(pidetune); float cospidetune = cos(pidetune); float windowshould = hanning(pidetune, sinpidetune); float realshould = windowshould * ( peakreal * cospidetune + peakimag * sinpidetune); float imagshould = windowshould * ( peakimag * cospidetune - peakreal * sinpidetune); float realgot = norm * (fpreal[0] - 0.5 * (fpreal[1] + fpreal[-1])); float imaggot = norm * (fpimag[0] - 0.5 * (fpimag[1] + fpimag[-1])); float realdev = realshould - realgot, imagdev = imagshould - imaggot; /* post("real %f->%f; imag %f->%f", realshould, realgot, imagshould, imaggot); */ return (realdev * realdev + imagdev * imagdev); } static void pique_doit(int npts, t_float *fpreal, t_float *fpimag, int npeak, int *nfound, t_float *fpfreq, t_float *fpamp, t_float *fpampre, t_float *fpampim, float errthresh) { float srate = sys_getsr(); /* not sure how to get this correctly */ float oneovern = 1.0/ (float)npts; float fperbin = srate * oneovern; float pow1, pow2 = 0, pow3 = 0, pow4 = 0, pow5 = 0; float re1, re2 = 0, re3 = *fpreal; float im1, im2 = 0, im3 = 0, powthresh, relativeerror; int count, peakcount = 0, n2 = (npts >> 1); float *fp1, *fp2; for (count = n2, fp1 = fpreal, fp2 = fpimag, powthresh = 0; count--; fp1++, fp2++) powthresh += (*fp1) * (*fp1) + (*fp2) * (*fp2) ; powthresh *= 0.00001; for (count = 1; count < n2; count++) { float windreal, windimag, pi = 3.14159; float detune, pidetune, sinpidetune, cospidetune, ampcorrect, freqout, ampout, ampoutreal, ampoutimag; float rpeak, rpeaknext, rpeakprev; float ipeak, ipeaknext, ipeakprev; float errleft, errright; fpreal++; fpimag++; re1 = re2; re2 = re3; re3 = *fpreal; im1 = im2; im2 = im3; im3 = *fpimag; if (count < 2) continue; pow1 = pow2; pow2 = pow3; pow3 = pow4; pow4 = pow5; /* get Hanning-windowed spectrum by convolution */ windreal = re2 - 0.5 * (re1 + re3); windimag = im2 - 0.5 * (im1 + im3); pow5 = windreal * windreal + windimag * windimag; /* if (count < 30) post("power %f", pow5); */ if (count < 5) continue; /* check for a peak. The actual bin is count-3. */ if (pow3 <= pow2 || pow3 <= pow4 || pow3 <= pow1 || pow3 <= pow5 || pow3 < powthresh) continue; /* go back for the raw FFT values around the peak. */ rpeak = fpreal[-3]; rpeaknext = fpreal[-2]; rpeakprev = fpreal[-4]; ipeak = fpimag[-3]; ipeaknext = fpimag[-2]; ipeakprev = fpimag[-4]; /* recalculate Hanning-windowed spectrum by convolution */ windreal = rpeak - 0.5 * (rpeaknext + rpeakprev); windimag = ipeak - 0.5 * (ipeaknext + ipeakprev); detune = ((rpeakprev - rpeaknext) * (2.0 * rpeak - rpeakprev - rpeaknext) + (ipeakprev - ipeaknext) * (2.0 * ipeak - ipeakprev - ipeaknext)) / (4.0 * pow3); /* if (count < 30) post("detune %f", detune); */ if (detune > 0.7 || detune < -0.7) continue; /* the frequency is the sum of the bin frequency and detuning */ freqout = fperbin * ((float)(count-3) + detune); pidetune = pi * detune; sinpidetune = sin(pidetune); cospidetune = cos(pidetune); ampcorrect = 1.0 / hanning(pidetune, sinpidetune); /* Multiply by 2 to get real-sinusoid peak amplitude and divide by N to normalize FFT */ ampcorrect *= 2. * oneovern; /* amplitude is peak height, corrected for Hanning window shape */ ampout = ampcorrect * sqrt(pow3); ampoutreal = ampcorrect * (windreal * cospidetune - windimag * sinpidetune); ampoutimag = ampcorrect * (windreal * sinpidetune + windimag * cospidetune); if (errthresh > 0) { /* post("peak %f %f", freqout, ampout); */ errleft = peakerror(fpreal-4, fpimag-4, pidetune+pi, 2. * oneovern, ampoutreal, ampoutimag); errright = peakerror(fpreal-2, fpimag-2, pidetune-pi, 2. * oneovern, ampoutreal, ampoutimag); relativeerror = (errleft + errright)/(ampout * ampout); if (relativeerror > errthresh) continue; } /* post("power %f, error %f, relative %f", pow3, errleft + errright, relativeerror); */ *fpfreq++ = freqout; *fpamp++ = ampout; *fpampre++ = ampoutreal; *fpampim++ = ampoutimag; if (++peakcount == npeak) break; } *nfound = peakcount; } static void pique_list(t_pique *x, t_symbol *s, int argc, t_atom *argv) { int npts = atom_getintarg(0, argc, argv); t_symbol *symreal = atom_getsymbolarg(1, argc, argv); t_symbol *symimag = atom_getsymbolarg(2, argc, argv); int npeak = atom_getintarg(3, argc, argv); int n; t_garray *a; t_float *fpreal, *fpimag; if (npts < 8 || npeak < 1) error("pique: bad npoints or npeak"); if (npeak > x->x_n) npeak = x->x_n; if (!(a = (t_garray *)pd_findbyclass(symreal, garray_class)) || !garray_getfloatarray(a, &n, &fpreal) || n < npts) error("%s: missing or bad array", symreal->s_name); else if (!(a = (t_garray *)pd_findbyclass(symimag, garray_class)) || !garray_getfloatarray(a, &n, &fpimag) || n < npts) error("%s: missing or bad array", symimag->s_name); else { int nfound, i; float *fpfreq = x->x_freq; float *fpamp = x->x_amp; float *fpampre = x->x_ampre; float *fpampim = x->x_ampim; pique_doit(npts, fpreal, fpimag, npeak, &nfound, fpfreq, fpamp, fpampre, fpampim, x->x_errthresh); for (i = 0; i < nfound; i++, fpamp++, fpfreq++, fpampre++, fpampim++) { t_atom at[5]; SETFLOAT(at, (float)i); SETFLOAT(at+1, *fpfreq); SETFLOAT(at+2, *fpamp); SETFLOAT(at+3, *fpampre); SETFLOAT(at+4, *fpampim); outlet_list(x->x_obj.ob_outlet, &s_list, 5, at); } } } static void pique_errthresh(t_pique *x, t_floatarg f) { x->x_errthresh = f; } static void pique_free(t_pique *x) { int n = x->x_n; t_freebytes(x->x_freq, n * sizeof(*x->x_freq)); t_freebytes(x->x_amp, n * sizeof(*x->x_amp)); t_freebytes(x->x_ampre, n * sizeof(*x->x_ampre)); t_freebytes(x->x_ampim, n * sizeof(*x->x_ampim)); } void pique_setup(void) { pique_class = class_new(gensym("pique"), (t_newmethod)pique_new, (t_method)pique_free, sizeof(t_pique),0, A_DEFFLOAT, 0); class_addlist(pique_class, pique_list); class_addmethod(pique_class, (t_method)pique_errthresh, gensym("errthresh"), A_FLOAT, 0); post("pique 0.1 for PD version 23"); } --- NEW FILE: makefile --- NAME=pique CSYM=pique current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\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 # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations --- NEW FILE: pique.c.old --- /* Copyright (c) 1998 The Regents of the University of California. The contents of this file are free for any use, but BOTH THE AUTHOR AND UCSD DISCLAIM ALL WARRANTIES related to it. Although not written in Java, this still should not be used to control any machinery containing a sharp blade or combustible materiel, or as part of any life support system or weapon. */ #include "m_pd.h" #include <math.h> static t_class *pique_class; typedef struct _pique { t_object x_obj; } t_pique; static void *pique_new(void) { t_pique *x = (t_pique *)pd_new(pique_class); return (x); } /* we aren't measuring phase yet */ static void pique_doit(int npts, t_float *fpreal, t_float *fpimag, int npeak, t_float *fpfreq, t_float *fpamp) { float srate = sys_getsr(); /* not sure how to get this correctly */ float oneovern = 1.0/ (float)npts; float fperbin = srate * oneovern; float pow1, pow2 = 0, pow3 = 0, pow4 = 0, pow5 = 0; float re1, re2 = 0, re3 = *fpreal; float im1, im2 = 0, im3 = 0, powthresh; int count, peakcount = 0, n2 = (npts >> 1); float *fp1, *fp2; for (count = n2, fp1 = fpreal, fp2 = fpimag, powthresh = 0; count--; fp1++, fp2++) powthresh += (*fp1) * (*fp1) + (*fp2) * (*fp2) ; powthresh *= 0.00001; for (count = 1; count < n2; count++) { float windreal, windimag, pi = 3.14159; float detune, pidetune, ampcorrect, freqout, ampout; float rpeak, rpeaknext, rpeakprev; float ipeak, ipeaknext, ipeakprev; fpreal++; fpimag++; re1 = re2; re2 = re3; re3 = *fpreal; im1 = im2; im2 = im3; im3 = *fpimag; if (count < 2) continue; pow1 = pow2; pow2 = pow3; pow3 = pow4; pow4 = pow5; /* get Hanning-windowed spectrum by convolution */ windreal = re2 - 0.5 * (re1 + re3); windimag = im2 - 0.5 * (im1 + im3); pow5 = windreal * windreal + windimag * windimag; /* if (count < 30) post("power %f", pow5); */ if (count < 5) continue; /* check for a peak. The actual bin is count-3. */ if (pow3 <= pow2 || pow3 <= pow4 || pow3 <= pow1 || pow3 <= pow5 || pow3 < powthresh) continue; /* go back for the raw FFT values around the peak. */ rpeak = fpreal[-3]; rpeaknext = fpreal[-2]; rpeakprev = fpreal[-4]; ipeak = fpimag[-3]; ipeaknext = fpimag[-2]; ipeakprev = fpimag[-4]; detune = ((rpeakprev - rpeaknext) * (2.0 * rpeak - rpeakprev - rpeaknext) + (ipeakprev - ipeaknext) * (2.0 * ipeak - ipeakprev - ipeaknext)) / (4.0 * pow3); /* if (count < 30) post("detune %f", detune); */ if (detune > 0.7 || detune < -0.7) continue; /* the frequency is the sum of the bin frequency and detuning */ freqout = fperbin * ((float)(count-3) + detune); *fpfreq++ = freqout; pidetune = pi * detune; if (pidetune < 0.01 && pidetune > -0.01) ampcorrect = 1; else ampcorrect = 1.0 / (sin(pidetune)/pidetune + 0.5 * (sin(pidetune + pi)/(pidetune+pi) + sin(pidetune-pi)/(pidetune-pi))); /* amplitude is peak height, corrected for Hanning window shape. Multiply by 2 to get real-sinusoid peak amplitude */ ampout = 2. * oneovern * sqrt(pow3) * ampcorrect; *fpamp++ = ampout; /* post("peak %f %f", freqout, ampout); */ if (++peakcount == npeak) break; } while (peakcount < npeak) { *fpfreq++ = 0; *fpamp++ = 0; peakcount++; } } static void pique_list(t_pique *x, t_symbol *s, int argc, t_atom *argv) { int npts = atom_getintarg(0, argc, argv); t_symbol *symreal = atom_getsymbolarg(1, argc, argv); t_symbol *symimag = atom_getsymbolarg(2, argc, argv); int npeak = atom_getintarg(3, argc, argv); t_symbol *symfreq = atom_getsymbolarg(4, argc, argv); t_symbol *symamp = atom_getsymbolarg(5, argc, argv); t_garray *a, *afreq, *aamp; int n; t_float *fpreal, *fpimag, *fpfreq, *fpamp, *fpphase; if (npts < 8 || npeak < 1) error("pique: bad npoints or npeak"); else if (!(a = (t_garray *)pd_findbyclass(symreal, garray_class)) || !garray_getfloatarray(a, &n, &fpreal) || n < npts) error("%s: missing or bad array", symreal->s_name); else if (!(a = (t_garray *)pd_findbyclass(symimag, garray_class)) || !garray_getfloatarray(a, &n, &fpimag) || n < npts) error("%s: missing or bad array", symimag->s_name); else if (!(afreq = (t_garray *)pd_findbyclass(symfreq, garray_class)) || !garray_getfloatarray(afreq, &n, &fpfreq) || n < npeak) error("%s: missing or bad array", symfreq->s_name); else if (!(aamp = (t_garray *)pd_findbyclass(symamp, garray_class)) || !garray_getfloatarray(aamp, &n, &fpamp) || n < npeak) error("%s: missing or bad array", symamp->s_name); else { pique_doit(npts, fpreal, fpimag, npeak, fpfreq, fpamp); garray_redraw(afreq); garray_redraw(aamp); } } void pique_setup(void) { pique_class = class_new(gensym("pique"), pique_new, 0, sizeof(t_pique), 0, 0); class_addlist(pique_class, pique_list); }

1 0

pd/extra/fiddle~ fiddle~.c, NONE, 1.5.4.2 makefile, NONE, 1.6.8.2
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra/fiddle~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21746/fiddle~ Added Files: Tag: devel_0_39 fiddle~.c makefile Log Message: missing extra files --- NEW FILE: fiddle~.c --- /* Copyright (c) 1997-1999 Miller Puckette and Ted Apel. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ /* * Fiddle is a pitch tracker hardwired to have hop size ("H") equal to * half its window size ("N"). * * This version should compile for Max "0.26," JMAX, Pd, or Max/MSP. * * The "lastanalysis" field holds the shifted FT of the previous H * samples. The buffer contains in effect points 1/2, 3/2, ..., (N-1)/2 * of the DTFT of a real vector of length N, half of whose points are zero, * i.e., only the first H points are used. Put another way, we get the * the odd-numbered points of the FFT of the H points, zero padded to 4*H in * length. The integer points 0, 1, ..., H-1 * are found by interpolating these others, using the fact that the * half-integer points are band-limited (they only have positive frequencies.) * To facilitate the interpolation the "lastanalysis" buffer contains [...1806 lines suppressed...] imag = ip = real + MAXPOINTS; src = buf; for (i = 0; i < np; i++) { *rp++ = *src++; *ip++ = *src++; } if (inv) ifft(np,real,imag); else fft(np,real,imag); rp = real; ip = imag; src = buf; for (i = 0; i < np; i++) { *src++ = *rp++; *src++ = *ip++; } } #endif /* MSP */ --- NEW FILE: makefile --- NAME=fiddle~ CSYM=fiddle_tilde current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\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 # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations

1 0

pd/extra/loop~ loop~.c, NONE, 1.3.4.2 makefile, NONE, 1.6.8.2 test-loop~.pd, NONE, 1.3.8.2
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra/loop~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21746/loop~ Added Files: Tag: devel_0_39 loop~.c makefile test-loop~.pd Log Message: missing extra files --- NEW FILE: test-loop~.pd --- #N canvas 33 0 680 609 12; #X floatatom 52 262 0 0 0 0 - - -; #X obj 261 346 print~; #X msg 47 373 bang; #X msg 274 313 bang; #X obj 52 306 loop~; #X floatatom 102 245 0 0 0 0 - - -; #N canvas 0 0 450 300 graph1 0; #X array array1 44100 float 0; #X coords 0 10 44100 0 200 150 1; #X restore 65 17 graph; #X msg 43 204 \; array1 resize 44100; #X obj 25 401 tabwrite~ array1; #X msg 208 371 bang; #X obj 176 402 tabwrite~ array1; #X msg 194 261 bang; #X obj 204 347 print~; #X msg 217 314 bang; #N canvas 0 0 450 300 graph1 0; #X array array2 150000 float 0; #X coords 0 1 150000 -1 200 150 1; #X restore 332 398 graph; #X msg 326 274 \; array2 resize 150000; #X obj 103 529 tabread4~ array2; #X obj 64 481 *~; #X obj 107 581 dac~; #X obj 105 552 hip~ 5; #X obj 123 482 samphold~; #X obj 102 506 +~; #X floatatom 106 430 0 0 0 0 - - -; #X obj 108 453 *~ 1000; #X obj 312 215 soundfiler; #X msg 330 170 read ../doc/sound/bell.aiff array2; #X msg 330 193 read ../doc/sound/vocal.aiff array2; #X connect 0 0 4 0; #X connect 2 0 8 0; #X connect 3 0 1 0; #X connect 4 0 12 0; #X connect 4 0 17 0; #X connect 4 0 8 0; #X connect 4 0 20 1; #X connect 4 1 10 0; #X connect 4 1 1 0; #X connect 4 1 17 1; #X connect 5 0 4 1; #X connect 9 0 10 0; #X connect 11 0 4 0; #X connect 13 0 12 0; #X connect 16 0 19 0; #X connect 17 0 21 0; #X connect 19 0 18 0; #X connect 19 0 18 1; #X connect 20 0 21 1; #X connect 21 0 16 0; #X connect 22 0 23 0; #X connect 23 0 20 0; #X connect 25 0 24 0; #X connect 26 0 24 0; --- NEW FILE: makefile --- NAME=loop~ CSYM=loop_tilde current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\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 # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations --- NEW FILE: loop~.c --- /* loop~ -- loop generator for sampling */ /* Copyright 1997-1999 Miller Puckette. Permission is granted to use this software for any purpose provided you keep this copyright notice intact. THE AUTHOR AND HIS EMPLOYERS MAKE NO WARRANTY, EXPRESS OR IMPLIED, IN CONNECTION WITH THIS SOFTWARE. This file is downloadable from http://www.crca.ucsd.edu/~msp . */ #ifdef PD #include "m_pd.h" #endif typedef struct _loopctl { double l_phase; float l_invwindow; float l_window; int l_resync; } t_loopctl; static void loopctl_run(t_loopctl *x, float *transposein, float *windowin, float *rawout, float *windowout, int n) { float window, invwindow; double phase = x->l_phase; if (x->l_resync) { window = *windowin; if (window < 0) { if (window > -1) window = -1; invwindow = -1/window; } else { if (window < 1) window = 1; invwindow = 1/window; } x->l_resync = 0; } else { window = x->l_window; phase = x->l_phase; invwindow = x->l_invwindow; } while (n--) { double phaseinc = invwindow * *transposein++; double newphase; float nwind = *windowin++; if (phaseinc >= 1 || phaseinc < 0) phaseinc = 0; newphase = phase + phaseinc; if (newphase >= 1) { window = nwind; if (window < 0) { if (window > -1) window = -1; invwindow = -1/window; } else { if (window < 1) window = 1; invwindow = 1/window; } newphase -= 1.; } phase = newphase; *rawout++ = (float)phase; *windowout++ = window; } x->l_invwindow = invwindow; x->l_window = window; x->l_phase = phase; } static void loopctl_init(t_loopctl *x) { x->l_window = 1; x->l_invwindow = 1; x->l_phase = 0; } static void loopctl_set(t_loopctl *x, float val) { if (val < 0 || val > 1) val = 0; x->l_phase = val; x->l_resync = 1; } #ifdef PD typedef struct _loop { t_object x_obj; t_float x_f; t_loopctl x_loopctl; } t_loop; static t_class *loop_class; static void *loop_new(void) { t_loop *x = (t_loop *)pd_new(loop_class); loopctl_init(&x->x_loopctl); inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); outlet_new(&x->x_obj, gensym("signal")); outlet_new(&x->x_obj, gensym("signal")); return (x); } static t_int *loop_perform(t_int *w) { t_loopctl *ctl = (t_loopctl *)(w[1]); t_float *in1 = (t_float *)(w[2]); t_float *in2 = (t_float *)(w[3]); t_float *out1 = (t_float *)(w[4]); t_float *out2 = (t_float *)(w[5]); int n = (int)(w[6]); loopctl_run(ctl, in1, in2, out1, out2, n); return (w+7); } static void loop_dsp(t_loop *x, t_signal **sp) { dsp_add(loop_perform, 6, &x->x_loopctl, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec, sp[3]->s_vec, sp[0]->s_n); } static void loop_set(t_loop *x, t_floatarg val) { loopctl_set(&x->x_loopctl, val); } static void loop_bang(t_loop *x) { loopctl_set(&x->x_loopctl, 0); } void loop_tilde_setup(void) { loop_class = class_new(gensym("loop~"), (t_newmethod)loop_new, 0, sizeof(t_loop), 0, 0); class_addmethod(loop_class, (t_method)loop_dsp, gensym("dsp"), A_CANT, 0); CLASS_MAINSIGNALIN(loop_class, t_loop, x_f); class_addmethod(loop_class, (t_method)loop_set, gensym("set"), A_DEFFLOAT, 0); class_addbang(loop_class, loop_bang); } #endif /* PD */

1 0

[PD-cvs] pd/extra/expr~ LICENSE.txt, NONE, 1.2.22.2 README.txt, NONE, 1.1.1.1.8.2 fts_to_pd.h, NONE, 1.3.4.2 makefile, NONE, 1.7.4.2 vexp.c, NONE, 1.5.4.2 vexp.h, NONE, 1.4.4.2 vexp_fun.c, NONE, 1.4.4.2 vexp_if.c, NONE, 1.5.4.2
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra/expr~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21746/expr~ Added Files: Tag: devel_0_39 LICENSE.txt README.txt fts_to_pd.h makefile vexp.c vexp.h vexp_fun.c vexp_if.c Log Message: missing extra files --- NEW FILE: vexp.c --- /* * jMax * Copyright (C) 1994, 1995, 1998, 1999 by IRCAM-Centre Georges Pompidou, Paris, France. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * See file LICENSE for further informations on licensing terms. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [...2103 lines suppressed...] post("%c", ','); break; case OP_SEMI: post("%c", ';'); break; default: post("expr: ex_print: bad op 0x%lx\n", eptr->ex_op); } break; default: post("expr: ex_print: bad type 0x%lx\n", eptr->ex_type); } eptr++; } post("\n"); } #ifdef NT void ABORT( void) {bug("expr");} #endif --- NEW FILE: vexp_fun.c --- /* * jMax * Copyright (C) 1994, 1995, 1998, 1999 by IRCAM-Centre Georges Pompidou, Paris, France. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * See file LICENSE for further informations on licensing terms. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [...1276 lines suppressed...] /* * ex_hypoth - Euclidean distance function */ FUNC_DEF(ex_hypoth, hypoth, (double), (double), 1); /* * ex_round - round to nearest integer, away from zero */ FUNC_DEF_UNARY(ex_round, round, (double), 1); /* * ex_trunc - round to interger, towards zero */ FUNC_DEF_UNARY(ex_trunc, trunc, (double), 1); /* * ex_nearbyint - round to nearest integer */ FUNC_DEF_UNARY(ex_nearbyint, nearbyint, (double), 1); #endif --- NEW FILE: fts_to_pd.h --- /* fts_to_pd.h -- alias some fts names to compile in Pd. copyright 1999 Miller Puckette; permission is granted to use this file for any purpose. */ #define fts_malloc malloc #define fts_calloc calloc #define fts_free free #define fts_realloc realloc #define fts_atom_t t_atom #define fts_object_t t_object typedef t_symbol *fts_symbol_t; #ifdef MSP #define t_atom Atom #define t_symbol Symbol #define pd_new(x) newobject(x); #define pd_free(x) freeobject(x); #define t_outlet void #define t_binbuf void typedef t_class *t_pd; typedef float t_floatarg; #include <stdlib.h> #include <stdio.h> #include <stdarg.h> #include <string.h> #include <errno.h> void pd_error(void *object, char *fmt, ...); #endif /* MSP */ #define post_error pd_error #define fts_is_floatg(x) ((x)->a_type == A_FLOAT) #define fts_new_symbol_copy gensym #define fts_symbol_name(x) ((x)->s_name) --- NEW FILE: LICENSE.txt --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. <signature of Ty Coon>, 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE: vexp_if.c --- /* * jMax * Copyright (C) 1994, 1995, 1998, 1999 by IRCAM-Centre Georges Pompidou, Paris, France. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * See file LICENSE for further informations on licensing terms. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [...1184 lines suppressed...] va_list ap; t_int arg[8]; int i; static int saidit = 0; va_start(ap, fmt); /* SDY vsprintf(error_string, fmt, ap); */ post(fmt, ap); va_end(ap); /* SDY fprintf(stderr, "error: %s\n", error_string); error_object = object; */ if (!saidit) { post("... you might be able to track this down from the Find menu."); saidit = 1; } } #endif --- NEW FILE: makefile --- current: expr.pd_linux expr~.pd_linux fexpr~.pd_linux \ ../expr.pd_linux ../expr~.pd_linux ../fexpr~.pd_linux install: install_linux clean: clean_linux clobber: clobber_linux PDEXTERN=/usr/local/lib/pd/externs # ----------------------- NT ----------------------- pd_nt: expr.dll NTOBJ = vexp.obj vexp_fun.obj vexp_if.obj PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\bin\pd.lib .c.obj: cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c expr.dll: $(NTOBJ) link /dll /export:expr_setup /export:expr_tilde_setup \ /export:fexpr_tilde_setup $(NTOBJ) $(PDNTLIB) ren vexp.dll expr.dll copy expr.dll ..\expr.dll copy expr.dll ..\expr~.dll copy expr.dll ..\fexpr~.dll copy help-expr.pd ..\help-expr.pd # ----------------------- IRIX 5.x ----------------------- pd_irix5: .SUFFIXES: .pd_irix5 SGICFLAGS5 = -o32 -DPD -DSGI -O2 SGIINCLUDE = -I/usr/people/msp/pd/pd/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: .SUFFIXES: .pd_irix6 SGICFLAGS6 = -DPD -DSGI -n32 \ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -Ofast=ip32 SGICFLAGS5 = -DPD -O2 -DSGI SGIINCLUDE = -I/usr/people/msp/pd/pd/src .c.pd_irix6: $(CC) $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c ld -elf -shared -rdata_shared -o $*.pd_irix6 $*.o rm $*.o # ----------------------- LINUX i386 ----------------------- LINUXOBJ = vexp.pd_linux_o vexp_fun.pd_linux_o vexp_if.pd_linux_o .SUFFIXES: .pd_linux_o LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch LINUXINCLUDE = -I../../src .c.pd_linux_o: $(CC) -g $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.pd_linux_o -c $*.c expr.pd_linux: $(LINUXOBJ) ld -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm strip --strip-unneeded expr.pd_linux expr~.pd_linux: expr.pd_linux -ln -s expr.pd_linux expr~.pd_linux fexpr~.pd_linux: expr.pd_linux -ln -s expr.pd_linux fexpr~.pd_linux ../expr.pd_linux: expr.pd_linux -ln -s expr~/expr.pd_linux ../expr.pd_linux ../expr~.pd_linux: expr.pd_linux -ln -s expr~/expr.pd_linux ../expr~.pd_linux ../fexpr~.pd_linux: expr.pd_linux -ln -s expr~/expr.pd_linux ../fexpr~.pd_linux install_linux: install expr.pd_linux $(PDEXTERN) rm -f $(PDEXTERN)/expr~.pd_linux rm -f $(PDEXTERN)/fexpr~.pd_linux cd $(PDEXTERN); \ -ln -s expr.pd_linux expr~.pd_linux -ln -s expr.pd_linux fexpr~.pd_linux linux_clean: rm -f *.pd_linux_o *.o linux_clobber: clean rm -f expr.pd_linux # ----------------------- MAC OSX ----------------------- pd_darwin: expr.pd_darwin expr~.pd_darwin fexpr~.pd_darwin MACOSXOBJ = vexp.pd_darwin_o vexp_fun.pd_darwin_o vexp_if.pd_darwin_o .SUFFIXES: .pd_darwin_o MACOSXCFLAGS = -DMACOSX -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch MACOSXINCLUDE = -I../../src .c.pd_darwin_o: $(CC) -g $(MACOSXCFLAGS) $(MACOSXINCLUDE) -o $*.pd_darwin_o -c $*.c expr.pd_darwin: $(MACOSXOBJ) $(CC) -bundle -undefined suppress -flat_namespace \ -o expr.pd_darwin $(MACOSXOBJ) -lm rm -f ../expr.pd_darwin -ln -s expr~/expr.pd_darwin .. expr~.pd_darwin: expr.pd_darwin -ln -s expr.pd_darwin expr~.pd_darwin rm -f ../expr~.pd_darwin -ln -s expr~/expr~.pd_darwin .. fexpr~.pd_darwin: expr.pd_darwin -ln -s expr.pd_darwin fexpr~.pd_darwin rm -f ../fexpr~.pd_darwin -ln -s expr~/fexpr~.pd_darwin .. install_darwin: install expr.pd_darwin $(PDEXTERN) rm -f $(PDEXTERN)/expr~.pd_darwin rm -f $(PDEXTERN)/fexpr~.pd_darwin cd $(PDEXTERN); \ -ln -s expr.pd_darwin expr~.pd_darwin; \ -ln -s expr.pd_darwin fexpr~.pd_darwin darwin_clean: rm -f *.pd_darwin_o *.o darwin_clobber: clean rm -f expr.pd_darwin --- NEW FILE: README.txt --- You can get more information on the expr object at http://www.crca.ucsd.edu/~yadegari/expr.html ----------- New if Version 0.4 -access to variables (made by value object) -multiple expression separated by ; -added the following shorthands: $y or $y1 = $y1[-1] and $y2 = $y2[-1] -new functions: if - conditional evaluation cbrt - cube root erf - error function erfc - complementary error function expm1 - exponential minus 1, log1p - logarithm of 1 plus isinf - is the value infinite, finite - is the value finite isnan -- is the resut a nan (Not a number) copysign - copy sign of a number ldexp - multiply floating-point number by integral power of 2 imodf - get signed integral value from floating-point number modf - get signed fractional value from floating-point number drem - floating-point remainder function Thanks to Orm Finnendahl for adding the following functions: fmod - floating-point remainder function ceil - ceiling function: smallest integral value not less than argument floor - largest integral value not greater than argument ------------ New in Version 0.3 -Full function functionality ------------ The object "expr" is used for expression evaluaion of control data. Expr~ and fexpr~ are extentions to the expr object to work with vectors. The expr~ object is designed to efficiently combine signal and control stream processing by vector operations on the basis of the block size of the environment. fexpr~ object provides a flexible mechanism for building FIR and IIR filters by evaluating expressions on a sample by sample basis and providing access to prior samples of the input and output audio streams. When fractional offset is used, fexpr~ uses linear interpolation to determine the value of the indexed sample. fexpr~ evaluates the expression for every single sample and at every evaluation previous samples (limited by the audio vector size) can be accessed. $x is used to denote a singnal input whose samples we would like to access. The syntax is $x followed by the inlet number and indexed by brackets, for example $x1[-1] specifies the previous sample of the first inlet. Therefore, if we are to build a simple filter which replaces every sample by the average of that sample and its previous one, we would use "fexpr~ ($x1[0]+$x1[-1])/2 ". For ease of when the brackets are omitted, the current sample is implied, so we can right the previous filter expression as follows: " fexpr~ ($x1+$x1[-1])/2". To build IIR filters $y is used to access the previous samples of the output stream. The three objects expr, expr~, and fexpr~ are implemented in the same object so the files expr~.pd_linux and fexpr~.pd_linux are links to expr.pd_linux This release has been compiled and tested on Linux 6.0. -------- Here are some syntax information: (refer to help-expr.pd for examples) Syntyax: The syntax is very close to how expression are written in C. Variables are specified as follows where the '#' stands for the inlet number: $i#: integer input variable $f#: float input variable $s#: symbol input variable Used for expr~ only: $v#: signal (vector) input (vector by vector evaluation) Used for fexpr~ only: $x#[n]: the sample from inlet # indexed by n, where n has to satisfy 0 => n >= -vector size, ($x# is a shorthand for $x#[0], specifying the current sample) $y#[n]: the output value indexed by n, where n has to satisfy 0 > n >= -vector size, $y[n] is a shorthand for $y1[n] I'll appreciate hearing about bugs, comments, suggestions, ... Shahrokh Yadegari (sdy(a)ucsd.edu) 7/10/02 --- NEW FILE: vexp.h --- /* * jMax * Copyright (C) 1994, 1995, 1998, 1999 by IRCAM-Centre Georges Pompidou, Paris, France. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * See file LICENSE for further informations on licensing terms. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Based on Max/ISPW by Miller Puckette. * * Authors: Maurizio De Cecco, Francois Dechelle, Enzo Maggi, Norbert Schnell. * */ /* "expr" was written by Shahrokh Yadegari c. 1989. -msp */ /* "expr~" and "fexpr~" conversion by Shahrokh Yadegari c. 1999,2000 */ #define MSP #ifdef PD #undef MSP #endif #ifdef PD #include "m_pd.h" #else /* MSP */ #include "ext.h" #include "z_dsp.h" #endif #include "fts_to_pd.h" /* This is put in fts_to_pd.h #ifdef MSP #define t_atom Atom #define t_symbol Symbol #define pd_new(x) newobject(x); #define t_outlet void #endif */ /* * Currently the maximum number of variables (inlets) that are supported * is 10. */ #define MAX_VARS 9 #define MINODES 10 /* was 200 */ /* terminal defines */ /* * operations * (x<<16|y) x defines the level of precedence, * the lower the number the lower the precedence * separators are defines as operators just for convenience */ #define OP_SEMI ((long)(1<<16|1)) /* ; */ #define OP_COMMA ((long)(2<<16|2)) /* , */ #define OP_LOR ((long)(3<<16|3)) /* || */ #define OP_LAND ((long)(4<<16|4)) /* && */ #define OP_OR ((long)(5<<16|5)) /* | */ #define OP_XOR ((long)(6<<16|6)) /* ^ */ #define OP_AND ((long)(7<<16|7)) /* & */ #define OP_NE ((long)(8<<16|8)) /* != */ #define OP_EQ ((long)(8<<16|9)) /* == */ #define OP_GE ((long)(9<<16|10)) /* >= */ #define OP_GT ((long)(9<<16|11)) /* > */ #define OP_LE ((long)(9<<16|12)) /* <= */ #define OP_LT ((long)(9<<16|13)) /* < */ #define OP_SR ((long)(10<<16|14)) /* >> */ #define OP_SL ((long)(10<<16|15)) /* << */ #define OP_SUB ((long)(11<<16|16)) /* - */ #define OP_ADD ((long)(11<<16|17)) /* + */ #define OP_MOD ((long)(12<<16|18)) /* % */ #define OP_DIV ((long)(12<<16|19)) /* / */ #define OP_MUL ((long)(12<<16|20)) /* * */ #define OP_UMINUS ((long)(13<<16|21)) /* - unary minus */ #define OP_NEG ((long)(13<<16|22)) /* ~ one complement */ #define OP_NOT ((long)(13<<16|23)) /* ! */ #define OP_RB ((long)(14<<16|24)) /* ] */ #define OP_LB ((long)(14<<16|25)) /* [ */ #define OP_RP ((long)(14<<16|26)) /* ) */ #define OP_LP ((long)(14<<16|27)) /* ( */ #define OP_STORE ((long)(15<<16|28)) /* = */ #define HI_PRE ((long)(100<<16)) /* infinite precedence */ #define PRE_MASK ((long)0xffff0000) /* precedence level mask */ struct ex_ex; #define name_ok(c) (((c)=='_') || ((c)>='a' && (c)<='z') || \ ((c)>='A' && (c)<='Z') || ((c) >= '0' && (c) <= '9')) #define unary_op(x) ((x) == OP_NOT || (x) == OP_NEG || (x) == OP_UMINUS) struct ex_ex { union { long v_int; float v_flt; t_float *v_vec; /* this is an for allocated vector */ long op; char *ptr; } ex_cont; /* content */ #define ex_int ex_cont.v_int #define ex_flt ex_cont.v_flt #define ex_vec ex_cont.v_vec #define ex_op ex_cont.op #define ex_ptr ex_cont.ptr long ex_type; /* type of the node */ }; #define exNULL ((struct ex_ex *)0) /* defines for ex_type */ #define ET_INT 1 /* an int */ #define ET_FLT 2 /* a float */ #define ET_OP 3 /* operator */ #define ET_STR 4 /* string */ #define ET_TBL 5 /* a table, the content is a pointer */ #define ET_FUNC 6 /* a function */ #define ET_SYM 7 /* symbol ("string") */ #define ET_VSYM 8 /* variable symbol ("$s?") */ /* we treat parenthesis and brackets */ /* special to keep a pointer to their */ /* match in the content */ #define ET_LP 9 /* left parenthesis */ #define ET_LB 10 /* left bracket */ #define ET_II 11 /* and integer inlet */ #define ET_FI 12 /* float inlet */ #define ET_SI 13 /* string inlet */ #define ET_VI 14 /* signal inlet */ #define ET_VEC 15 /* allocated signal vector */ /* special types for fexpr~ */ #define ET_YO 16 /* vector output for fexpr~ */ #define ET_YOM1 17 /* shorthand for $y?[-1] */ #define ET_XI 18 /* vector input for fexpr~ */ #define ET_XI0 20 /* shorthand for $x?[0] */ #define ET_VAR 21 /* variable */ /* defines for ex_flags */ #define EF_TYPE_MASK 0x07 /* first three bits define the type of expr */ #define EF_EXPR 0x01 /* expr - control in and out */ #define EF_EXPR_TILDE 0x02 /* expr~ signal and control in, signal out */ #define EF_FEXPR_TILDE 0x04 /* fexpr~ filter expression */ #define EF_STOP 0x08 /* is it stopped used for expr~ and fexpr~ */ #define EF_VERBOSE 0x10 /* verbose mode */ #define IS_EXPR(x) ((((x)->exp_flags&EF_TYPE_MASK)|EF_EXPR) == EF_EXPR) #define IS_EXPR_TILDE(x) \ ((((x)->exp_flags&EF_TYPE_MASK)|EF_EXPR_TILDE)==EF_EXPR_TILDE) #define IS_FEXPR_TILDE(x) \ ((((x)->exp_flags&EF_TYPE_MASK)|EF_FEXPR_TILDE)==EF_FEXPR_TILDE) #define SET_EXPR(x) (x)->exp_flags |= EF_EXPR; \ (x)->exp_flags &= ~EF_EXPR_TILDE; \ (x)->exp_flags &= ~EF_FEXPR_TILDE; #define SET_EXPR_TILDE(x) (x)->exp_flags &= ~EF_EXPR; \ (x)->exp_flags |= EF_EXPR_TILDE; \ (x)->exp_flags &= ~EF_FEXPR_TILDE; #define SET_FEXPR_TILDE(x) (x)->exp_flags &= ~EF_EXPR; \ (x)->exp_flags &= ~EF_EXPR_TILDE; \ (x)->exp_flags |= EF_FEXPR_TILDE; /* * defines for expr_error */ #define EE_DZ 0x01 /* divide by zero error */ #define EE_BI_OUTPUT 0x02 /* Bad output index */ #define EE_BI_INPUT 0x04 /* Bad input index */ #define EE_NOTABLE 0x08 /* NO TABLE */ #define EE_NOVAR 0x10 /* NO VARIABLE */ typedef struct expr { #ifdef PD t_object exp_ob; #else /* MSP */ t_pxobject exp_ob; #endif int exp_flags; /* are we expr~, fexpr~, or expr */ int exp_error; /* reported errors */ int exp_nexpr; /* number of expressions */ char *exp_string; /* the full expression string */ char *exp_str; /* current parsing position */ t_outlet *exp_outlet[MAX_VARS]; #ifdef PD struct _exprproxy *exp_proxy; #else /* MAX */ void *exp_proxy[MAX_VARS]; long exp_proxy_id; #endif struct ex_ex *exp_stack[MAX_VARS]; struct ex_ex exp_var[MAX_VARS]; struct ex_ex exp_res[MAX_VARS]; /* the evluation result */ t_float *exp_p_var[MAX_VARS]; t_float *exp_p_res[MAX_VARS]; /* the previous evaluation result */ t_float *exp_tmpres[MAX_VARS]; /* temporty result for fexpr~ */ int exp_vsize; /* the size of the signal vector */ int exp_nivec; /* # of vector inlets */ float exp_f; /* control value to be transformed to signal */ } t_expr; typedef struct ex_funcs { char *f_name; /* function name */ void (*f_func)(t_expr *, long, struct ex_ex *, struct ex_ex *); /* the real function performing the function (void, no return!!!) */ long f_argc; /* number of arguments */ } t_ex_func; /* function prototypes for pd-related functions called withing vexp.h */ extern int max_ex_tab(struct expr *expr, t_symbol *s, struct ex_ex *arg, struct ex_ex *optr); extern int max_ex_var(struct expr *expr, t_symbol *s, struct ex_ex *optr); extern int ex_getsym(char *p, t_symbol **s); extern const char *ex_symname(t_symbol *s); void ex_mkvector(t_float *fp, t_float x, int size); extern void ex_size(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); extern void ex_sum(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); extern void ex_Sum(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); extern void ex_avg(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); extern void ex_Avg(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); extern void ex_store(t_expr *expr, long int argc, struct ex_ex *argv, struct ex_ex *optr); int value_getonly(t_symbol *s, t_float *f); #ifdef NT #pragma warning (disable: 4305 4244) #define abort ABORT void ABORT(void); #endif

1 0

pd/extra/bonk~ bonk~.c, NONE, 1.3.4.2 makefile, NONE, 1.6.8.2 templates.txt, NONE, 1.2.22.2
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra/bonk~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21746/bonk~ Added Files: Tag: devel_0_39 bonk~.c makefile templates.txt Log Message: missing extra files --- NEW FILE: bonk~.c --- /* Copyright 1997-1999 Miller Puckette (msp(a)ucsd.edu) and Ted Apel (tapel(a)ucsd.edu). Permission is granted to use this software for any noncommercial purpose. For commercial licensing please contact the UCSD Technology Transfer Office. THE AUTHORS AND THEIR EMPLOYERS MAKE NO WARRANTY, EXPRESS OR IMPLIED, IN CONNECTION WITH THIS SOFTWARE! */ #include <math.h> #include <stdio.h> #ifdef NT #pragma warning (disable: 4305 4244) #endif #ifdef MSP #include "ext.h" [...1038 lines suppressed...] /* get current system time */ double clock_getsystime() { return gettime(); } /* elapsed time in milliseconds since the given system time */ double clock_gettimesince(double prevsystime) { return ((gettime() - prevsystime)); } float qrsqrt(float f) { return 1/sqrt(f); } #endif /* MSP */ --- NEW FILE: templates.txt --- 10.47 9.65 14.95 23.77 28.32 38.84 53.21 41.20 31.25 21.70 16.48 6.52 13.93 27.82 58.05 24.11 35.26 35.98 37.78 22.54 13.56 10.75 30.45 28.86 29.42 21.94 29.92 35.70 38.49 32.01 28.19 27.38 22.10 66.77 46.27 28.82 25.95 22.84 20.61 20.33 14.18 6.86 8.92 7.37 --- NEW FILE: makefile --- NAME=bonk~ CSYM=bonk_tilde current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\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 # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations

1 0

pd/extra/choice choice.c, NONE, 1.2.4.2 makefile, NONE, 1.2.8.2
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra/choice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21746/choice Added Files: Tag: devel_0_39 choice.c makefile Log Message: missing extra files --- NEW FILE: choice.c --- /* choice -- match incoming list against a collection of stored templates. */ /* Copyright 1999 Miller Puckette. Permission is granted to use this software for any purpose provided you keep this copyright notice intact. THE AUTHOR AND HIS EMPLOYERS MAKE NO WARRANTY, EXPRESS OR IMPLIED, IN CONNECTION WITH THIS SOFTWARE. This file is downloadable from http://www.crca.ucsd.edu/~msp . */ #include "m_pd.h" #include <math.h> static t_class *choice_class; #define DIMENSION 10 typedef struct _elem { float e_age; float e_weight[DIMENSION]; } t_elem; typedef struct _choice { t_object x_obj; t_elem *x_vec; int x_n; int x_nonrepeat; } t_choice; static void *choice_new(t_float fnonrepeat) { t_choice *x = (t_choice *)pd_new(choice_class); outlet_new(&x->x_obj, gensym("float")); x->x_vec = (t_elem *)getbytes(0); x->x_n = 0; x->x_nonrepeat = (fnonrepeat != 0); return (x); } static void choice_clear(t_choice *x) { x->x_vec = (t_elem *)resizebytes(x->x_vec, x->x_n * sizeof(t_elem), 0); x->x_n = 0; } static void choice_print(t_choice *x) { int j; for (j = 0; j < x->x_n; j++) { t_elem *e = x->x_vec + j; t_float *w = e->e_weight; post("%2d age %2d \ w %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f %5.2f", j, (int)(e->e_age), w[0], w[1], w[2], w[3], w[4], w[5], w[6], w[7], w[8], w[9]); } } static void choice_add(t_choice *x, t_symbol *s, int argc, t_atom *argv) { int oldn = x->x_n, newn = oldn + 1, i; t_elem *e; float sum, normal; x->x_vec = (t_elem *)resizebytes(x->x_vec, oldn * sizeof(t_elem), newn * sizeof(t_elem)); x->x_n = newn; e = x->x_vec + oldn; e->e_age = 2; for (i = 0, sum = 0; i < DIMENSION; i++) { float f = atom_getfloatarg(i, argc, argv); e->e_weight[i] = f; sum += f*f; } normal = (float)(sum > 0 ? 1./sqrt(sum) : 1); for (i = 0; i < DIMENSION; i++) e->e_weight[i] *= normal; } static void choice_list(t_choice *x, t_symbol *s, int argc, t_atom *argv) { int i, j; float bestsum = 0; int bestindex = -1; t_float invec[DIMENSION]; for (i = 0; i < DIMENSION; i++) invec[i] = atom_getfloatarg(i, argc, argv); for (j = 0; j < x->x_n; j++) { t_elem *e = x->x_vec + j; float sum; for (i = 0, sum = 0; i < DIMENSION; i++) sum += e->e_weight[i] * invec[i]; if (x->x_nonrepeat) sum *= (float)(log(e->e_age)); if (sum > bestsum) { bestsum = sum; sum = 1; bestindex = j; } } if (bestindex >= 0) { for (j = 0; j < x->x_n; j++) x->x_vec[j].e_age += 1.; x->x_vec[bestindex].e_age = 1; } outlet_float(x->x_obj.ob_outlet, (float)bestindex); } static void choice_free(t_choice *x) { freebytes(x->x_vec, x->x_n * sizeof(t_elem)); } void choice_setup(void) { choice_class = class_new(gensym("choice"), (t_newmethod)choice_new, (t_method)choice_free, sizeof(t_choice), 0, A_DEFFLOAT, 0); class_addmethod(choice_class, (t_method)choice_add, gensym("add"), A_GIMME, 0); class_addmethod(choice_class, (t_method)choice_clear, gensym("clear"), 0); class_addmethod(choice_class, (t_method)choice_print, gensym("print"), 0); class_addlist(choice_class, choice_list); } --- NEW FILE: makefile --- NAME=choice CSYM=choice current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\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 # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- pd_darwin: $(NAME).pd_darwin .SUFFIXES: .pd_darwin DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.pd_darwin: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations

1 0

pd/extra SConscript,NONE,1.1.2.1
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32406 Added Files: Tag: devel_0_39 SConscript Log Message: scons build system for externals --- NEW FILE: SConscript --- Import("pdenv") extra_env = pdenv.Copy() extra_env['SHLIBPREFIX']='' if extra_env['PLATFORM'] == 'darwin': extra_env['SHLIBSUFFIX']='.pd_darwin' elif extra_env['PLATFORM'] == 'posix': extra_env['SHLIBSUFFIX']='.pd_linux' extra_env.Append(CPPPATH='../src') extra_env.Append(CPPDEFINES='PD') extras = [] for extra in Split("bonk~ choice fiddle~ loop~ lrshift~ pique"): extras.append(extra_env.SharedLibrary(extra, extra+'/'+extra+'.c')) for extra in Split("expr expr~ fexpr~"): extras.append(extra_env.SharedLibrary(extra, map(lambda x: 'expr~/'+x+'.c', Split("vexp vexp_fun vexp_if")))) Default(extras) Return("extras")

1 0

[PD-cvs] pd/src g_numbox.c, 1.4.8.1, 1.4.8.2 m_sched.c, 1.5.4.35.2.4, 1.5.4.35.2.5 s_audio_jack.c, 1.5.4.8.2.2, 1.5.4.8.2.3 s_inter.c, 1.5.4.10.2.4, 1.5.4.10.2.5 s_main.c, 1.7.4.17.2.3, 1.7.4.17.2.4 s_midi.c, 1.4.4.1.2.1, 1.4.4.1.2.2 u_main.tk, 1.4.4.10.2.5, 1.4.4.10.2.6 x_connective.c, 1.3.4.1.2.2, 1.3.4.1.2.3
by Tim Blechmann 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32725 Modified Files: Tag: devel_0_39 g_numbox.c m_sched.c s_audio_jack.c s_inter.c s_main.c s_midi.c u_main.tk x_connective.c Log Message: - updating to miller's 0.39-test4 - runtime selection of simd function for jack callback - run clock callbacks after each audio callback Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.3 retrieving revision 1.7.4.17.2.4 diff -C2 -d -r1.7.4.17.2.3 -r1.7.4.17.2.4 *** s_main.c 13 Jul 2005 22:49:39 -0000 1.7.4.17.2.3 --- s_main.c 16 Jul 2005 11:02:37 -0000 1.7.4.17.2.4 *************** *** 8,12 **** */ ! char pd_version[] = "Pd version 0.39 TEST 3 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 8,12 ---- */ ! char pd_version[] = "Pd version 0.39 TEST 4 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; *************** *** 489,493 **** char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp; char *lastslash; ! #if UNISTD struct stat statbuf; #endif --- 489,493 ---- char sbuf[MAXPDSTRING], sbuf2[MAXPDSTRING], *sp; char *lastslash; ! #ifdef UNISTD struct stat statbuf; #endif *************** *** 874,878 **** { sys_printtostderr = 1; - fprintf(stderr, "set it\n"); argc--; argv++; } --- 874,877 ---- Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.4.4.10.2.5 retrieving revision 1.4.4.10.2.6 diff -C2 -d -r1.4.4.10.2.5 -r1.4.4.10.2.6 *** u_main.tk 12 Jul 2005 15:11:12 -0000 1.4.4.10.2.5 --- u_main.tk 16 Jul 2005 11:02:37 -0000 1.4.4.10.2.6 *************** *** 339,346 **** global pd_guidir global pd_myversion ! global pd_font3 set name [format ".help%d" $doc_number] toplevel $name ! text $name.text -relief raised -bd 2 -font $pd_font3 \ -yscrollcommand "$name.scroll set" -background white scrollbar $name.scroll -command "$name.text yview" --- 339,346 ---- global pd_guidir global pd_myversion ! # global pd_font3 set name [format ".help%d" $doc_number] toplevel $name ! text $name.text -relief raised -bd 2 -font -*-times-regular--normal--14-* \ -yscrollcommand "$name.scroll set" -background white scrollbar $name.scroll -command "$name.text yview" *************** *** 3119,3123 **** text $name.text -relief raised -bd 2 -height 40 -width 60 \ ! -yscrollcommand "$name.scroll set" -font pd_font3 scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y --- 3119,3123 ---- text $name.text -relief raised -bd 2 -height 40 -width 60 \ ! -yscrollcommand "$name.scroll set" -font $pd_font3 scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y *************** *** 3702,3706 **** } ! ####################### midi dialog ##################3 proc midi_apply {id} { --- 3702,3706 ---- } ! ####################### midi dialog ################## proc midi_apply {id} { *************** *** 3757,3761 **** proc pdtk_midi_dialog {id indevlist indev1 indev2 indev3 indev4 \ ! outdevlist outdev1 outdev2 outdev3 outdev4 longform alsa} { global midi_indev1 midi_indev2 midi_indev3 midi_indev4 global midi_outdev1 midi_outdev2 midi_outdev3 midi_outdev4 --- 3757,3761 ---- proc pdtk_midi_dialog {id indevlist indev1 indev2 indev3 indev4 \ ! outdevlist outdev1 outdev2 outdev3 outdev4 longform} { global midi_indev1 midi_indev2 midi_indev3 midi_indev4 global midi_outdev1 midi_outdev2 midi_outdev3 midi_outdev4 *************** *** 3792,3800 **** pack $id.buttonframe.ok -side left -expand 1 frame $id.in1f pack $id.in1f -side top - if {$alsa == 0} { - # input device 1 label $id.in1f.l1 -text "input device 1:" button $id.in1f.x1 -text [lindex $indevlist $midi_indev1] \ --- 3792,3799 ---- pack $id.buttonframe.ok -side left -expand 1 + # input device 1 frame $id.in1f pack $id.in1f -side top label $id.in1f.l1 -text "input device 1:" button $id.in1f.x1 -text [lindex $indevlist $midi_indev1] \ *************** *** 3883,3900 **** frame $id.longbutton pack $id.longbutton -side top ! button $id.longbutton.b -text {use multiple alsa devices} \ -command {pd pd midi-properties 1 \;} pack $id.longbutton.b } } - if {$alsa} { - label $id.in1f.l1 -text "In Channels:" - entry $id.in1f.x1 -textvariable midi_alsain -width 4 - pack $id.in1f.l1 $id.in1f.x1 -side left - label $id.in1f.l2 -text "Out Channels:" - entry $id.in1f.x2 -textvariable midi_alsaout -width 4 - pack $id.in1f.l2 $id.in1f.x2 -side left - } - } proc pdtk_alsa_midi_dialog {id indevlist indev1 indev2 indev3 indev4 \ --- 3882,3890 ---- frame $id.longbutton pack $id.longbutton -side top ! button $id.longbutton.b -text {use multiple devices} \ -command {pd pd midi-properties 1 \;} pack $id.longbutton.b } } proc pdtk_alsa_midi_dialog {id indevlist indev1 indev2 indev3 indev4 \ Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.4 retrieving revision 1.5.4.10.2.5 diff -C2 -d -r1.5.4.10.2.4 -r1.5.4.10.2.5 *** s_inter.c 14 Jul 2005 23:17:33 -0000 1.5.4.10.2.4 --- s_inter.c 16 Jul 2005 11:02:37 -0000 1.5.4.10.2.5 *************** *** 21,24 **** --- 21,25 ---- #include <sys/time.h> #include <sys/mman.h> + #include <sys/resource.h> #endif #ifdef HAVE_BSTRING_H *************** *** 1081,1084 **** --- 1082,1088 ---- char *homedir = getenv("HOME"), filename[250]; struct stat statbuf; + sprintf(filename, "%s/../../MacOS/Pd", guidir); + if (stat(filename, &statbuf) >= 0) + goto foundit; if (!homedir || strlen(homedir) > 150) goto nohomedir; *************** *** 1095,1108 **** nohomedir: strcpy(filename, - "/System/Library/Frameworks/Tk.Framework/Resources/Wish Shell.app/Contents/MacOS/Wish Shell"); - if (stat(filename, &statbuf) >= 0) - goto foundit; - - strcpy(filename, - "/Library/Frameworks/Tk.Framework/Resources/Wish Shell.app/Contents/MacOS/Wish Shell"); - if (stat(filename, &statbuf) >= 0) - goto foundit; - - strcpy(filename, "/Applications/Utilities/Wish Shell.app/Contents/MacOS/Wish Shell"); if (stat(filename, &statbuf) >= 0) --- 1099,1102 ---- Index: x_connective.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v retrieving revision 1.3.4.1.2.2 retrieving revision 1.3.4.1.2.3 diff -C2 -d -r1.3.4.1.2.2 -r1.3.4.1.2.3 *** x_connective.c 12 Jul 2005 15:11:13 -0000 1.3.4.1.2.2 --- x_connective.c 16 Jul 2005 11:02:38 -0000 1.3.4.1.2.3 *************** *** 523,528 **** { float f; ! if (!argc) { ! /* JMZ: no args: treat as "bang" and thus reject */ outlet_bang(x->x_rejectout); return; --- 523,528 ---- { float f; ! if (!argc) /* empty lists go out reject outlet */ ! { outlet_bang(x->x_rejectout); return; *************** *** 621,625 **** int n; t_routeelement *e; ! t_route *x = (t_route *)pd_new(route_class); t_atom a; if (argc == 0) --- 621,626 ---- int n; t_routeelement *e; ! t_route *x; ! t_atom a; if (argc == 0) *************** *** 629,655 **** argv = &a; } x->x_type = argv[0].a_type; x->x_nelement = argc; - - /* JMZ: type checking: arguments must bei either floats xor symbols */ - if (x->x_type == A_FLOAT) - { - for(n=0; n<argc; n++) - if (argv[n].a_type!=A_FLOAT) - { - pd_error(x, "route: cannot route floats and symbols at the same time"); - return 0; - } - } - else - { - for(n=0; n<argc; n++) - if(argv[n].a_type==A_FLOAT) - { - pd_error(x, "route: cannot route symbols and floats at the same time"); - return 0; - } - } - x->x_vec = (t_routeelement *)getbytes(argc * sizeof(*x->x_vec)); for (n = 0, e = x->x_vec; n < argc; n++, e++) --- 630,642 ---- argv = &a; } + for (n = 1; n < argc; n++) + if (argv[n].a_type != argv[0].a_type) + { + error("route: creation with mixed argument types failed"); + return (0); + } + x = (t_route *)pd_new(route_class); x->x_type = argv[0].a_type; x->x_nelement = argc; x->x_vec = (t_routeelement *)getbytes(argc * sizeof(*x->x_vec)); for (n = 0, e = x->x_vec; n < argc; n++, e++) *************** *** 1033,1054 **** t_triggerout *u; int i; - t_atom at; - if (!argc) - { - argc = 1; - SETFLOAT(&at, 0); - argv = &at; - } for (i = x->x_n, u = x->x_vec + i; u--, i--;) { if (u->u_type == TR_FLOAT) ! outlet_float(u->u_outlet, atom_getfloat(argv)); else if (u->u_type == TR_BANG) outlet_bang(u->u_outlet); else if (u->u_type == TR_SYMBOL) ! outlet_symbol(u->u_outlet, atom_getsymbol(argv)); else if (u->u_type == TR_POINTER) { ! if (argv->a_type != TR_POINTER) pd_error(x, "unpack: bad pointer"); else outlet_pointer(u->u_outlet, argv->a_w.w_gpointer); --- 1020,1034 ---- t_triggerout *u; int i; for (i = x->x_n, u = x->x_vec + i; u--, i--;) { if (u->u_type == TR_FLOAT) ! outlet_float(u->u_outlet, (argc ? atom_getfloat(argv) : 0)); else if (u->u_type == TR_BANG) outlet_bang(u->u_outlet); else if (u->u_type == TR_SYMBOL) ! outlet_symbol(u->u_outlet, (argc ? atom_getsymbol(argv) : 0)); else if (u->u_type == TR_POINTER) { ! if (!argc || argv->a_type != TR_POINTER) pd_error(x, "unpack: bad pointer"); else outlet_pointer(u->u_outlet, argv->a_w.w_gpointer); Index: s_midi.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v retrieving revision 1.4.4.1.2.1 retrieving revision 1.4.4.1.2.2 diff -C2 -d -r1.4.4.1.2.1 -r1.4.4.1.2.2 *** s_midi.c 12 Jul 2005 15:11:11 -0000 1.4.4.1.2.1 --- s_midi.c 16 Jul 2005 11:02:37 -0000 1.4.4.1.2.2 *************** *** 704,708 **** "pdtk_midi_dialog %%s \ %s %d %d %d %d %s %d %d %d %d \ ! %d 0\n", indevliststring, midiindev1, midiindev2, midiindev3, midiindev4, --- 704,708 ---- "pdtk_midi_dialog %%s \ %s %d %d %d %d %s %d %d %d %d \ ! %d\n", indevliststring, midiindev1, midiindev2, midiindev3, midiindev4, Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.8.2.2 retrieving revision 1.5.4.8.2.3 diff -C2 -d -r1.5.4.8.2.2 -r1.5.4.8.2.3 *** s_audio_jack.c 14 Jul 2005 23:17:33 -0000 1.5.4.8.2.2 --- s_audio_jack.c 16 Jul 2005 11:02:37 -0000 1.5.4.8.2.3 *************** *** 93,96 **** --- 93,97 ---- if (canvas_dspstate == 0) { + /* dsp is switched off, the audio is open ... */ for (j = 0; j < sys_outchannels; j++) { *************** *** 98,103 **** zeroblock(out, dspticks_per_jacktick * sys_dacblocksize); } - - sys_time += sys_time_per_dsp_tick; return 0; } --- 99,102 ---- *************** *** 120,124 **** return 0; } ! for (i = 0; i != dspticks_per_jacktick; ++i) { --- 119,123 ---- return 0; } ! for (i = 0; i != dspticks_per_jacktick; ++i) { *************** *** 127,143 **** { t_sample * in = jack_port_get_buffer(input_port[j], nframes); ! copyvec_simd(sys_soundin + j * sys_dacblocksize, ! in + i * sys_dacblocksize, ! sys_dacblocksize); } /* run dsp */ sched_tick(sys_time + sys_time_per_dsp_tick); ! /* send sound to the output */ for (j = 0; j < sys_outchannels; j++) { t_sample * out = jack_port_get_buffer (output_port[j], nframes); ! copyvec_simd(out + i * sys_dacblocksize, sys_soundout + j * sys_dacblocksize, sys_dacblocksize); --- 126,142 ---- { t_sample * in = jack_port_get_buffer(input_port[j], nframes); ! copyblock(sys_soundin + j * sys_dacblocksize, ! in + i * sys_dacblocksize, ! sys_dacblocksize); } /* run dsp */ sched_tick(sys_time + sys_time_per_dsp_tick); ! /* send sound to the output */ for (j = 0; j < sys_outchannels; j++) { t_sample * out = jack_port_get_buffer (output_port[j], nframes); ! copyblock(out + i * sys_dacblocksize, sys_soundout + j * sys_dacblocksize, sys_dacblocksize); *************** *** 149,153 **** /* clear the output buffer */ ! zerovec_simd(sys_soundout, j * sys_dacblocksize); } --- 148,152 ---- /* clear the output buffer */ ! zeroblock(sys_soundout, j * sys_dacblocksize); } *************** *** 363,366 **** --- 362,378 ---- jack_scheduler = scheduler; + + /* set block copy/zero functions */ + if(SIMD_CHKCNT(sys_dacblocksize) && simd_runtime_check()) + { + copyblock = (void (*)(t_sample *,t_sample *,int))&copyvec_simd; + zeroblock = &zerovec_simd; + } + else + { + copyblock = (void (*)(t_sample *,t_sample *,int))&copyvec; + zeroblock = &zerovec; + } + /* try to become a client of the JACK server (we allow two pd's)*/ if (!jack_client) { *************** *** 384,391 **** */ if (scheduler == 1) jack_set_process_callback (jack_client, cb_process, 0); else jack_set_process_callback (jack_client, process, 0); ! jack_set_error_function (jack_error); --- 396,408 ---- */ if (scheduler == 1) + { + dspticks_per_jacktick = jack_get_buffer_size(jack_client) + / sys_schedblocksize; jack_set_process_callback (jack_client, cb_process, 0); + } else jack_set_process_callback (jack_client, process, 0); ! ! jack_set_error_function (jack_error); *************** *** 462,468 **** } - if (scheduler) - dspticks_per_jacktick = jack_get_buffer_size(jack_client) - / sys_schedblocksize; /* tb: get advance from jack server */ --- 479,482 ---- *************** *** 470,485 **** * 1000. / sys_dacsr * 1000; - /* set block copy/zero functions */ - if(SIMD_CHKCNT(sys_dacblocksize) && simd_runtime_check()) - { - copyblock = (void (*)(t_sample *,t_sample *,int))&copyvec_simd; - zeroblock = &zerovec_simd; - } - else - { - copyblock = (void (*)(t_sample *,t_sample *,int))&copyvec; - zeroblock = &zerovec; - } - return 0; --- 484,487 ---- Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.4.8.1 retrieving revision 1.4.8.2 diff -C2 -d -r1.4.8.1 -r1.4.8.2 *** g_numbox.c 12 Jul 2005 15:11:08 -0000 1.4.8.1 --- g_numbox.c 16 Jul 2005 11:02:36 -0000 1.4.8.2 *************** *** 37,41 **** static void my_numbox_tick_reset(t_my_numbox *x) { ! if(x->x_gui.x_fsf.x_change && x->x_gui.x_glist) { x->x_gui.x_fsf.x_change = 0; --- 37,41 ---- static void my_numbox_tick_reset(t_my_numbox *x) { ! if(x->x_gui.x_fsf.x_change && x->x_gui.x_glist) { x->x_gui.x_fsf.x_change = 0; Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.4 retrieving revision 1.5.4.35.2.5 diff -C2 -d -r1.5.4.35.2.4 -r1.5.4.35.2.5 *** m_sched.c 14 Jul 2005 23:17:33 -0000 1.5.4.35.2.4 --- m_sched.c 16 Jul 2005 11:02:37 -0000 1.5.4.35.2.5 *************** *** 438,444 **** ! static int run_clock_callbacks(double next_sys_time) { ! if (clock_setlist && clock_setlist->c_settime < next_sys_time) { do --- 438,444 ---- ! static void run_clock_callbacks(double next_sys_time) { ! if (clock_setlist && clock_setlist->c_settime <= next_sys_time) { do *************** *** 448,459 **** outlet_setstacklim(); (*c->c_fn)(c->c_owner); - if (sys_quit) - break; } while (clock_setlist && clock_setlist->c_settime <= next_sys_time); - return 1; } - else - return 0; } --- 448,454 ---- *************** *** 466,469 **** --- 461,466 ---- dsp_tick(); + run_clock_callbacks(next_sys_time); + /* rethink: should we really do all this midi messaging in the realtime thread ? */ sys_pollmidiqueue(); *************** *** 551,555 **** { sched_tick(sys_time + sys_time_per_dsp_tick); - run_clock_callbacks(sys_time); } if (timeforward == SENDDACS_YES) --- 548,551 ---- *************** *** 587,593 **** sys_setmiditimediff(0, 1e-6 * sys_schedadvance); - if (run_clock_callbacks(sys_time)) - continue; - if (sys_pollgui()) continue; --- 583,586 ----

1 0

externals/arraysize arraysize-help.pd,1.1,1.2
by Hans-Christoph Steiner 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/externals/arraysize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19334 Modified Files: arraysize-help.pd Log Message: added [set( msg Index: arraysize-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/arraysize/arraysize-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** arraysize-help.pd 11 Apr 2004 19:06:39 -0000 1.1 --- arraysize-help.pd 16 Jul 2005 05:44:23 -0000 1.2 *************** *** 1,4 **** ! #N canvas 0 0 450 300 10; ! #N canvas 0 0 450 300 graph1 0; #X array test 100 float 0; #X coords 0 1 99 -1 200 140 1; --- 1,4 ---- ! #N canvas 359 162 460 292 10; ! #N canvas 0 22 450 300 graph1 0; #X array test 100 float 0; #X coords 0 1 99 -1 200 140 1; *************** *** 9,12 **** --- 9,21 ---- #X text 24 205 arraysize returns the size of an array when banged. ; + #X floatatom 22 173 5 0 0 0 - - -; + #X msg 22 122 bang; + #X obj 22 149 arraysize; + #X msg 65 122 set test; + #X obj 228 244 pddp_open all_about_arrays; + #X text 124 243 For more info:; #X connect 1 0 2 0; #X connect 3 0 1 0; + #X connect 6 0 7 0; + #X connect 7 0 5 0; + #X connect 8 0 7 0;

1 0

pd/doc/5.reference vcf~-help.pd,1.1.1.1,1.2
by Miller Puckette 16 Jul '05

16 Jul '05

Update of /cvsroot/pure-data/pd/doc/5.reference In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22063/pd/doc/5.reference Modified Files: vcf~-help.pd Log Message: fixed bugs, adopted some patches. Index: vcf~-help.pd =================================================================== RCS file: /cvsroot/pure-data/pd/doc/5.reference/vcf~-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vcf~-help.pd 9 May 2003 16:03:48 -0000 1.1.1.1 --- vcf~-help.pd 16 Jul 2005 01:43:18 -0000 1.2 *************** *** 5,19 **** #X text 92 144 test frequency; #X text 224 340 amp out (db); - #X obj 220 264 vcf~; #X text 246 144 center frequency; #X text 374 184 q; ! #X floatatom 122 168 5 0 0; ! #X floatatom 257 171 5 0 0; #X obj 122 193 osc~; ! #X floatatom 353 203 5 0 0; #X obj 122 291 env~ 8192; #X obj 220 290 env~ 8192; ! #X floatatom 121 318 5 0 0; ! #X floatatom 220 319 5 0 0; #X obj 80 13 vcf~; #X text 135 13 -- voltage-controlled bandpass filter; --- 5,18 ---- #X text 92 144 test frequency; #X text 224 340 amp out (db); #X text 246 144 center frequency; #X text 374 184 q; ! #X floatatom 122 168 5 0 0 0 - - -; ! #X floatatom 257 171 5 0 0 0 - - -; #X obj 122 193 osc~; ! #X floatatom 353 203 5 0 0 0 - - -; #X obj 122 291 env~ 8192; #X obj 220 290 env~ 8192; ! #X floatatom 121 318 5 0 0 0 - - -; ! #X floatatom 220 319 5 0 0 0 - - -; #X obj 80 13 vcf~; #X text 135 13 -- voltage-controlled bandpass filter; *************** *** 25,35 **** The "Q" or filter sharpness is still only set by messages. More expensive than bp~ in CPU time but more powerful too.; ! #X connect 0 0 5 1; ! #X connect 5 0 13 0; ! #X connect 8 0 10 0; ! #X connect 9 0 0 0; ! #X connect 10 0 5 0; ! #X connect 10 0 12 0; ! #X connect 11 0 5 2; #X connect 12 0 14 0; ! #X connect 13 0 15 0; --- 24,36 ---- The "Q" or filter sharpness is still only set by messages. More expensive than bp~ in CPU time but more powerful too.; ! #X obj 220 264 vcf~ 1; ! #X text 286 264 optional argument to initialize q; ! #X connect 0 0 21 1; ! #X connect 7 0 9 0; ! #X connect 8 0 0 0; ! #X connect 9 0 11 0; ! #X connect 9 0 21 0; ! #X connect 10 0 21 2; ! #X connect 11 0 13 0; #X connect 12 0 14 0; ! #X connect 21 0 12 0;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

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 July 2005