Revision: 9901 http://pure-data.svn.sourceforge.net/pure-data/?rev=9901&view=rev Author: eighthave Date: 2008-05-24 16:31:53 -0700 (Sat, 24 May 2008)
Log Message: ----------- checked in latest changes from Tom Schouten's darcs, looks like just bug fixes
Modified Paths: -------------- branches/pd-extended/v0-40/externals/creb/Makefile branches/pd-extended/v0-40/externals/creb/Makefile.config.in branches/pd-extended/v0-40/externals/creb/README branches/pd-extended/v0-40/externals/creb/modules/bwin~.c branches/pd-extended/v0-40/externals/creb/modules/cmath~.c branches/pd-extended/v0-40/externals/creb/modules/dwt~.c branches/pd-extended/v0-40/externals/creb/modules/ffpoly.c branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc
Added Paths: ----------- branches/pd-extended/v0-40/externals/creb/README.darcs branches/pd-extended/v0-40/externals/creb/README.extcvs branches/pd-extended/v0-40/externals/creb/abs/rms~.pd branches/pd-extended/v0-40/externals/creb/bootstrap
Modified: branches/pd-extended/v0-40/externals/creb/Makefile =================================================================== --- branches/pd-extended/v0-40/externals/creb/Makefile 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/Makefile 2008-05-24 23:31:53 UTC (rev 9901) @@ -27,3 +27,14 @@ 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
Modified: branches/pd-extended/v0-40/externals/creb/Makefile.config.in =================================================================== --- branches/pd-extended/v0-40/externals/creb/Makefile.config.in 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/Makefile.config.in 2008-05-24 23:31:53 UTC (rev 9901) @@ -7,7 +7,7 @@
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
Modified: branches/pd-extended/v0-40/externals/creb/README =================================================================== --- branches/pd-extended/v0-40/externals/creb/README 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/README 2008-05-24 23:31:53 UTC (rev 9901) @@ -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
Added: branches/pd-extended/v0-40/externals/creb/README.darcs =================================================================== --- branches/pd-extended/v0-40/externals/creb/README.darcs (rev 0) +++ branches/pd-extended/v0-40/externals/creb/README.darcs 2008-05-24 23:31:53 UTC (rev 9901) @@ -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
Added: branches/pd-extended/v0-40/externals/creb/README.extcvs =================================================================== --- branches/pd-extended/v0-40/externals/creb/README.extcvs (rev 0) +++ branches/pd-extended/v0-40/externals/creb/README.extcvs 2008-05-24 23:31:53 UTC (rev 9901) @@ -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 + +
Added: branches/pd-extended/v0-40/externals/creb/abs/rms~.pd =================================================================== --- branches/pd-extended/v0-40/externals/creb/abs/rms~.pd (rev 0) +++ branches/pd-extended/v0-40/externals/creb/abs/rms~.pd 2008-05-24 23:31:53 UTC (rev 9901) @@ -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;
Added: branches/pd-extended/v0-40/externals/creb/bootstrap =================================================================== --- branches/pd-extended/v0-40/externals/creb/bootstrap (rev 0) +++ branches/pd-extended/v0-40/externals/creb/bootstrap 2008-05-24 23:31:53 UTC (rev 9901) @@ -0,0 +1,3 @@ +#!/bin/bash +autoconf +chmod +x bin/*
Modified: branches/pd-extended/v0-40/externals/creb/modules/bwin~.c =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules/bwin~.c 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/modules/bwin~.c 2008-05-24 23:31:53 UTC (rev 9901) @@ -159,10 +159,13 @@
void window_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); }
Modified: branches/pd-extended/v0-40/externals/creb/modules/cmath~.c =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules/cmath~.c 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/modules/cmath~.c 2008-05-24 23:31:53 UTC (rev 9901) @@ -35,8 +35,8 @@ { 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 @@ { 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 @@ { 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 @@ { 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;
Modified: branches/pd-extended/v0-40/externals/creb/modules/dwt~.c =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules/dwt~.c 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/modules/dwt~.c 2008-05-24 23:31:53 UTC (rev 9901) @@ -190,9 +190,9 @@
/* 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); }
Modified: branches/pd-extended/v0-40/externals/creb/modules/ffpoly.c =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules/ffpoly.c 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/modules/ffpoly.c 2008-05-24 23:31:53 UTC (rev 9901) @@ -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
Modified: branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc 2008-05-24 23:30:09 UTC (rev 9900) +++ branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc 2008-05-24 23:31:53 UTC (rev 9901) @@ -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 @@ /* 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 @@ 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 @@ 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 @@ //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);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.