merged with version_0_37_1test6

svn path=/trunk/; revision=1307

12 files changed, 137 insertions, 191 deletions

diff --git a/pd/extra/help-bonk~.pd b/pd/extra/bonk~/help-bonk~.pd
index 5102e860..5102e860 100644
--- a/pd/extra/help-bonk~.pd
+++ b/pd/extra/bonk~/help-bonk~.pd
diff --git a/pd/extra/bonk~/makefile b/pd/extra/bonk~/makefile
index 2ac53f8c..b06d625f 100644
--- a/pd/extra/bonk~/makefile
+++ b/pd/extra/bonk~/makefile
@@ -67,7 +67,7 @@ LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \
 LINUXINCLUDE =  -I../../src
 
 .c.pd_linux:
-	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	$(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
diff --git a/pd/extra/help-choice.pd b/pd/extra/choice/help-choice.pd
index df46ddc0..df46ddc0 100644
--- a/pd/extra/help-choice.pd
+++ b/pd/extra/choice/help-choice.pd
diff --git a/pd/extra/expr~/README b/pd/extra/expr~/README
deleted file mode 100644
index bf84f2ae..00000000
--- a/pd/extra/expr~/README
+++ /dev/null
@@ -1,97 +0,0 @@
-
-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@ucsd.edu)
-7/10/02
diff --git a/pd/extra/help-fiddle~.pd b/pd/extra/fiddle~/help-fiddle~.pd
index a7feb4f7..f396725a 100644
--- a/pd/extra/help-fiddle~.pd
+++ b/pd/extra/fiddle~/help-fiddle~.pd
@@ -1,39 +1,56 @@
 #N canvas 93 26 980 745 10;
 #X obj 262 522 phasor~;
 #X obj 531 616 unpack;
-#X floatatom 531 666;
+#X floatatom 531 666 0 0 0 0 - - -;
 #X msg 437 449 print;
 #X obj 262 500 sig~;
-#X floatatom 262 478;
+#X floatatom 262 478 0 0 0 0 - - -;
 #X obj 262 456 mtof;
-#X floatatom 262 434;
-#X floatatom 545 643;
+#X floatatom 262 434 0 0 0 0 - - -;
+#X floatatom 545 643 0 0 0 0 - - -;
 #X obj 531 576 route 1 2 3 4;
 #X obj 614 616 unpack;
-#X floatatom 614 666;
-#X floatatom 628 643;
+#X floatatom 614 666 0 0 0 0 - - -;
+#X floatatom 628 643 0 0 0 0 - - -;
 #X obj 698 616 unpack;
-#X floatatom 698 666;
-#X floatatom 712 643;
+#X floatatom 698 666 0 0 0 0 - - -;
+#X floatatom 712 643 0 0 0 0 - - -;
 #X obj 389 616 unpack;
-#X floatatom 389 666;
-#X floatatom 403 643;
+#X floatatom 389 666 0 0 0 0 - - -;
+#X floatatom 403 643 0 0 0 0 - - -;
 #X obj 334 545 *~;
 #X obj 322 394 loadbang;
 #X obj 353 522 sig~;
-#X floatatom 353 500;
+#X floatatom 353 500 0 0 0 0 - - -;
 #X msg 322 478 1;
 #X msg 353 478 0;
-#X floatatom 466 666;
+#X floatatom 466 666 0 0 0 0 - - -;
 #X obj 281 666 print attack;
 #X obj 190 666 print pitch;
 #X msg 555 45 \; pd dsp 1;
 #X text 460 39 click here;
 #X text 460 61 to start DSP;
 #X text 226 4 FIDDLE - pitch estimator and sinusoidal peak finder;
