1 files changed, 159 insertions, 131 deletions

diff --git a/tof/sample_play~.pd b/tof/sample_play~.pd
index 1010ef4..b0e60b4 100644
--- a/tof/sample_play~.pd
+++ b/tof/sample_play~.pd
@@ -1,40 +1,110 @@
-#N canvas 1162 3 729 673 10;
-#X obj 19 -42 inlet;
-#X obj 51 439 *~ 0;
-#X obj 55 578 outlet~;
-#X msg 314 243 0;
-#X obj 44 355 tof/phasorshot~;
+#N canvas 135 24 729 684 10;
+#X obj 29 -23 inlet;
+#X obj 71 321 *~ 0;
+#X obj 260 598 outlet~;
 #X obj 51 502 tabread4~;
-#X obj 212 582 outlet~;
+#X obj 417 602 outlet~;
 #X obj 219 512 tabread4~;
-#X obj 36 292 *~ 0;
-#X obj 29 235 sig~ 1;
-#X obj 280 24 inlet speed;
-#X msg 343 247 1;
-#X msg 184 208 0;
-#X msg 422 429 1;
-#X msg 353 427 0;
-#X obj 260 127 sel 0;
-#X obj 513 -6 loadbang;
-#X obj 513 26 tof/argument 1;
-#X msg 517 57 sample \$1;
+#X obj 223 565 *~;
+#X obj 343 556 *~;
+#X obj 132 401 +~ 0;
+#X obj 41 46 route bang float;
+#X obj 231 -20 inlet pitch;
+#N canvas 0 0 892 551 player 0;
+#X obj 702 496 outlet get_sample;
+#X obj 91 29 inlet bang;
+#X obj 253 38 inlet float;
+#X obj 388 34 inlet pitch;
+#X obj 85 501 outlet~ phase;
+#X msg 172 265 0;
+#X obj 80 318 tof/phasorshot~;
+#X obj 75 249 sig~ 1;
+#X msg 310 229 1;
+#X msg 267 232 0;
+#X msg 501 440 1;
+#X msg 437 434 0;
+#X obj 350 144 sel 0;
+#N canvas 0 0 450 300 start_phase 0;
+#X obj 76 249 outlet;
+#X obj 244 26 inlet speed;
+#X obj 68 28 inlet bang;
+#X obj 74 145 < 0;
+#X obj 76 115 f 1;
+#X connect 1 0 4 1;
+#X connect 2 0 4 0;
+#X connect 3 0 0 0;
+#X connect 4 0 3 0;
+#X restore 132 200 pd start_phase;
+#X obj 271 365 spigot;
+#X obj 377 395 t b b;
+#X msg 380 430 0;
+#X obj 283 310 == 0;
+#X obj 254 266 t f f;
+#X obj 94 107 t b b b;
+#X obj 378 178 t b b b;
+#X obj 519 292 t b b;
+#X obj 561 38 inlet speed;
+#X obj 416 516 line~;
+#X msg 416 490 \$1 5;
+#X obj 555 510 outlet~ output;
+#X connect 1 0 19 0;
+#X connect 2 0 12 0;
+#X connect 3 0 13 1;
+#X connect 5 0 6 1;
+#X connect 6 0 4 0;
+#X connect 6 1 14 0;
+#X connect 6 2 14 0;
+#X connect 7 0 6 0;
+#X connect 8 0 18 0;
+#X connect 9 0 18 0;
+#X connect 10 0 24 0;
+#X connect 11 0 24 0;
+#X connect 12 0 11 0;
+#X connect 12 1 20 0;
+#X connect 13 0 6 1;
+#X connect 14 0 15 0;
+#X connect 15 0 16 0;
+#X connect 15 1 11 0;
+#X connect 16 0 14 1;
+#X connect 16 0 24 0;
+#X connect 17 0 14 1;
+#X connect 18 0 6 2;
+#X connect 18 1 17 0;
+#X connect 19 0 13 0;
+#X connect 19 1 9 0;
+#X connect 19 2 21 0;
+#X connect 20 0 5 0;
+#X connect 20 1 8 0;
+#X connect 20 2 21 0;
+#X connect 21 0 10 0;
+#X connect 21 1 0 0;
+#X connect 22 0 7 0;
+#X connect 23 0 25 0;
+#X connect 24 0 23 0;
+#X restore 70 220 pd player;
+#N canvas 0 0 842 452 parse_sample 0;
+#X obj 392 336 outlet end;
+#X obj 493 335 outlet start;
+#X obj 600 336 outlet length;
+#X obj 265 336 outlet tables;
+#X obj 127 338 outlet base_freq;
 #N canvas 0 0 450 300 find_freq 0;
 #X obj 83 241 outlet;
