Merge pull request #112 from ben-wes/somefixes

Some fixes

Author: tremblap

abstractions/fluid.concataudiofiles.pd

@@ -11,7 +11,6 @@
 #X msg 664 322 1;
 #X obj 649 262 t s s b;
 #X obj 600 370 t s b;
-#X obj 293 149 text delete \$2;
 #X obj 601 569 text set \$2;
 #X obj 763 349 unpack f f f;
 #X obj 366 92 s \$0-clear;
@@ -63,108 +62,109 @@
 #X obj 148 661 pack s s;
 #X obj 200 638 symbol \$0-tmp-array;
 #X obj 558 823 clone fluid.multiarray 8 \$0-tmp-array;
-#X msg 148 692 read -resize \$1 \$2-0 \$2-1 \$2-2 \$2-3 \$2-4 \$2-5
-\$2-6 \$2-7;
+#X msg 148 692 read -resize \$1 \$2-0 \$2-1 \$2-2 \$2-3 \$2-4 \$2-5 \$2-6 \$2-7;
 #X obj 150 747 t b;
-#X obj 160 823 fluid.bufcompose -source \$0-tmp-array -destination
-\$1;
+#X obj 160 823 fluid.bufcompose -source \$0-tmp-array -destination \$1;
 #X obj 76 618 list split 1;
 #X msg 114 778 numchans \$2 \, deststartframe \$3;
 #X text 241 216 2) iterates through the list;
 #X text 341 59 1) resets;
-#X text 707 250 3) reads the headers and write the data is valid audio
-file, f 30;
-#X text 255 428 4) after the iteration \, resizes the destination,
-f 24;
-#X text 239 723 5) then iterates through each valid file \, loading
-in a temp multiarray and copying in the destination array at the right
-place.;
+#X text 707 250 3) reads the headers and write the data is valid audio file, f 30;
+#X text 255 428 4) after the iteration \, resizes the destination, f 24;
+#X text 239 723 5) then iterates through each valid file \, loading in a temp multiarray and copying in the destination array at the right place.;
 #X obj 77 436 t b f b, f 18;
 #X obj 77 460 outlet;
-#X connect 0 0 25 0;
+#X obj 293 149 text delete;
+#X obj 461 82 loadbang;
+#X obj 461 106 list store \$2;
+#X obj 461 130 route symbol;
+#X connect 0 0 24 0;
 #X connect 1 0 2 0;
-#X connect 1 0 13 1;
-#X connect 1 0 39 0;
+#X connect 1 0 12 1;
+#X connect 1 0 38 0;
 #X connect 2 0 1 1;
-#X connect 3 0 12 0;
+#X connect 3 0 75 0;
 #X connect 4 0 1 1;
-#X connect 4 0 27 0;
-#X connect 5 0 28 0;
-#X connect 5 1 14 0;
+#X connect 4 0 26 0;
+#X connect 5 0 27 0;
+#X connect 5 1 13 0;
 #X connect 6 0 5 0;
 #X connect 7 0 11 0;
 #X connect 8 0 7 1;
 #X connect 9 0 7 1;
 #X connect 10 0 7 0;
 #X connect 10 1 6 0;
 #X connect 10 2 8 0;
-#X connect 11 0 59 0;
+#X connect 11 0 58 0;
 #X connect 11 1 1 0;
