imported version 0.37-0

svn path=/trunk/; revision=1016

3 files changed, 43 insertions, 111 deletions

diff --git a/pd/extra/loop~/help-loop~.pd b/pd/extra/loop~/help-loop~.pd
deleted file mode 100644
index 6acff93c..00000000
--- a/pd/extra/loop~/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~/makefile b/pd/extra/loop~/makefile
index 7adffbd6..881ec5f1 100644
--- a/pd/extra/loop~/makefile
+++ b/pd/extra/loop~/makefile
@@ -1,6 +1,7 @@
 NAME=loop~
 CSYM=loop_tilde
 
+
 current: pd_linux
 
 # ----------------------- NT -----------------------
@@ -12,13 +13,13 @@ pd_nt: $(NAME).dll
 PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo
 VC="C:\Program Files\Microsoft Visual Studio\Vc98"
 
-PDNTINCLUDE = /I. /I\tcl\include /I\ftp\pd\src /I$(VC)\include
+PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include
 
 PDNTLDIR = $(VC)\lib
 PDNTLIB = $(PDNTLDIR)\libc.lib \
 	$(PDNTLDIR)\oldnames.lib \
 	$(PDNTLDIR)\kernel32.lib \
-	\ftp\pd\bin\pd.lib 
+	..\..\bin\pd.lib 
 
 .c.dll:
 	cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
@@ -37,8 +38,7 @@ SGIINCLUDE =  -I../../src
 .c.pd_irix5:
 	cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c
 	ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o
-	rm -f $*.o ../$*.pd_linux
-	ln -s $*.pd_linux ..
+	rm $*.o
 
 # ----------------------- IRIX 6.x -----------------------
 
@@ -52,7 +52,7 @@ SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
 
 .c.pd_irix6:
 	cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c
-	ld -n32 -IPA  -shared -rdata_shared -o $*.pd_irix6 $*.o
+	ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o
 	rm $*.o
 
 # ----------------------- LINUX i386 -----------------------
@@ -61,20 +61,17 @@ pd_linux: $(NAME).pd_linux
 
 .SUFFIXES: .pd_linux
 
-LINUXCFLAGS = -fPIC -DPD -O2 -funroll-loops -fomit-frame-pointer \
+LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \
     -Wall -W -Wshadow -Wstrict-prototypes -Werror \
     -Wno-unused -Wno-parentheses -Wno-switch
 
 LINUXINCLUDE =  -I../../src
 
-LSTRIP = strip --strip-unneeded -R .note -R .comment
-
 .c.pd_linux:
 	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
-	cc -Wl,-export_dynamic --shared -o $*.pd_linux $*.o -lm
-	$(LSTRIP) $*.pd_linux
-	rm -f $*.o ../$*.pd_linux
-	ln -s $*/$*.pd_linux ..
+	ld -export_dynamic  -shared -o $*.pd_linux $*.o -lc -lm
+	strip --strip-unneeded $*.pd_linux
+	rm -f $*.o
 
 # ----------------------- Mac OSX -----------------------
 
@@ -87,9 +84,8 @@ DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
 
 .c.pd_darwin:
 	cc $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
-	cc -bundle -undefined suppress  -flat_namespace -o $*.pd_darwin $*.o 
-	rm -f $*.o ../$*.pd_darwin
-	ln -s $*/$*.pd_darwin ..
+	cc -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o 
+	rm -f $*.o
 
 # ----------------------------------------------------------
 
diff --git a/pd/extra/loop~/test-loop~.pd b/pd/extra/loop~/test-loop~.pd
index 9f454109..9966483d 100644
--- a/pd/extra/loop~/test-loop~.pd
+++ b/pd/extra/loop~/test-loop~.pd
@@ -1,56 +1,58 @@
-#N canvas 33 0 498 586 12;
-#X floatatom 52 262;
+#N canvas 33 0 680 609 12;
+#X floatatom 52 262 0 0 0 0 - - -;
 #X obj 261 346 print~;
-#X msg 57 370 bang;
+#X msg 47 373 bang;
 #X msg 274 313 bang;
 #X obj 52 306 loop~;
-#X floatatom 102 245;
-#X graph graph1 0 0 44100 10 120 186 320 36;
-#X array array1 44100 float;
-#X pop;
+#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 180 376 bang;
-#X obj 148 407 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;
-#X graph graph1 0 -1 150000 1 273 543 473 393;
-#X array array2 150000 float;
-#X pop;
+#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 235 234 soundfiler;
-#X msg 215 199 read ../../../ham/Hamburger.wav array2;
 #X obj 103 529 tabread4~ array2;
-#X obj 64 496 *~;
+#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;
+#X floatatom 106 430 0 0 0 0 - - -;
 #X obj 108 453 *~ 1000;
-#X msg 222 169 read ../../../ham/Wrong.wav array2;
+#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 19 0;
+#X connect 4 0 17 0;
 #X connect 4 0 8 0;
-#X connect 4 0 22 1;
+#X connect 4 0 20 1;
 #X connect 4 1 10 0;
 #X connect 4 1 1 0;
-#X connect 4 1 19 1;
+#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 17 0 16 0;
-#X connect 18 0 21 0;
-#X connect 19 0 23 0;
-#X connect 21 0 20 0;
-#X connect 21 0 20 1;
-#X connect 22 0 23 1;
-#X connect 23 0 18 0;
-#X connect 24 0 25 0;
-#X connect 25 0 22 0;
-#X connect 26 0 16 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;