-#N canvas 0 0 450 300 smpToFreq 0;
+#N canvas 330 268 450 300 smpToFreq 0;
 #X obj 41 35 inlet;
-#X obj 236 181 samplerate~;
+#X obj 135 179 samplerate~;
 #X obj 65 346 outlet;
-#X obj 126 104 t f b;
-#X obj 131 281 expr $f2/$f1;
 #X obj 41 67 sel 0;
 #X msg 46 154 0;
-#X connect 0 0 5 0;
-#X connect 1 0 4 1;
+#X obj 126 104 t b f;
+#X obj 132 281 /;
+#X connect 0 0 3 0;
+#X connect 1 0 6 0;
 #X connect 3 0 4 0;
-#X connect 3 1 1 0;
+#X connect 3 1 5 0;
 #X connect 4 0 2 0;
-#X connect 5 0 6 0;
-#X connect 5 1 3 0;
+#X connect 5 0 1 0;
+#X connect 5 1 6 1;
 #X connect 6 0 2 0;
 #X restore 249 100 pd smpToFreq;
 #X obj 120 96 samplerate~;
@@ -51,110 +121,68 @@
 #X connect 5 0 4 0;
 #X connect 6 0 1 0;
 #X connect 7 0 3 0;
-#X restore 477 252 pd find_freq;
-#N canvas 0 0 450 300 set_tables 0;
-#X obj 42 22 inlet basename;
-#X obj 246 21 inlet channels;
-#X obj 71 253 outlet left;
-#X obj 269 249 outlet right;
-#X obj 242 59 > 1;
-#X obj 135 133 zexy/demultiplex;
-#X msg 123 186 set 0-\$1;
-#X msg 188 186 set 0-\$1;
-#X msg 273 187 set 1-\$1;
-#X connect 0 0 5 0;
-#X connect 1 0 4 0;
-#X connect 4 0 5 1;
-#X connect 5 0 6 0;
+#X restore 192 201 pd find_freq;
+#X obj 356 160 -;
+#X obj 277 72 sample_unpack;
+#X obj 231 252 zexy/demultiplex;
+#X obj 315 223 > 1;
+#X msg 210 277 list 0-\$1 0-\$1;
+#X msg 326 275 list 0-\$1 1-\$1;
+#X obj 218 5 inlet;
+#X obj 455 3 loadbang;
+#X obj 455 35 tof/argument 1;
+#X msg 459 66 sample \$1;
+#X connect 5 0 4 0;
+#X connect 6 0 5 1;
+#X connect 6 0 2 0;
+#X connect 7 0 5 0;
+#X connect 7 2 8 0;
+#X connect 7 3 9 0;
+#X connect 7 4 6 0;
+#X connect 7 4 0 0;
+#X connect 7 5 6 1;
+#X connect 7 5 1 0;
+#X connect 8 0 10 0;
+#X connect 8 1 11 0;
+#X connect 9 0 8 1;
+#X connect 10 0 3 0;
+#X connect 11 0 3 0;
+#X connect 12 0 7 0;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 15 0 7 0;
+#X restore 309 212 pd parse_sample;
+#X obj 163 199 *;
+#X obj 311 390 unpack s s;
+#X msg 306 419 set \$1;
+#X msg 371 424 set \$1;
+#X obj 167 143 f 1;
+#X obj 190 167 t b f;
+#X connect 0 0 9 0;
+#X connect 1 0 8 0;
+#X connect 3 0 6 0;
 #X connect 5 0 7 0;
-#X connect 5 1 8 0;
-#X connect 5 1 6 0;
 #X connect 6 0 2 0;