-#X connect 14 0 59 1;
-#X connect 14 2 30 0;
-#X connect 14 2 59 2;
-#X connect 16 0 4 0;
-#X connect 17 0 18 0;
-#X connect 17 0 24 0;
-#X connect 18 0 17 1;
-#X connect 19 0 17 1;
-#X connect 20 0 19 0;
-#X connect 21 0 22 0;
-#X connect 22 0 17 0;
-#X connect 23 0 10 0;
-#X connect 24 0 23 0;
-#X connect 25 0 38 0;
-#X connect 25 1 21 0;
-#X connect 25 2 23 1;
-#X connect 25 3 15 0;
-#X connect 25 3 3 0;
-#X connect 25 3 41 0;
-#X connect 26 0 27 1;
-#X connect 26 0 59 4;
-#X connect 26 0 35 0;
-#X connect 27 0 26 1;
-#X connect 27 0 59 3;
-#X connect 28 0 9 0;
-#X connect 28 1 26 0;
-#X connect 28 2 27 0;
-#X connect 29 0 33 0;
-#X connect 29 1 30 1;
-#X connect 30 0 29 0;
-#X connect 31 0 30 1;
-#X connect 32 0 31 0;
-#X connect 34 0 42 0;
-#X connect 36 0 43 0;
-#X connect 38 0 50 0;
-#X connect 39 0 37 0;
-#X connect 41 0 40 0;
-#X connect 42 0 45 0;
-#X connect 44 0 43 1;
-#X connect 45 0 46 0;
-#X connect 45 0 49 0;
-#X connect 46 0 45 1;
-#X connect 47 0 45 1;
-#X connect 48 0 47 0;
-#X connect 49 0 36 0;
-#X connect 49 1 44 0;
-#X connect 50 0 51 0;
-#X connect 50 1 74 0;
-#X connect 52 0 67 0;
+#X connect 13 0 58 1;
+#X connect 13 2 29 0;
+#X connect 13 2 58 2;
+#X connect 15 0 4 0;
+#X connect 16 0 17 0;
+#X connect 16 0 23 0;
+#X connect 17 0 16 1;
+#X connect 18 0 16 1;
+#X connect 19 0 18 0;
+#X connect 20 0 21 0;
+#X connect 21 0 16 0;
+#X connect 22 0 10 0;
+#X connect 23 0 22 0;
+#X connect 24 0 37 0;
+#X connect 24 1 20 0;
+#X connect 24 2 22 1;
+#X connect 24 3 14 0;
+#X connect 24 3 3 0;
+#X connect 24 3 40 0;
+#X connect 25 0 26 1;
+#X connect 25 0 58 4;
+#X connect 25 0 34 0;
+#X connect 26 0 25 1;
+#X connect 26 0 58 3;
+#X connect 27 0 9 0;
+#X connect 27 1 25 0;
+#X connect 27 2 26 0;
+#X connect 28 0 32 0;
+#X connect 28 1 29 1;
+#X connect 29 0 28 0;
+#X connect 30 0 29 1;
+#X connect 31 0 30 0;
+#X connect 33 0 41 0;
+#X connect 35 0 42 0;
+#X connect 37 0 49 0;
+#X connect 38 0 36 0;
+#X connect 40 0 39 0;
+#X connect 41 0 44 0;
+#X connect 43 0 42 1;
+#X connect 44 0 45 0;
+#X connect 44 0 48 0;
+#X connect 45 0 44 1;
+#X connect 46 0 44 1;
+#X connect 47 0 46 0;
+#X connect 48 0 35 0;
+#X connect 48 1 43 0;
+#X connect 49 0 50 0;
+#X connect 49 1 73 0;
+#X connect 51 0 66 0;
+#X connect 52 0 53 0;
 #X connect 53 0 54 0;
-#X connect 54 0 55 0;
-#X connect 54 0 52 0;
-#X connect 55 0 54 1;
-#X connect 56 0 54 1;
-#X connect 57 0 56 0;
-#X connect 59 0 13 0;
-#X connect 60 0 65 0;
-#X connect 61 0 64 0;
-#X connect 62 0 61 1;
-#X connect 64 0 60 0;
-#X connect 65 0 66 0;
-#X connect 67 0 61 0;
-#X connect 67 1 68 0;
-#X connect 68 0 66 0;
-#X connect 74 0 75 0;
-#X connect 74 1 53 0;
-#X connect 74 2 34 0;
-#X connect 74 2 62 0;
+#X connect 53 0 51 0;
+#X connect 54 0 53 1;
+#X connect 55 0 53 1;
+#X connect 56 0 55 0;
+#X connect 58 0 12 0;
+#X connect 59 0 64 0;
+#X connect 60 0 63 0;
+#X connect 61 0 60 1;
+#X connect 63 0 59 0;
+#X connect 64 0 65 0;
+#X connect 66 0 60 0;
+#X connect 66 1 67 0;
+#X connect 67 0 65 0;
+#X connect 73 0 74 0;
+#X connect 73 1 52 0;
+#X connect 73 2 33 0;
+#X connect 73 2 61 0;
+#X connect 76 0 77 0;
+#X connect 77 0 78 0;
+#X connect 78 0 75 1;

