merged old-version bug fixes to master

sebpiq · Jan 17, 2013 · 0f7e0a5 · 0f7e0a5
1 parent a9be13f
commit 0f7e0a5
Show file tree

Hide file tree

Showing 3 changed files with 187 additions and 100 deletions.
diff --git a/patch/automixer~.pd b/patch/automixer~.pd
@@ -0,0 +1,32 @@
+#N canvas 378 139 1231 658 10;
+#X obj 4 198 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
+#X obj 3 171 - 80;
+#X obj 107 121 hsl 50 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 2102 1;
+#X floatatom 104 32 5 0 0 0 - - -;
+#X obj 104 77 line;
+#X msg 104 54 \$1 2000;
+#X obj -24 137 env~ 352800 176400;
+#X obj -26 37 inlet~;
+#X obj -77 136 outlet~;
+#X obj -78 81 *~;
+#X obj 104 8 max 0.1;
+#X floatatom 226 -1 5 0 0 0 - - -;
+#X obj 104 -16 min 0.5;
+#X obj 104 -62 * -0.01818;
+#X obj 104 -38 + 0.4636;
+#X connect 1 0 0 0;
+#X connect 1 0 13 0;
+#X connect 2 0 9 1;
+#X connect 3 0 5 0;
+#X connect 4 0 2 0;
+#X connect 5 0 4 0;
+#X connect 6 0 1 0;
+#X connect 7 0 6 0;
+#X connect 7 0 9 0;
+#X connect 9 0 8 0;
+#X connect 10 0 3 0;
+#X connect 12 0 10 0;
+#X connect 13 0 14 0;
+#X connect 14 0 12 0;
+#X coords 0 -1 1 1 55 40 1 100 100;
diff --git a/patch/main.pd b/patch/main.pd
@@ -1,4 +1,4 @@
-#N canvas 217 102 1373 593 10;
+#N canvas 66 82 1535 846 10;
 #X declare -lib mrpeach;
 #X obj 566 -5 r \$0-NEW-LOOP;
 #X obj 3 419 catch~ \$0-OUT-L;
@@ -86,32 +86,32 @@
 #X obj 155 158 random 30000;
 #X obj 155 234 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
-#X obj 514 249 throw~ \$0-OUT-L;
-#X obj 584 291 throw~ \$0-OUT-R;
+#X obj 598 295 throw~ \$0-OUT-L;
+#X obj 626 317 throw~ \$0-OUT-R;
 #X msg 17 275 send /gimme_pad;
 #X obj 537 368 r \$0-NEW-PAD;
 #X obj 510 470 time_stretch;
 #X obj 623 469 time_stretch;
 #X msg 687 424 6e+06;
 #X obj 402 154 crossfader;
-#X obj 543 155 crossfader;
-#X obj 672 154 crossfader;
-#X obj 509 523 crossfader2;
-#X obj 624 521 crossfader2;
+#X obj 613 155 crossfader;
+#X obj 827 154 crossfader;
+#X obj 488 523 crossfader2;
+#X obj 624 523 crossfader2;
 #X obj 510 449 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 623 449 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
-#X obj 514 228 *~;
-#X obj 662 223 hsl 128 15 0 1 0 1 empty empty empty -2 -8 0 10 -262144
+#X obj 598 278 *~;
+#X obj 755 269 hsl 128 15 0 1 0 1 empty empty empty -2 -8 0 10 -262144
 -1 -1 4900 1;
-#X obj 585 267 *~;
-#X obj 529 590 throw~ \$0-OUT-L;
-#X obj 599 632 throw~ \$0-OUT-R;
-#X obj 528 569 *~;
-#X obj 677 564 hsl 128 15 0 1 0 1 empty empty empty -2 -8 0 10 -262144
+#X obj 627 277 *~;
+#X obj 553 635 throw~ \$0-OUT-L;
+#X obj 579 657 throw~ \$0-OUT-R;
+#X obj 552 614 *~;
+#X obj 690 596 hsl 128 15 0 1 0 1 empty empty empty -2 -8 0 10 -262144
 -1 -1 9400 1;
-#X obj 600 608 *~;
+#X obj 580 614 *~;
 #N canvas 523 240 638 548 routing_pad 0;
 #X obj 153 38 inlet;
 #X obj 190 155 f;
@@ -170,55 +170,71 @@
 #X obj 18 132 metro 60000;
 #X obj 18 156 random 60000;
 #X obj 687 392 loadbang;