-#X connect 7 0 3 0;
+#X connect 7 0 4 0;
 #X connect 8 0 3 0;
-#X restore 569 250 pd set_tables;
-#N canvas 0 0 450 300 start_phase 0;
-#X obj 76 249 outlet;
-#X obj 76 115 f;
-#X obj 244 26 inlet speed;
-#X obj 68 28 inlet bang;
-#X obj 74 145 < 0;
-#X connect 1 0 4 0;
-#X connect 2 0 1 1;
-#X connect 3 0 1 0;
-#X connect 4 0 0 0;
-#X restore 77 225 pd start_phase;
-#X msg 225 209 1;
-#X obj 96 397 spigot;
-#X msg 392 191 0;
-#X obj 258 409 t b b;
-#X msg 260 431 0;
-#X obj 368 510 line~;
-#X obj 64 547 *~;
-#X obj 218 551 *~;
-#X msg 368 484 \$1 5;
-#X obj 513 147 sample_unpack;
-#X obj 575 211 -;
-#X obj 51 466 +~ 0;
-#X obj 41 46 route bang float;
-#X obj 19 150 t b b b b b;
-#X obj 320 162 t b b b b b;
-#X connect 0 0 34 0;
-#X connect 1 0 33 0;
-#X connect 3 0 4 1;
-#X connect 4 0 1 0;
-#X connect 4 1 23 0;
-#X connect 4 2 23 0;
-#X connect 5 0 28 0;
-#X connect 7 0 29 0;
-#X connect 8 0 4 0;
-#X connect 9 0 8 0;
-#X connect 10 0 9 0;
-#X connect 10 0 21 1;
-#X connect 11 0 4 2;
-#X connect 12 0 4 2;
-#X connect 13 0 30 0;
-#X connect 14 0 30 0;
-#X connect 15 0 14 0;
-#X connect 15 1 36 0;
-#X connect 16 0 17 0;
-#X connect 17 0 18 0;
-#X connect 18 0 31 0;
-#X connect 19 0 8 1;
-#X connect 20 0 5 0;
-#X connect 20 1 7 0;
-#X connect 21 0 4 1;
-#X connect 22 0 23 1;
-#X connect 23 0 25 0;
-#X connect 24 0 23 1;
-#X connect 25 0 26 0;
-#X connect 25 1 14 0;
-#X connect 26 0 23 1;
-#X connect 27 0 29 1;
-#X connect 27 0 28 1;
-#X connect 28 0 2 0;
-#X connect 29 0 6 0;
-#X connect 30 0 27 0;
-#X connect 31 0 19 0;
-#X connect 31 3 20 0;
-#X connect 31 4 20 1;
-#X connect 31 5 32 0;
-#X connect 31 6 32 1;
-#X connect 31 6 33 1;
-#X connect 32 0 19 1;
-#X connect 32 0 1 1;
-#X connect 33 0 5 0;
-#X connect 33 0 7 0;
-#X connect 34 0 35 0;
-#X connect 34 1 15 0;
-#X connect 34 2 31 0;
-#X connect 35 0 13 0;
-#X connect 35 1 21 0;
-#X connect 35 2 12 0;
-#X connect 35 3 22 0;
-#X connect 35 4 31 0;
-#X connect 36 0 3 0;
-#X connect 36 1 11 0;
-#X connect 36 2 13 0;
-#X connect 36 3 24 0;
-#X connect 36 4 31 0;
+#X connect 8 0 5 0;
+#X connect 9 0 11 0;
+#X connect 9 1 11 1;
+#X connect 9 2 12 0;
+#X connect 10 0 11 2;
+#X connect 10 0 17 0;
+#X connect 11 0 1 0;
+#X connect 11 1 6 1;
+#X connect 11 1 7 1;
+#X connect 12 0 18 0;
+#X connect 12 1 14 0;
+#X connect 12 3 8 1;
+#X connect 12 4 1 1;
+#X connect 13 0 11 3;
+#X connect 14 0 15 0;
+#X connect 14 1 16 0;
+#X connect 15 0 3 0;
+#X connect 16 0 5 0;
+#X connect 17 0 13 0;
+#X connect 18 0 17 0;
+#X connect 18 1 13 1;