abstractions/fluid.ds2text.pd

@@ -5,8 +5,7 @@
 #X msg 84 39 0;
 #X msg 120 400 getlabel \$1;
 #X obj 120 377 makefilename %s;
-#X obj 85 9 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000
-#000000;
+#X obj 85 9 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
 #X obj 156 473 route getlabel;
 #X obj 156 497 list;
 #X obj 286 636 route getpoint;
@@ -33,9 +32,12 @@
 #X obj 139 303 outlet;
 #X obj 158 223 t b;
 #X obj 289 668 t b;
-#X obj 264 26 inlet;
-#X obj 154 35 text delete \$2;
-#X msg 122 38 -1;
+#X obj 406 10 inlet;
+#X msg 147 40 -1;
+#X obj 288 14 loadbang;
+#X obj 187 15 list store \$2;
+#X obj 187 40 route symbol;
+#X obj 147 67 text delete;
 #X connect 0 0 1 0;
 #X connect 1 0 11 0;
 #X connect 2 0 1 1;
@@ -59,7 +61,7 @@
 #X connect 18 0 14 0;
 #X connect 19 0 20 0;
 #X connect 19 1 3 0;
-#X connect 19 1 35 0;
+#X connect 19 1 34 0;
 #X connect 20 0 21 0;
 #X connect 21 0 26 0;
 #X connect 22 0 24 1;
@@ -77,4 +79,7 @@
 #X connect 32 0 16 0;
 #X connect 33 0 26 0;
 #X connect 33 0 28 0;
-#X connect 35 0 34 0;
+#X connect 34 0 38 0;
+#X connect 35 0 36 0;
+#X connect 36 0 37 0;
+#X connect 37 0 38 1;

abstractions/fluid.ls2text.pd

@@ -1,12 +1,11 @@
-#N canvas 832 23 462 762 12;
+#N canvas 832 25 462 762 12;
 #X obj 185 267 until;
 #X obj 48 311 f;
 #X obj 91 356 + 1;
 #X msg 84 39 0;
 #X msg 120 400 getlabel \$1;
 #X obj 120 377 makefilename %s;
-#X obj 85 9 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000
-#000000;
+#X obj 85 9 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
 #X obj 154 453 route getlabel;
 #X obj 154 477 list;
 #X obj 154 672 list;
@@ -27,11 +26,13 @@
 #X obj 291 618 route getlabel;
 #X obj 149 235 t b f;
 #X obj 113 263 outlet;
-#X obj 149 191 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc
-#000000 #000000;
-#X obj 154 35 text delete \$2;
+#X obj 149 191 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
 #X msg 122 38 -1;
-#X obj 332 42 inlet;
+#X obj 394 9 inlet;
+#X obj 285 12 loadbang;
+#X obj 182 13 list store \$2;
+#X obj 182 37 route symbol;
+#X obj 143 69 text delete;
 #X connect 0 0 1 0;
 #X connect 1 0 10 0;
 #X connect 2 0 1 1;
@@ -49,7 +50,7 @@
 #X connect 13 0 14 0;
 #X connect 14 0 15 0;
 #X connect 14 1 3 0;
-#X connect 14 1 29 0;
+#X connect 14 1 28 0;
 #X connect 15 0 20 0;
 #X connect 16 0 9 0;
 #X connect 16 1 17 0;
@@ -65,6 +66,9 @@
 #X connect 25 0 26 0;
 #X connect 25 1 0 0;
 #X connect 27 0 11 0;
-#X connect 29 0 28 0;
-#X connect 30 0 19 0;
-#X connect 30 0 23 0;
+#X connect 28 0 33 0;
+#X connect 29 0 19 0;
+#X connect 29 0 23 0;
+#X connect 30 0 31 0;
+#X connect 31 0 32 0;
+#X connect 32 0 33 1;