diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-08-27 22:27:30 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2008-08-27 22:27:30 +0000 |
commit | 32e228d1ca60d479025f5c10479ac866208e11ae (patch) | |
tree | cf385e8307a13586f2f4914c87830931cd98183e | |
parent | 709180b16be4653de4f57964b653737c3254a0fd (diff) |
merged in relevant changes from the v0-40 pd-extended release branch
svn path=/trunk/externals/creb/; revision=10266
-rw-r--r-- | Makefile | 11 | ||||
-rw-r--r-- | Makefile.config.in | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | README.darcs | 11 | ||||
-rw-r--r-- | README.extcvs | 16 | ||||
-rw-r--r-- | abs/rms~.pd | 8 | ||||
-rw-r--r-- | bootstrap | 3 | ||||
-rw-r--r-- | doc/bdiag~-help.pd (renamed from doc/bdiag~.pd) | 0 | ||||
-rw-r--r-- | doc/bfft~-help.pd (renamed from doc/bfft~.pd) | 0 | ||||
-rw-r--r-- | doc/biquadseries~-help.pd (renamed from doc/biquadseries~.pd) | 0 | ||||
-rw-r--r-- | doc/bitsplit~-help.pd (renamed from doc/bitsplit~.pd) | 0 | ||||
-rw-r--r-- | doc/blocknorm~-help.pd (renamed from doc/blocknorm~.pd) | 0 | ||||
-rw-r--r-- | doc/blosc~-help.pd (renamed from doc/blosc~.pd) | 0 | ||||
-rw-r--r-- | doc/bmatrix~-help.pd (renamed from doc/bmatrix~.pd) | 0 | ||||
-rw-r--r-- | doc/bwin~-help.pd (renamed from doc/bwin~.pd) | 0 | ||||
-rw-r--r-- | doc/cheby~-help.pd (renamed from doc/cheby~.pd) | 0 | ||||
-rw-r--r-- | doc/clog~-help.pd (renamed from doc/clog~.pd) | 0 | ||||
-rw-r--r-- | doc/dist~-help.pd (renamed from doc/dist~.pd) | 0 | ||||
-rw-r--r-- | doc/dwt~-help.pd (renamed from doc/dwt~.pd) | 0 | ||||
-rw-r--r-- | doc/dynwav~-help.pd (renamed from doc/dynwav~.pd) | 0 | ||||
-rw-r--r-- | doc/eadsr~-help.pd (renamed from doc/eadsr~.pd) | 0 | ||||
-rw-r--r-- | doc/ead~-help.pd (renamed from doc/ead~.pd) | 0 | ||||
-rw-r--r-- | doc/ear~-help.pd (renamed from doc/ear~.pd) | 0 | ||||
-rw-r--r-- | doc/fdn~-help.pd (renamed from doc/fdn~.pd) | 0 | ||||
-rw-r--r-- | doc/ffpoly-help.pd (renamed from doc/ffpoly.pd) | 0 | ||||
-rw-r--r-- | doc/filterortho~-help.pd (renamed from doc/filterortho~.pd) | 0 | ||||
-rw-r--r-- | doc/fwarp-help.pd (renamed from doc/fwarp.pd) | 0 | ||||
-rw-r--r-- | doc/junction~-help.pd (renamed from doc/junction~.pd) | 0 | ||||
-rw-r--r-- | doc/lattice~-help.pd (renamed from doc/lattice~.pd) | 0 | ||||
-rw-r--r-- | doc/matrix~-help.pd (renamed from doc/matrix~.pd) | 0 | ||||
-rw-r--r-- | doc/permut~-help.pd (renamed from doc/permut~.pd) | 0 | ||||
-rw-r--r-- | doc/qmult~-help.pd (renamed from doc/qmult~.pd) | 0 | ||||
-rw-r--r-- | doc/qnorm~-help.pd (renamed from doc/qnorm~.pd) | 0 | ||||
-rw-r--r-- | doc/ratio-help.pd (renamed from doc/ratio.pd) | 0 | ||||
-rw-r--r-- | doc/resofilt~-help.pd (renamed from doc/resofilt~.pd) | 0 | ||||
-rw-r--r-- | doc/sbosc~-help.pd (renamed from doc/sbosc~.pd) | 0 | ||||
-rw-r--r-- | doc/scrollgrid1D~-help.pd (renamed from doc/scrollgrid1D~.pd) | 0 | ||||
-rw-r--r-- | doc/tabreadmix~-help.pd (renamed from doc/tabreadmix~.pd) | 0 | ||||
-rw-r--r-- | doc/xfm~-help.pd (renamed from doc/xfm~.pd) | 0 | ||||
-rw-r--r-- | modules++/biquadseries~.cc (renamed from modules++/biquadseries.cc) | 0 | ||||
-rw-r--r-- | modules++/blosc~.cc (renamed from modules++/blosc.cc) | 19 | ||||
-rw-r--r-- | modules++/filterortho~.cc (renamed from modules++/filterortho.cc) | 0 | ||||
-rw-r--r-- | modules/bmatrix~.c (renamed from modules/matrix~.c) | 0 | ||||
-rw-r--r-- | modules/bwin~.c (renamed from modules/window~.c) | 13 | ||||
-rw-r--r-- | modules/cmath~.c | 16 | ||||
-rw-r--r-- | modules/dwt~.c | 4 | ||||
-rw-r--r-- | modules/ffpoly.c | 2 |
47 files changed, 75 insertions, 32 deletions
@@ -27,3 +27,14 @@ install: install -m 644 doc/*.pd $(prefix)/lib/pd/doc/5.reference install -d $(prefix)/lib/pd/doc/creb install -m 644 doc/examples/*.pd $(prefix)/lib/pd/doc/creb + + +bootstrap: + . bootstrap + +# snapshot after release +snapshot: bootstrap + bin/dist-snapshot -d + +# to make a release, increment the version number in darcs and run +# bin/dist-snapshot diff --git a/Makefile.config.in b/Makefile.config.in index 6ba5eb6..204525c 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -7,7 +7,7 @@ CREB_VERSION = 0.9.2 DEFS = -DPD -DCREB_VERSION=\"$(CREB_VERSION)\" CFLAGS = $(DEFS) -O2 -funroll-loops -fomit-frame-pointer \ - -Wall -W -Wstrict-prototypes -Werror \ + -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch # -Wshadow INCLUDE = -I$(PD_INCLUDE_DIR) -I../include -I../include/dspi @@ -1,7 +1,7 @@ CREB - compl. red. ext. blk. some externals for pure data -Copyright (c) by Tom Schouten <creb@zzz.kotnet.org> +Copyright (c) by Tom Schouten <tom@zwizwa.be> 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 diff --git a/README.darcs b/README.darcs new file mode 100644 index 0000000..774657e --- /dev/null +++ b/README.darcs @@ -0,0 +1,11 @@ +to update type + + darcs pull + +after getting/pulling, do + + . bootstrap + +this will generate the configure scripts, so you can + + ./configure && make diff --git a/README.extcvs b/README.extcvs new file mode 100644 index 0000000..0f8bbc0 --- /dev/null +++ b/README.extcvs @@ -0,0 +1,16 @@ + +NOTE FOR THE PURE DATA EXTERNALS CVS + +if you need to change anything to the source files here, let me know at <tom@zwizwa.be> +to prevent i overwrite your changes when i update the CVS from my darcs archive at: + + http://zwizwa.be/darcs/creb + +i update like this: + + * update from darcs tree + * update from sourceforge cvs + * briefly look over changes, take mine as master + * commit darcs + sourceforge + + diff --git a/abs/rms~.pd b/abs/rms~.pd new file mode 100644 index 0000000..a755340 --- /dev/null +++ b/abs/rms~.pd @@ -0,0 +1,8 @@ +#N canvas 190 209 347 206 10; +#X obj 113 45 inlet~; +#X obj 114 72 env~; +#X obj 115 98 dbtorms; +#X obj 113 134 outlet; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 2 0 3 0; diff --git a/bootstrap b/bootstrap new file mode 100644 index 0000000..ebee4b9 --- /dev/null +++ b/bootstrap @@ -0,0 +1,3 @@ +#!/bin/bash +autoconf +chmod +x bin/* diff --git a/doc/bdiag~.pd b/doc/bdiag~-help.pd index f5e835f..f5e835f 100644 --- a/doc/bdiag~.pd +++ b/doc/bdiag~-help.pd diff --git a/doc/bfft~.pd b/doc/bfft~-help.pd index 62507f9..62507f9 100644 --- a/doc/bfft~.pd +++ b/doc/bfft~-help.pd diff --git a/doc/biquadseries~.pd b/doc/biquadseries~-help.pd index 89d7ce0..89d7ce0 100644 --- a/doc/biquadseries~.pd +++ b/doc/biquadseries~-help.pd diff --git a/doc/bitsplit~.pd b/doc/bitsplit~-help.pd index fffce2e..fffce2e 100644 --- a/doc/bitsplit~.pd +++ b/doc/bitsplit~-help.pd diff --git a/doc/blocknorm~.pd b/doc/blocknorm~-help.pd index 3f25fc3..3f25fc3 100644 --- a/doc/blocknorm~.pd +++ b/doc/blocknorm~-help.pd diff --git a/doc/blosc~.pd b/doc/blosc~-help.pd index ce70940..ce70940 100644 --- a/doc/blosc~.pd +++ b/doc/blosc~-help.pd diff --git a/doc/bmatrix~.pd b/doc/bmatrix~-help.pd index 5cb34a5..5cb34a5 100644 --- a/doc/bmatrix~.pd +++ b/doc/bmatrix~-help.pd diff --git a/doc/bwin~.pd b/doc/bwin~-help.pd index 42b4fd6..42b4fd6 100644 --- a/doc/bwin~.pd +++ b/doc/bwin~-help.pd diff --git a/doc/cheby~.pd b/doc/cheby~-help.pd index 1cf1f94..1cf1f94 100644 --- a/doc/cheby~.pd +++ b/doc/cheby~-help.pd diff --git a/doc/clog~.pd b/doc/clog~-help.pd index 490c406..490c406 100644 --- a/doc/clog~.pd +++ b/doc/clog~-help.pd diff --git a/doc/dist~.pd b/doc/dist~-help.pd index 3533471..3533471 100644 --- a/doc/dist~.pd +++ b/doc/dist~-help.pd diff --git a/doc/dwt~.pd b/doc/dwt~-help.pd index 52986e1..52986e1 100644 --- a/doc/dwt~.pd +++ b/doc/dwt~-help.pd diff --git a/doc/dynwav~.pd b/doc/dynwav~-help.pd index 59f86bd..59f86bd 100644 --- a/doc/dynwav~.pd +++ b/doc/dynwav~-help.pd diff --git a/doc/eadsr~.pd b/doc/eadsr~-help.pd index f72bdaf..f72bdaf 100644 --- a/doc/eadsr~.pd +++ b/doc/eadsr~-help.pd diff --git a/doc/ead~.pd b/doc/ead~-help.pd index 835ba3d..835ba3d 100644 --- a/doc/ead~.pd +++ b/doc/ead~-help.pd diff --git a/doc/ear~.pd b/doc/ear~-help.pd index 8527a12..8527a12 100644 --- a/doc/ear~.pd +++ b/doc/ear~-help.pd diff --git a/doc/fdn~.pd b/doc/fdn~-help.pd index 3903d63..3903d63 100644 --- a/doc/fdn~.pd +++ b/doc/fdn~-help.pd diff --git a/doc/ffpoly.pd b/doc/ffpoly-help.pd index 7ec8886..7ec8886 100644 --- a/doc/ffpoly.pd +++ b/doc/ffpoly-help.pd diff --git a/doc/filterortho~.pd b/doc/filterortho~-help.pd index e120101..e120101 100644 --- a/doc/filterortho~.pd +++ b/doc/filterortho~-help.pd diff --git a/doc/fwarp.pd b/doc/fwarp-help.pd index d43a5a3..d43a5a3 100644 --- a/doc/fwarp.pd +++ b/doc/fwarp-help.pd diff --git a/doc/junction~.pd b/doc/junction~-help.pd index 591e4bc..591e4bc 100644 --- a/doc/junction~.pd +++ b/doc/junction~-help.pd diff --git a/doc/lattice~.pd b/doc/lattice~-help.pd index 6f62e3e..6f62e3e 100644 --- a/doc/lattice~.pd +++ b/doc/lattice~-help.pd diff --git a/doc/matrix~.pd b/doc/matrix~-help.pd index 5a6e9d5..5a6e9d5 100644 --- a/doc/matrix~.pd +++ b/doc/matrix~-help.pd diff --git a/doc/permut~.pd b/doc/permut~-help.pd index c8aa822..c8aa822 100644 --- a/doc/permut~.pd +++ b/doc/permut~-help.pd diff --git a/doc/qmult~.pd b/doc/qmult~-help.pd index 674df3e..674df3e 100644 --- a/doc/qmult~.pd +++ b/doc/qmult~-help.pd diff --git a/doc/qnorm~.pd b/doc/qnorm~-help.pd index 3f6a8d0..3f6a8d0 100644 --- a/doc/qnorm~.pd +++ b/doc/qnorm~-help.pd diff --git a/doc/ratio.pd b/doc/ratio-help.pd index 9750058..9750058 100644 --- a/doc/ratio.pd +++ b/doc/ratio-help.pd diff --git a/doc/resofilt~.pd b/doc/resofilt~-help.pd index 5adad08..5adad08 100644 --- a/doc/resofilt~.pd +++ b/doc/resofilt~-help.pd diff --git a/doc/sbosc~.pd b/doc/sbosc~-help.pd index 804b30d..804b30d 100644 --- a/doc/sbosc~.pd +++ b/doc/sbosc~-help.pd diff --git a/doc/scrollgrid1D~.pd b/doc/scrollgrid1D~-help.pd index 16ec412..16ec412 100644 --- a/doc/scrollgrid1D~.pd +++ b/doc/scrollgrid1D~-help.pd diff --git a/doc/tabreadmix~.pd b/doc/tabreadmix~-help.pd index aad25ab..aad25ab 100644 --- a/doc/tabreadmix~.pd +++ b/doc/tabreadmix~-help.pd diff --git a/doc/xfm~.pd b/doc/xfm~-help.pd index 6b59329..6b59329 100644 --- a/doc/xfm~.pd +++ b/doc/xfm~-help.pd diff --git a/modules++/biquadseries.cc b/modules++/biquadseries~.cc index 40b3aef..40b3aef 100644 --- a/modules++/biquadseries.cc +++ b/modules++/biquadseries~.cc diff --git a/modules++/blosc.cc b/modules++/blosc~.cc index f2b13d8..8a4dd4b 100644 --- a/modules++/blosc.cc +++ b/modules++/blosc~.cc @@ -29,15 +29,6 @@ #include "DSPIcomplex.h" #include "DSPIfilters.h" -/* work around old bug in Apple compilers <hans@at.or.at> */ -//#if MAC_OS_X_VERSION < MAC_OS_X_VERSION_10_4 // arg, this didn't work -#ifndef isnan -extern "C" int isnan(double); -#endif -#ifndef isinf -extern "C" int isinf(double); -#endif - typedef unsigned long long u64; typedef unsigned long u32; @@ -99,7 +90,7 @@ static inline u32 _float_to_phase(float f){return ((u32)(f * 4294967296.0f)) & ~ /* flat table: better for linear interpolation */ static inline float _play_voice_lint(float *table, t_int *index, float frac, float scale) { - t_int i = *index; + int i = *index; /* perform linear interpolation */ float f = (((1.0f - frac) * table[i]) + (table[i+1] * frac)) * scale; @@ -616,7 +607,7 @@ static inline void _fft(float *real, float *imag, int size) for (i=0; i<size; i++){ real[i] *= scale; imag[i] *= scale; - if (isnan(real[i])) post("fftpanic %d", i); + // if (isnan(real[i])) post("fftpanic %d", i); } mayer_fft(size, real, imag); } @@ -628,7 +619,7 @@ static inline void _ifft(float *real, float *imag, int size) for (i=0; i<size; i++){ real[i] *= scale; imag[i] *= scale; - if (isnan(real[i])) post("ifftpanic %d", i); + // if (isnan(real[i])) post("ifftpanic %d", i); } mayer_ifft(size, real, imag); } @@ -705,8 +696,8 @@ static void build_tables(void) //real[i] *= 0.5f * (1.0f + WALPHA) + 0.5f * (1.0f - WALPHA) * (cos(tw)); /* check for nan */ - if (isnan(real[i])) post("sinc NaN panic %d", i); - if (isinf(real[i])) post("sinc Inf panic %d", i); + //if (isnan(real[i])) post("sinc NaN panic %d", i); + //if (isinf(real[i])) post("sinc Inf panic %d", i); } diff --git a/modules++/filterortho.cc b/modules++/filterortho~.cc index c80552b..c80552b 100644 --- a/modules++/filterortho.cc +++ b/modules++/filterortho~.cc diff --git a/modules/matrix~.c b/modules/bmatrix~.c index b59d4d6..b59d4d6 100644 --- a/modules/matrix~.c +++ b/modules/bmatrix~.c diff --git a/modules/window~.c b/modules/bwin~.c index 777c8c5..90a9e2a 100644 --- a/modules/window~.c +++ b/modules/bwin~.c @@ -157,12 +157,15 @@ static void *window_new(t_symbol *s) return (x); } -void window_tilde_setup(void) +void bwin_tilde_setup(void) { - window_class = class_new(gensym("bwin~"), (t_newmethod)window_new, (t_method)window_free, - sizeof(t_window), 0, A_DEFSYMBOL, A_NULL); + window_class = class_new(gensym("bwin~"), + (t_newmethod)window_new, (t_method)window_free, + sizeof(t_window), 0, A_DEFSYMBOL, A_NULL); CLASS_MAINSIGNALIN(window_class, t_window, x_f); - class_addmethod(window_class, (t_method)window_dsp, gensym("dsp"), A_NULL); - class_addmethod(window_class, (t_method)window_type, gensym("type"), A_SYMBOL, A_DEFFLOAT, A_NULL); + class_addmethod(window_class, (t_method)window_dsp, + gensym("dsp"), A_NULL); + class_addmethod(window_class, (t_method)window_type, + gensym("type"), A_SYMBOL, A_DEFFLOAT, A_NULL); } diff --git a/modules/cmath~.c b/modules/cmath~.c index 3bd63a9..5526b9f 100644 --- a/modules/cmath~.c +++ b/modules/cmath~.c @@ -35,8 +35,8 @@ static t_int *cmath_perform_clog(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; @@ -61,8 +61,8 @@ static t_int *cmath_perform_cexp(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; @@ -82,8 +82,8 @@ static t_int *cmath_perform_nfft(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; @@ -105,8 +105,8 @@ static t_int *cmath_perform_nifft(t_int *w) { t_float *inx = (float *)(w[2]); t_float *iny = (float *)(w[3]); - t_float *outx = (float *)(w[4]); - t_float *outy = (float *)(w[5]); + t_float *outx = (float *)(w[5]); // clockwize addressing + t_float *outy = (float *)(w[4]); t_int i; t_int n = (t_int)(w[1]); t_float x; diff --git a/modules/dwt~.c b/modules/dwt~.c index 327732c..9ab3bcc 100644 --- a/modules/dwt~.c +++ b/modules/dwt~.c @@ -190,9 +190,9 @@ static void dwt_permutation(t_dwt *x, t_int n){ /* debug */ for(k=0; k<n; k++) - printf("clutter[%ld] = %ld\n", k, ctl->c_clutter[k]); + printf("clutter[%d] = %d\n", (int)k, (int)ctl->c_clutter[k]); for(k=0; k<n; k++) - printf("unclutter[%ld] = %ld\n", k, ctl->c_unclutter[k]); + printf("unclutter[%d] = %d\n", (int)k, (int)ctl->c_unclutter[k]); exit(1); } diff --git a/modules/ffpoly.c b/modules/ffpoly.c index c325969..097891c 100644 --- a/modules/ffpoly.c +++ b/modules/ffpoly.c @@ -1,6 +1,6 @@ /* * ffpoly.c - compute a finite field polynomial - * Copyright (c) by Tom Schouten <pdp@zzz.kotnet.org> + * Copyright (c) by Tom Schouten <tom@ziwzwa.be> * * 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 |