-#N canvas 172 175 1279 705 communication 0;
-#X floatatom 82 359 10 0 0 0 - - -;
-#X msg 64 238 vorbis 44100 2 144 128 96;
-#X msg 96 164 server 1;
-#X obj 1 322 oggcast~ 2 512;
-#X text 151 359 ogg pages;
-#X msg 88 283 ARTIST Sebastien Piquemal;
-#X msg 75 261 TITLE Versificator;
-#X msg 0 207 connect localhost versificator.ogg 8000;
-#X msg 157 162 passwd \$1;
-#X obj 323 -35 udpsend;
-#X msg 323 -118 connect localhost 9000;
-#X obj 323 -145 loadbang;
-#X msg 188 -118 send /init;
-#X obj -97 -86 import mrpeach;
-#X obj -97 -54 udpreceive 9001;
-#X obj -97 -24 unpackOSC;
-#X obj -129 35 s \$0-NEW-LOOP;
-#X obj -32 35 s \$0-NEW-PAD;
-#X obj 323 -11 route 0 1;
-#X obj 338 -89 r \$0-OSC-SEND;
-#X obj 130 87 s \$0-READY;
-#X msg 549 -116 \; pd dsp 1;
-#X obj 549 -142 loadbang;
-#X obj -97 9 routeOSC /new_loop /new_pad /init;
-#X obj 1 361 route 0 1;
-#X obj 188 -145 r \$0-PYTHON-CONNECTED;
-#X obj 348 16 s \$0-PYTHON-CONNECTED;
-#X obj 26 388 s \$0-ICECAST-CONNECTED;
-#X msg -56 251 print;
-#X msg 631 -114 icecast connected;
-#X obj 631 -144 r \$0-ICECAST-CONNECTED;
-#X obj 778 -86 print;
-#X obj 778 -144 r \$0-PYTHON-CONNECTED;
-#X msg 778 -114 python connected;
-#X text 204 80 When this arrives \, the Pure Data patch should be ready
-\, all the connections established...;
-#X obj 332 -62 packOSC;
-#X obj -6 87 print;
-#X msg -6 62 password received;
-#X obj 53 35 route /pwd /ready;
-#X obj 53 87 t b b b a;
-#X obj 157 138 symbol;
-#X obj -101 290 inlet~;
-#X obj -56 290 inlet~;
-#X obj 919 -144 r \$0-READY;
-#X msg 919 -114 python ready;
-#X obj 128 65 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+#N canvas 123 131 1279 705 communication 1;
+#X floatatom 92 427 10 0 0 0 - - -;
+#X msg 74 288 vorbis 44100 2 144 128 96;
+#X msg 106 214 server 1;
+#X obj 11 390 oggcast~ 2 512;
+#X text 161 427 ogg pages;
+#X msg 98 333 ARTIST Sebastien Piquemal;
+#X msg 85 311 TITLE Versificator;
+#X msg 10 257 connect localhost versificator.ogg 8000;
+#X msg 258 200 passwd \$1;
+#X obj 333 -25 udpsend;
+#X msg 333 -108 connect localhost 9000;
+#X obj 333 -135 loadbang;
+#X msg 198 -108 send /init;
+#X obj -87 -76 import mrpeach;
+#X obj -87 -44 udpreceive 9001;
+#X obj -87 -14 unpackOSC;
+#X obj -119 45 s \$0-NEW-LOOP;
+#X obj -22 45 s \$0-NEW-PAD;
+#X obj 333 -1 route 0 1;
+#X obj 348 -79 r \$0-OSC-SEND;
+#X obj 140 137 s \$0-READY;
+#X msg 559 -106 \; pd dsp 1;
+#X obj 559 -132 loadbang;
+#X obj -87 19 routeOSC /new_loop /new_pad /init;
+#X obj 11 429 route 0 1;
+#X obj 198 -135 r \$0-PYTHON-CONNECTED;
+#X obj 358 26 s \$0-PYTHON-CONNECTED;
+#X obj 36 456 s \$0-ICECAST-CONNECTED;
+#X msg -46 301 print;
+#X obj 639 -75 print;
+#X msg 639 -103 icecast connected;
+#X obj 639 -133 r \$0-ICECAST-CONNECTED;
+#X obj 788 -76 print;
+#X obj 788 -134 r \$0-PYTHON-CONNECTED;
+#X msg 788 -104 python connected;
+#X text 214 130 When this arrives \, the Pure Data patch should be
+ready \, all the connections established...;
+#X obj 342 -52 packOSC;
+#X obj 4 137 print;
+#X msg 4 112 password received;
+#X obj 63 45 route /pwd /ready;
+#X obj 63 137 t b b b a;
+#X obj 258 176 symbol;
+#X obj 243 362 inlet~;
+#X obj 288 362 inlet~;
+#X obj 416 401 mp3cast~;
+#X msg 418 285 icecast2;
+#X msg 410 253 connect localhost 8000;
+#X msg 427 310 mountpoint versificator.mp3;
+#X msg 436 338 name Versificator;
+#X obj 63 86 symbol;
+#X obj 182 45 r \$0-ICECAST-RECONNECT;
+#X obj 182 65 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
+#X obj 11 527 s \$0-ICECAST-RECONNECT;
+#X obj 416 430 route 0 1;
+#X obj 788 24 print;
+#X obj 788 -34 r \$0-ICECAST-RECONNECT;
+#X msg 788 -4 reconnecting to icecast;
+#X obj 11 482 del 5000;
+#X obj 11 504 spigot;
+#X obj 60 504 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+1;
+#X obj 80 481 loadbang;
 #X connect 1 0 3 0;
 #X connect 2 0 3 0;
 #X connect 3 0 24 0;