-#X text 8 70 The Fiddle object estimates the pitch and amplitude of an incoming sound \, both continuously and as a stream of discrete "note" events. Fiddle optionally outputs a list of detected sinusoidal peaks used to make the pitch determination. Fiddle is described theoretically in the 1998 ICMC proceedings \, reprinted on http://man104nfs.ucsd.edu/~mpuckett.;
-#X text 8 170 Fiddle's creation arguments specify an analysis window size \, the maximum polyphony (i.e. \, the number of simultaneous "pitches" to try to find) \, the number of peaks in the spectrum to consider \, and the number of peaks \, if any \, to output "raw." The outlets give discrete pitch (a number) \, detected attacks in the amplitude envelope (a bang) \, one or more voices of continuous pitch and amplitude \, overall amplitude \, and optionally a sequence of messages with the peaks.;
-#X text 8 296 The analysis hop size is half the window size so in the example shown here \, one analysis is done every 512 samples (11.6 msec at 44K1) \, and the analysis uses the most recent 1024 samples (23.2 msec at 44K1). The minimum frequency that Fiddle will report is 2-1/2 cycles per analysis windows \, or about 108 Hz. (just below MIDI 45.);
+#X text 8 70 The Fiddle object estimates the pitch and amplitude of
+an incoming sound \, both continuously and as a stream of discrete
+"note" events. Fiddle optionally outputs a list of detected sinusoidal
+peaks used to make the pitch determination. Fiddle is described theoretically
+in the 1998 ICMC proceedings \, reprinted on http://man104nfs.ucsd.edu/~mpuckett.
+;
+#X text 8 170 Fiddle's creation arguments specify an analysis window
+size \, the maximum polyphony (i.e. \, the number of simultaneous "pitches"
+to try to find) \, the number of peaks in the spectrum to consider
+\, and the number of peaks \, if any \, to output "raw." The outlets
+give discrete pitch (a number) \, detected attacks in the amplitude
+envelope (a bang) \, one or more voices of continuous pitch and amplitude
+\, overall amplitude \, and optionally a sequence of messages with
+the peaks.;
+#X text 8 296 The analysis hop size is half the window size so in the
+example shown here \, one analysis is done every 512 samples (11.6
+msec at 44K1) \, and the analysis uses the most recent 1024 samples
+(23.2 msec at 44K1). The minimum frequency that Fiddle will report
+is 2-1/2 cycles per analysis windows \, or about 108 Hz. (just below
+MIDI 45.);
 #X text 669 535 number of pitch outlets (1-3 \, default 1);
 #X text 669 557 number of peaks to find (1-100 \, default 20);
 #X text 669 579 number of peaks to output (default 0.);
@@ -41,9 +58,17 @@
 #X msg 439 227 reattack 100 10;
 #X msg 438 282 npartial 7;
 #X msg 438 170 vibrato 50 0.5;
-#X text 560 91 a low and high amplitude threshold: if signal amplitude is below the low threshold \, no pitches or peaks are output. The high threshold is a minimum at which "cooked" outputs may appear.;
-#X text 560 152 A period in milliseconds (50) over which the raw pitch may not deviate more than an interval in half-tones (0.5) from the average pitch to report it as a note to the "cooked" pitch outlet.;
-#X text 560 213 A period in milliseconds (100) over which a re-attack is reported if the amplitude rises more than (1) dB. The re-attack will result in a "bang" in the attack outlet and may give rise to repeated notes in the cooked pitch output.;
+#X text 560 91 a low and high amplitude threshold: if signal amplitude
+is below the low threshold \, no pitches or peaks are output. The high
+threshold is a minimum at which "cooked" outputs may appear.;
+#X text 560 152 A period in milliseconds (50) over which the raw pitch
+may not deviate more than an interval in half-tones (0.5) from the
+average pitch to report it as a note to the "cooked" pitch outlet.
+;
+#X text 560 213 A period in milliseconds (100) over which a re-attack
+is reported if the amplitude rises more than (1) dB. The re-attack
+will result in a "bang" in the attack outlet and may give rise to repeated
+notes in the cooked pitch output.;
 #X text 142 432 test input pitch;
 #X text 330 444 test input;
 #X text 330 457 amplitude;
@@ -60,14 +85,22 @@
 #X text 202 703 output;
 #X text 545 545 ------ arguments:;
 #X msg 262 412 57;
-#X msg 440 340 auto 1;
-#X msg 440 362 auto 0;
-#X msg 440 407 bang;
-#X text 561 405 poll current values --- useful if not in auto mode \,;
-#X text 560 274 Higher partials are weighed less strongly than lower ones in determining the pitch. This specifies the number of the partial (7) which will be weighted half as strongly as the fundamental.;
-#X text 560 335 start and stop "auto" mode (on by default.) If off \, output only appears on "bang" (poll mode).;
+#X msg 440 331 auto 1;
+#X msg 440 353 auto 0;
+#X msg 439 418 bang;
+#X text 561 416 poll current values --- useful if not in auto mode
+\,;
+#X text 560 274 Higher partials are weighed less strongly than lower
+ones in determining the pitch. This specifies the number of the partial
+(7) which will be weighted half as strongly as the fundamental.;
+#X text 560 335 start and stop "auto" mode (on by default.) If off
+\, output only appears on "bang" (poll mode).;
 #X text 561 448 print out all settings;
 #X text 669 513 window size (128-2048 \, default 1024);
