proper tilde-fication

svn path=/trunk/externals/many/; revision=14490

8 files changed, 29 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index bc775cd..8240111 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 ## Pd library template version 1.0.6
 # For instructions on how to use this template, see:
 #  http://puredata.info/docs/developer/MakefileTemplate
-LIBRARY_NAME = manypoly
+LIBRARY_NAME = many
 
 # add your .c source files, one object per file, to the SOURCES
 # variable, help files will be included automatically
@@ -9,7 +9,7 @@ SOURCES =
 
 # list all pd objects (i.e. myobject.pd) files here, and their helpfiles will
 # be included automatically
-PDOBJECTS = instances.pd instances-template.pd instances~.pd instances-template~.pd polypoly~.pd polypoly-wrap~.pd polypoly-voice~.pd voicepoly.pd voicepoly-wrap.pd
+PDOBJECTS = instances.pd instances-template.pd instances~.pd instances-template~.pd polypoly~.pd polypoly-wrap~.pd polypoly-voice~.pd voices~.pd voices-wrap~.pd
 
 # example patches and related files, in the 'examples' subfolder
 EXAMPLES = tick.wav ticker-voice.pd ticker.pd tock.wav aw.wav voicetest.pd run-200voicetest.pd
diff --git a/examples/run-200voicetest.pd b/examples/run-200voicetest.pd
index b42a53d..16f5e69 100644
--- a/examples/run-200voicetest.pd
+++ b/examples/run-200voicetest.pd
@@ -17,7 +17,7 @@ that is banged when the voice is finished.;
 #X text 26 169 factor by which to stretch sample;
 #X text 26 183 (i.e. 2 means twice as long);
 #X text 33 459 this is the patch of a single voice \, it has the same
-inlets and outlets as voicepoly above:;
+inlets and outlets as voices~ above:;
 #X obj 335 188 table \$0-sample;
 #X text 221 298 (you can send \$0 for localizing things);
 #X obj 336 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
@@ -57,7 +57,7 @@ inlets and outlets as voicepoly above:;
 #X text 248 263 <-- send the size of the sample table to all instances
 ;
 #X obj 67 349 output~;
-#X obj 135 505 voicetest 0 0 \$0;
+#X obj 135 505 voicetest~ 0 0 \$0;
 #X obj 60 272 pack 0 0;
 #X obj 78 250 t b f;
 #X obj 417 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
@@ -65,25 +65,28 @@ inlets and outlets as voicepoly above:;
 #X text 435 137 <-- record from mic;
 #X text 148 78 <-- play your voice like an instrument \, click and
 drag;
-#X obj 60 297 voicepoly 200 voicetest \$0;
+#X obj 60 297 voices~ 200 voicetest~ \$0;
 #N canvas 0 22 450 300 (subpatch) 0;
 #X obj 106 259 outlet;
-#X obj 106 80 inlet;
-#X obj 160 79 inlet;
-#X obj 106 101 / 80;
-#X obj 106 234 pack float float;
-#X obj 106 214 * 10;
-#X obj 160 101 / 90;
-#X obj 160 125 + 0.1;
-#X obj 106 186 mapping/exponential_curve 0.75;
+#X obj 106 30 inlet;
+#X obj 160 29 inlet;
+#X obj 106 86 / 80;
+#X obj 106 199 pack float float;
+#X obj 160 152 * 10;
+#X obj 160 86 / 90;
+#X obj 160 110 + 0.1;
+#X obj 160 131 mapping/exponential_curve 0.75;
+#X obj 106 152 t b 0;
 #X connect 1 0 3 0;
 #X connect 2 0 6 0;
-#X connect 3 0 4 1;
+#X connect 3 0 9 0;
 #X connect 4 0 0 0;
 #X connect 5 0 4 0;
 #X connect 6 0 7 0;
 #X connect 7 0 8 0;
 #X connect 8 0 5 0;
+#X connect 9 0 4 0;
+#X connect 9 1 4 1;
 #X coords 0 0 1 1 90 90 0;
 #X restore 2 175 pd;
 #X obj 64 76 gcanvas 80 80;