@@ -227,42 +243,62 @@
 #X connect 6 0 3 0;
 #X connect 7 0 3 0;
 #X connect 8 0 3 0;
+#X connect 8 0 44 0;
 #X connect 9 0 18 0;
 #X connect 10 0 9 0;
 #X connect 11 0 10 0;
-#X connect 12 0 35 0;
+#X connect 12 0 36 0;
 #X connect 13 0 14 0;
 #X connect 14 0 15 0;
 #X connect 15 0 23 0;
 #X connect 18 1 26 0;
-#X connect 19 0 35 0;
+#X connect 19 0 36 0;
 #X connect 22 0 21 0;
 #X connect 23 0 16 0;
 #X connect 23 1 17 0;
-#X connect 23 2 38 0;
+#X connect 23 2 39 0;
+#X connect 24 0 57 0;
 #X connect 24 1 27 0;
 #X connect 25 0 12 0;
 #X connect 28 0 3 0;
-#X connect 29 0 31 0;
 #X connect 30 0 29 0;
-#X connect 32 0 33 0;
-#X connect 33 0 31 0;
-#X connect 35 0 9 0;
-#X connect 37 0 36 0;
+#X connect 31 0 30 0;
+#X connect 33 0 34 0;
+#X connect 34 0 32 0;
+#X connect 36 0 9 0;
 #X connect 38 0 37 0;
-#X connect 38 0 39 0;
-#X connect 38 1 45 0;
-#X connect 39 1 1 0;
-#X connect 39 1 7 0;
-#X connect 39 2 2 0;
-#X connect 39 3 40 0;
-#X connect 40 0 8 0;
-#X connect 41 0 3 0;
-#X connect 42 0 3 1;
+#X connect 39 0 38 0;
+#X connect 39 0 49 0;
+#X connect 39 1 20 0;
+#X connect 40 0 28 0;
+#X connect 40 0 48 0;
+#X connect 40 1 1 0;
+#X connect 40 1 7 0;
+#X connect 40 1 47 0;
+#X connect 40 1 46 0;
+#X connect 40 2 2 0;
+#X connect 40 2 45 0;
+#X connect 40 3 41 0;
+#X connect 41 0 8 0;
+#X connect 42 0 3 0;
+#X connect 42 0 44 0;
+#X connect 43 0 3 1;
 #X connect 43 0 44 0;
-#X connect 44 0 31 0;
-#X connect 45 0 20 0;
-#X restore 43 616 pd communication;
+#X connect 44 0 53 0;
+#X connect 45 0 44 0;
+#X connect 46 0 44 0;
+#X connect 47 0 44 0;
+#X connect 48 0 44 0;
+#X connect 49 0 40 0;
+#X connect 50 0 51 0;
+#X connect 51 0 49 0;
+#X connect 55 0 56 0;
+#X connect 56 0 54 0;
+#X connect 57 0 58 0;
+#X connect 58 0 52 0;
+#X connect 59 0 58 1;
+#X connect 60 0 59 0;
+#X restore 43 635 pd communication;
 #X obj 17 334 s \$0-OSC-SEND;
 #X obj 60 87 r \$0-READY;
 #X obj 221 620 dac~;
