From 17bd73bf9c9da670727345b00e639398a8f3d296 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Tue, 7 Sep 2004 09:13:52 +0000 Subject: *** empty log message *** svn path=/trunk/externals/tb/; revision=2015 --- tbext/him.pd | 13 +++++++++++-- tbext/source/fftgrrev.cpp | 13 ++++--------- tbext/source/fftgrshuf.cpp | 16 ++++------------ tbext/source/fftgrsort.cpp | 15 ++++++--------- 4 files changed, 25 insertions(+), 32 deletions(-) diff --git a/tbext/him.pd b/tbext/him.pd index 7e15881..f287cdd 100644 --- a/tbext/him.pd +++ b/tbext/him.pd @@ -4,11 +4,11 @@ #X obj 125 122 tgl 15 1 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1; #X obj 51 15 hsl 128 15 1e-04 1 1 0 empty empty dt -2 -6 0 8 -262144 --1 -1 10400 0; +-1 -1 5100 0; #X msg 48 37 dt \$1; #X msg 80 84 e \$1; #X obj 83 65 hsl 128 15 -1 0 0 0 empty empty etilde -2 -6 0 8 -262144 --1 -1 6000 0; +-1 -1 7800 0; #X floatatom 122 85 5 0 0 0 - - -; #X floatatom 106 40 5 0 0 0 - - -; #X msg 158 177 reset; @@ -31,6 +31,11 @@ models of an atom in a magnetic field...; #X msg 607 252 mu -1.43572 \;; #X obj 608 228 t b b; #X msg 608 318 \; pd dsp 1; +#X obj 14 347 print~; +#X obj 14 292 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 262 236 fiddle~; +#X floatatom 263 273 5 0 0 0 - - -; #X connect 1 0 11 0; #X connect 2 0 1 0; #X connect 3 0 4 0; @@ -42,6 +47,8 @@ models of an atom in a magnetic field...; #X connect 9 0 11 0; #X connect 10 0 11 0; #X connect 11 0 0 0; +#X connect 11 0 24 0; +#X connect 11 0 26 0; #X connect 11 1 0 1; #X connect 11 2 0 0; #X connect 11 3 0 1; @@ -55,3 +62,5 @@ models of an atom in a magnetic field...; #X connect 22 1 21 0; #X connect 22 1 19 0; #X connect 22 1 20 0; +#X connect 25 0 24 0; +#X connect 26 3 27 0; diff --git a/tbext/source/fftgrrev.cpp b/tbext/source/fftgrrev.cpp index e26135c..fd844f0 100644 --- a/tbext/source/fftgrrev.cpp +++ b/tbext/source/fftgrrev.cpp @@ -68,14 +68,11 @@ private: t_int bs; //blocksize t_int bs1; //bs+1 - t_int counter; t_sample * data; //array with data t_sample * d1; //1. element in array with data t_sample * dend; //1 element after the last element - t_sample * ins; - t_sample * outs; bool reverse; @@ -85,7 +82,7 @@ private: FLEXT_LIB_DSP_1("fftgrrev~",fftgrrev,int) fftgrrev::fftgrrev(int arg): - grains(1),offset(0),counter(1) + grains(1),offset(0) { bs=arg/2; grainsize=bs; @@ -106,9 +103,8 @@ fftgrrev::fftgrrev(int arg): void fftgrrev::m_signal(int n, t_float * const *in, t_float *const *out) { - ins = in[0]; - outs = out[0]; - + t_sample * ins = in[0]; + t_sample * outs = out[0]; if (offset>0) { @@ -126,7 +122,7 @@ void fftgrrev::m_signal(int n, t_float * const *in, t_float *const *out) //grains - counter=1; + int counter=1; while (counter!=grains) { @@ -144,7 +140,6 @@ void fftgrrev::set_offset(t_int o) if (o-bs<0 && o+bs>0) { offset=-o; - post("offset %i",o); } else post("Offset out of range!"); diff --git a/tbext/source/fftgrshuf.cpp b/tbext/source/fftgrshuf.cpp index b490dcf..d9ecdfb 100644 --- a/tbext/source/fftgrshuf.cpp +++ b/tbext/source/fftgrshuf.cpp @@ -67,23 +67,17 @@ private: t_int bs; //blocksize t_int bs1; //bs+1 - t_int counter; t_sample * data; //array with data t_sample * d1; //1. element in array with data t_sample * dend; //1 element after the last element - - t_sample * ins; - t_sample * outs; - - }; FLEXT_LIB_DSP_1("fftgrshuf~",fftgrshuf,int) fftgrshuf::fftgrshuf(int arg): - grains(1),offset(0),counter(1) + grains(1),offset(0) { bs=arg/2; grainsize=bs; @@ -104,9 +98,8 @@ fftgrshuf::fftgrshuf(int arg): void fftgrshuf::m_signal(int n, t_float * const *in, t_float *const *out) { - ins = in[0]; - outs = out[0]; - + t_sample * ins = in[0]; + t_sample * outs = out[0]; if (offset>0) { @@ -124,7 +117,7 @@ void fftgrshuf::m_signal(int n, t_float * const *in, t_float *const *out) //grains - counter=1; + int counter=1; while (counter!=grains) { @@ -143,7 +136,6 @@ void fftgrshuf::set_offset(t_int o) if (o-bs<0 && o+bs>0) { offset=o; - post("offset %i",-o); } else post("offset out of range!"); diff --git a/tbext/source/fftgrsort.cpp b/tbext/source/fftgrsort.cpp index f24ed0f..1764c02 100644 --- a/tbext/source/fftgrsort.cpp +++ b/tbext/source/fftgrsort.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2003 Tim Blechmann. */ +/* Copyright (c) 2003-2004 Tim Blechmann. */ /* For information on usage and redistribution, and for a DISCLAIMER OF ALL */ /* WARRANTIES, see the file, "COPYING" in this distribution. */ /* */ @@ -70,14 +70,11 @@ private: t_int bs; //blocksize t_int bs1; //bs+1 - t_int counter; t_sample * data; //array with data t_sample * d1; //1. element in array with data t_sample * dend; //1 element after the last element - t_sample * ins; - t_sample * outs; bool reverse; @@ -87,7 +84,7 @@ private: FLEXT_LIB_DSP_1("fftgrsort~",fftgrsort,int) fftgrsort::fftgrsort(int arg): - grains(1),offset(0),counter(1),reverse(0) + grains(1),offset(0),reverse(0) { bs=arg/2; grainsize=bs; @@ -109,8 +106,8 @@ fftgrsort::fftgrsort(int arg): void fftgrsort::m_signal(int n, t_float * const *in, t_float *const *out) { - ins = in[0]; - outs = out[0]; + t_sample * ins = in[0]; + t_sample * outs = out[0]; if (offset>0) @@ -129,7 +126,7 @@ void fftgrsort::m_signal(int n, t_float * const *in, t_float *const *out) //grains - counter=1; + int counter=1; while (counter!=grains) { @@ -152,7 +149,7 @@ void fftgrsort::set_offset(t_int o) if (o-bs<0 && o+bs>0) { offset=-o; - post("offset %i",o); + // post("offset %i",o); } else post("offset out of range!"); -- cgit v1.2.1