diff --git a/examples/ticker-voice.pd b/examples/ticker-voice~.pd
index 8493f67..8493f67 100644
--- a/examples/ticker-voice.pd
+++ b/examples/ticker-voice~.pd
diff --git a/examples/ticker.pd b/examples/ticker.pd
index fcbab38..ef22525 100644
--- a/examples/ticker.pd
+++ b/examples/ticker.pd
@@ -22,9 +22,9 @@
 #X obj 85 312 output~;
 #X text 35 34 <-- turn on clock;
 #X text 185 57 <-- run it faster!;
-#X obj 53 221 voicepoly 100 ticker-voice \$0;
+#X obj 53 221 voices~ 100 ticker-voice~ \$0;
 #X text 201 302 here is the playback patch:;
-#X obj 211 333 ticker-voice 0 0 \$0;
+#X obj 211 333 ticker-voice~ 0 0 \$0;
 #X connect 3 0 2 0;
 #X connect 4 0 3 0;
 #X connect 5 0 4 0;
diff --git a/examples/voicetest.pd b/examples/voicetest~.pd
index 06a8a5d..76c3afd 100644
--- a/examples/voicetest.pd
+++ b/examples/voicetest~.pd
@@ -6,7 +6,7 @@
 #X obj 320 463 outlet;
 #X text 367 463 bang when done;
 #X obj 122 337 line~;
-#X obj -15 88 print voicetest_\$1;
+#X obj -15 88 print voicetest~_\$1;
 #X obj 282 76 samplerate~;
 #X obj 267 97 /;
 #X obj 320 435 delay;
diff --git a/voices-wrap~-help.pd b/voices-wrap~-help.pd
new file mode 100644
index 0000000..43330fd
--- /dev/null
+++ b/voices-wrap~-help.pd
@@ -0,0 +1,5 @@
+#N canvas 137 124 450 300 10;
+#X text 60 100 [polypoly~-wrap] is an object used by [polypoly~] to handle
+the voice allocation logic for each patch that [polypoly~] is instantiating.
+It is not a patch that has any use outside of how [polypoly~] uses it
+internally.;
diff --git a/voicepolywrap.pd b/voices-wrap~.pd
index c9a0c95..c9a0c95 100644
--- a/voicepolywrap.pd
+++ b/voices-wrap~.pd
diff --git a/voicepoly.pd b/voices~.pd
index 2347941..cf22bc9 100644
--- a/voicepoly.pd
+++ b/voices~.pd
@@ -13,7 +13,7 @@ as senders and receivers.;
 #X obj 142 125 pack symbol \$0;
 #X obj 142 30 bang;
 #X obj 142 7 inlet;
-#X obj 142 77 symbol \$0-voicepoly;
+#X obj 142 77 symbol \$0-voices~;
 #X msg 142 166 \; \$1 clear \; \$1 obj 10 10 receive \$2-in1 \; \$1
 obj 400 10 receive \$2-in2 \; \$1 obj 10 560 throw~ \$2-audioL \; \$1
 obj 380 560 throw~ \$2-audioR \; \$1 obj 500 560 send \$2-voicemsg
@@ -102,7 +102,7 @@ obj 380 560 throw~ \$2-audioR \; \$1 obj 500 560 send \$2-voicemsg
 #X obj 29 221 + 5;
 #X msg 29 316 \; \$1 connect \$3 0 \$2 0 \;;
 #X obj 29 37 trigger anything anything anything bang bang;
-#X msg 44 162 \; \$3 obj 150 \$2 voicepolywrap \$4 \$1 \$5 \$6 \$7
+#X msg 44 162 \; \$3 obj 150 \$2 voices-wrap~ \$4 \$1 \$5 \$6 \$7
 \$8 \$9 \;;
 #N canvas 183 272 316 307 expandpath 0;
 #X obj 59 16 inlet;
@@ -156,8 +156,8 @@ obj 380 560 throw~ \$2-audioR \; \$1 obj 500 560 send \$2-voicemsg
 #X restore 185 453 pd connect user outlets;
 #X text 122 97 <-- open this subpatch to see the instances;
 #X obj 48 310 trigger anything anything bang;
-#N canvas 100 24 601 588 \$0-voicepoly 0;
-#X restore 26 96 pd \$0-voicepoly;
+#N canvas 100 24 601 588 \$0-voices~ 0;
+#X restore 26 96 pd \$0-voices~;
 #X obj 136 209 outlet~;
 #X obj 26 124 catch~ \$0-audioL;
 #X obj 136 124 catch~ \$0-audioR;