+#X msg 440 375 npoints 2048;
+#X text 562 384 number of points in analysis window (power of 2 \,
+128-2048);
+#X msg 439 396 npoints 1024;
 #X connect 0 0 19 0;
 #X connect 1 0 2 0;
 #X connect 1 1 8 0;
@@ -105,3 +138,5 @@
 #X connect 61 0 48 0;
 #X connect 62 0 48 0;
 #X connect 63 0 48 0;
+#X connect 69 0 48 0;
+#X connect 71 0 48 0;
diff --git a/pd/extra/fiddle~/makefile b/pd/extra/fiddle~/makefile
index 6f6a963c..85035738 100644
--- a/pd/extra/fiddle~/makefile
+++ b/pd/extra/fiddle~/makefile
@@ -67,7 +67,7 @@ LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \
 LINUXINCLUDE =  -I../../src
 
 .c.pd_linux:
-	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	$(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
diff --git a/pd/extra/help-loop~.pd b/pd/extra/help-loop~.pd
deleted file mode 100644
index 6acff93c..00000000
--- a/pd/extra/help-loop~.pd
+++ /dev/null
@@ -1,66 +0,0 @@
-#N canvas 33 0 538 640 12;
-#X floatatom 55 169;
-#X obj 273 343 print~;
-#X msg 273 305 bang;
-#X obj 55 303 loop~;
-#X floatatom 80 244;
-#X msg 69 217 bang;
-#X obj 172 350 print~;
-#X msg 170 311 bang;
-#X graph graph1 0 -1 150000 1 306 586 506 436;
-#X array array2 150000 float;
-#X pop;
-#X msg 306 594 \; array2 resize 150000;
-#X obj 29 578 soundfiler;
-#X obj 55 419 tabread4~ array2;
-#X obj 55 373 *~;
-#X obj 55 488 dac~;
-#X obj 55 465 hip~ 5;
-#X obj 101 377 samphold~;
-#X obj 55 396 +~;
-#X floatatom 102 268;
-#X obj 102 291 *~ 1000;
-#X msg 47 533 read ../doc/sound/bell.aiff array2;
-#X msg 47 556 read ../doc/sound/vocal.aiff array2;
-#X msg 61 194 set 0.5;
-#X text 100 164 left signal input is transposition (1 is normal \, 2 is up an octave \, etc);
-#X text 37 6 loop~ - phase generator for looping samplers;
-#X text 121 193 set phase (0 to 1);
-#X text 121 213 reset phase to 0;
-#X text 118 243 right signal input is window size in samples;
-#X text 140 267 here's how to handle onsets;
-#X obj 55 442 *~;
-#X floatatom 171 397;
-#X obj 171 466 line~;
-#X obj 171 420 dbtorms;
-#X obj 171 443 pack 0 50;
-#X text 205 396 output level 0-100;
-#X text 170 290 print outputs;
-#X text 21 25 loop~ takes input signals to set a window size and transposition \, and outputs a phase and a sampled window size. The window size only changes at phase zero crossings and the phase output is adjusted so that changing window size doesn't change the transposition.;
-#X text 22 95 You can send "bang" or "set" message to force the phase to zero--you should mute the output before doing so. This may be desirable if you've set a large window size but then want to decrease it without waiting for the next phase crossing.;
-#X connect 0 0 3 0;
-#X connect 2 0 1 0;
-#X connect 3 0 6 0;
-#X connect 3 0 12 0;
-#X connect 3 0 15 1;
-#X connect 3 1 1 0;
-#X connect 3 1 12 1;
-#X connect 4 0 3 1;
-#X connect 5 0 3 0;
-#X connect 7 0 6 0;
-#X connect 11 0 28 0;
-#X connect 12 0 16 0;
-#X connect 14 0 13 0;
-#X connect 14 0 13 1;
-#X connect 15 0 16 1;
-#X connect 16 0 11 0;
-#X connect 17 0 18 0;
-#X connect 18 0 15 0;
-#X connect 19 0 10 0;
-#X connect 20 0 10 0;
-#X connect 21 0 3 0;
-#X connect 28 0 14 0;
-#X connect 29 0 31 0;
-#X connect 30 0 28 1;
-#X connect 31 0 32 0;
-#X connect 32 0 30 0;
diff --git a/pd/extra/loop~/help-loop~.pd b/pd/extra/loop~/help-loop~.pd
new file mode 100644
index 00000000..a445b805
--- /dev/null
+++ b/pd/extra/loop~/help-loop~.pd
@@ -0,0 +1,74 @@
+#N canvas 33 0 647 662 12;
+#X floatatom 41 204 0 0 0 0 - - -;
+#X obj 254 382 print~;
+#X msg 254 347 bang;
+#X obj 41 338 loop~;
+#X floatatom 66 279 0 0 0 0 - - -;
+#X msg 55 252 bang;
+#X obj 183 382 print~;
+#X msg 183 347 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 393 464 graph;
+#X msg 393 622 \; array2 resize 150000;
+#X obj 25 613 soundfiler;
+#X obj 16 453 tabread4~ array2;
+#X obj 16 407 *~;
+#X obj 16 522 dac~;
+#X obj 16 499 hip~ 5;
+#X obj 62 411 samphold~;
+#X obj 16 430 +~;
+#X floatatom 96 303 0 0 0 0 - - -;
+#X obj 96 326 *~ 1000;
+#X msg 43 568 read ../doc/sound/bell.aiff array2;
+#X msg 43 591 read ../doc/sound/vocal.aiff array2;
+#X msg 47 229 set 0.5;
+#X text 95 196 left signal input is transposition (1 is normal \, 2
+is up an octave \, etc);
+#X text 82 4 loop~ - phase generator for looping samplers;
+#X text 116 228 set phase (0 to 1);
+#X text 104 253 reset phase to 0;
+#X text 104 278 right signal input is window size in samples;
+#X text 134 302 here's how to handle onsets;
+#X obj 16 476 *~;
+#X floatatom 167 432 0 0 0 0 - - -;
+#X obj 167 501 line~;
+#X obj 167 455 dbtorms;
+#X obj 167 478 pack 0 50;
+#X text 201 431 output level 0-100;
+#X text 187 326 print outputs;
+#X text 33 32 loop~ takes input signals to set a window size and transposition
+\, and outputs a phase and a sampled window size. The window size only
+changes at phase zero crossings and the phase output is adjusted so
+that changing window size doesn't change the transposition.;
+#X text 33 112 You can send "bang" or "set" message to force the phase
+to zero--you should mute the output before doing so. This may be desirable
+if you've set a large window size but then want to decrease it without
+waiting for the next phase crossing.;
+#X connect 0 0 3 0;
+#X connect 2 0 1 0;
+#X connect 3 0 6 0;
+#X connect 3 0 12 0;
+#X connect 3 0 15 1;
+#X connect 3 1 1 0;
+#X connect 3 1 12 1;
+#X connect 4 0 3 1;
+#X connect 5 0 3 0;
+#X connect 7 0 6 0;
+#X connect 11 0 28 0;
+#X connect 12 0 16 0;
+#X connect 14 0 13 0;
+#X connect 14 0 13 1;
+#X connect 15 0 16 1;
+#X connect 16 0 11 0;
+#X connect 17 0 18 0;
+#X connect 18 0 15 0;
+#X connect 19 0 10 0;
+#X connect 20 0 10 0;
+#X connect 21 0 3 0;
+#X connect 28 0 14 0;
+#X connect 29 0 31 0;
+#X connect 30 0 28 1;
+#X connect 31 0 32 0;
+#X connect 32 0 30 0;
diff --git a/pd/extra/loop~/makefile b/pd/extra/loop~/makefile
index 881ec5f1..77bff84a 100644
--- a/pd/extra/loop~/makefile
+++ b/pd/extra/loop~/makefile
@@ -68,7 +68,7 @@ LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \
 LINUXINCLUDE =  -I../../src
 
 .c.pd_linux:
-	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	$(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
diff --git a/pd/extra/help-rlshift~.pd b/pd/extra/lrshift~/help-rlshift~.pd
index cdfd8830..cdfd8830 100644
--- a/pd/extra/help-rlshift~.pd
+++ b/pd/extra/lrshift~/help-rlshift~.pd
diff --git a/pd/extra/lrshift~/makefile b/pd/extra/lrshift~/makefile
index 67afef10..00ed2493 100644
--- a/pd/extra/lrshift~/makefile
+++ b/pd/extra/lrshift~/makefile
@@ -68,7 +68,7 @@ LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \
 LINUXINCLUDE =  -I../../src
 
 .c.pd_linux:
-	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	$(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
diff --git a/pd/extra/help-pique.pd b/pd/extra/pique/help-pique.pd
index 1689c95b..1689c95b 100644
--- a/pd/extra/help-pique.pd
+++ b/pd/extra/pique/help-pique.pd