@@ -271,11 +307,21 @@
 #X obj 293 190 + 1;
 #X msg 154 274 send /gimme_loop \$1 0;
 #X obj 319 107 * 1000;
-#X obj 543 130 loop;
-#X obj 673 129 loop;
+#X obj 613 130 loop;
+#X obj 828 129 loop;
 #X obj 566 20 pack s f;
 #X msg 147 37 stop;
 #X obj 155 134 metro 40000;
+#X obj 820 175 automixer~;
+#X obj 401 177 automixer~;
+#X obj 465 177 automixer~;
+#X obj 606 176 automixer~;
+#X obj 670 176 automixer~;
+#X obj 884 175 automixer~;
+#X obj 552 544 automixer~;
+#X obj 623 544 automixer~;
+#X obj 488 544 automixer~;
+#X obj 687 544 automixer~;
 #X connect 0 0 61 0;
 #X connect 1 0 8 0;
 #X connect 1 0 9 0;
@@ -298,15 +344,15 @@
 #X connect 8 0 11 0;
 #X connect 9 0 10 0;
 #X connect 10 0 8 0;
-#X connect 11 0 50 0;
 #X connect 11 0 53 0;
+#X connect 11 0 50 0;
 #X connect 12 0 16 0;
 #X connect 13 0 14 0;
 #X connect 14 0 12 0;
 #X connect 15 0 14 1;
 #X connect 15 0 10 1;
-#X connect 16 0 50 1;
 #X connect 16 0 53 1;
+#X connect 16 0 50 1;
 #X connect 17 0 16 1;
 #X connect 17 0 11 1;
 #X connect 18 0 6 0;
@@ -317,16 +363,16 @@
 #X connect 25 0 31 0;
 #X connect 26 0 24 2;
 #X connect 26 0 25 2;
-#X connect 27 0 34 0;
-#X connect 27 1 36 0;
-#X connect 28 0 34 0;
-#X connect 28 1 36 0;
-#X connect 29 0 34 0;
-#X connect 29 1 36 0;
-#X connect 30 0 39 0;
-#X connect 30 1 41 0;
-#X connect 31 0 39 0;
-#X connect 31 1 41 0;
+#X connect 27 0 65 0;
+#X connect 27 1 66 0;
+#X connect 28 0 67 0;
+#X connect 28 1 68 0;
+#X connect 29 0 64 0;
+#X connect 29 1 69 0;
+#X connect 30 0 72 0;
+#X connect 30 1 70 0;
+#X connect 31 0 71 0;
+#X connect 31 1 73 0;
 #X connect 32 0 24 0;
 #X connect 33 0 25 0;
 #X connect 34 0 20 0;
@@ -367,3 +413,13 @@
 #X connect 62 0 47 0;
 #X connect 62 0 63 0;
 #X connect 63 0 18 0;
+#X connect 64 0 34 0;
+#X connect 65 0 34 0;
+#X connect 66 0 36 0;
+#X connect 67 0 34 0;
+#X connect 68 0 36 0;
+#X connect 69 0 36 0;
+#X connect 70 0 41 0;
+#X connect 71 0 39 0;
+#X connect 72 0 39 0;
+#X connect 73 0 41 0;
diff --git a/run.py b/run.py
@@ -146,7 +146,6 @@ def gimme_loop_handler(cls, addr, tags, data, source):
 
         loop = Sound.from_file(loop_infos['path'])
         loop.time_stretch(required_length).fade(in_dur=0.003, out_dur=0.003).to_file(loop_infos['path'])
-        loop.fade(in_dur=0.003, out_dur=0.003).to_file(loop_infos['path'])
 
         # Sending loop, and fill-up the pool if necessary.
         send_msg('/new_loop', loop_infos['path'])
@@ -229,9 +228,9 @@ def init_server():
     send_msg('/init/ready')
     logger.info('*INIT* telling the patch things are ready')
 
-    from guppy import hpy; hp=hpy()
+    #from guppy import hpy; hp=hpy()
     while(True):
         q = Queue()
         try: q.get(True, 30)
         except Empty: pass
-        print hp.heap()
+        #print hp.heap()