From 5a34213327f2a65db0dd859059a9a83a847b4f44 Mon Sep 17 00:00:00 2001
From: margreetriphagen <margreetriphagen@gmail.comm>
Date: Fri, 24 Mar 2017 13:26:30 +0100
Subject: [PATCH] files

---
 floppies/margreet/main.pd | 94 ++++++++++++++++++++++-----------------
 floppies/margreet/main.py |  2 +-
 2 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/floppies/margreet/main.pd b/floppies/margreet/main.pd
index 736b4f2..3e8a984 100644
--- a/floppies/margreet/main.pd
+++ b/floppies/margreet/main.pd
@@ -1,14 +1,15 @@
-#N canvas 553 37 553 723 10;
-#X declare -lib unpackOSC;
-#X text 360 432 attack;
-#X text 431 433 release;
-#X obj 362 569 line~;
+#N canvas 398 23 553 723 10;
+#X declare -lib OSC;
+#X declare -lib net;
+#X text 372 516 attack;
+#X text 443 517 release;
+#X obj 374 653 line~;
 #X obj 176 638 *~;
-#X obj 361 452 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+#X obj 373 536 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
-#X obj 435 455 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+#X obj 447 539 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
 -1;
-#X msg 371 480 stop;
+#X msg 383 564 stop;
 #X text 70 455 #ikstem;
 #X text 188 454 #gestemd;
 #X obj 176 693 dac~;
@@ -16,45 +17,58 @@
 #X obj 19 243 print;
 #X obj 133 345 select #ikstem both;
 #X text 264 345 #gestemd;
-#X obj 175 539 osc~ 450;
-#X obj 361 503 del 50;
-#X msg 432 526 0 250;
-#X msg 296 503 30 30;
-#X obj 476 483 del 50;
-#X msg 361 527 1 500;
-#X msg 195 477 400;
-#X msg 68 480 150;
+#X obj 373 587 del 50;
+#X msg 444 610 0 250;
+#X msg 308 587 30 30;
+#X obj 488 567 del 50;
+#X msg 373 611 1 500;
 #X obj 212 198 loadbang;
-#X obj 364 23 import unpackOSC;
 #X msg 211 244 \; pd dsp 1;
-#X text 16 34 comment;
 #X text 176 446 comment;
-#X obj 174 596 *~ 10;
-#X obj 34 92 unpackOSC;
+#X obj 118 585 *~ 10;
 #X obj 34 48 udpreceive 127.0.0.1 4000;
-#X connect 2 0 3 0;
+#X obj 34 92 unpackOSC;
+#X obj 364 23 import OSC;
+#X obj 365 55 import net;
+#X obj 149 148 print;
+#X obj 182 539 osc~ 880;
+#X msg 195 477 880;
+#X obj 271 500 line~;
+#X msg 266 434 1 10;
+#X msg 318 494 0 30;
+#X obj 318 451 b;
+#X obj 318 473 delay 10;
+#X msg 68 480 220;
+#X text 16 34;
 #X connect 3 0 9 0;
+#X connect 3 0 9 1;
+#X connect 4 0 16 0;
+#X connect 4 0 14 0;
 #X connect 4 0 17 0;
-#X connect 4 0 15 0;
-#X connect 4 0 18 0;
-#X connect 5 0 16 0;
+#X connect 5 0 15 0;
 #X connect 5 0 6 0;
-#X connect 6 0 15 0;
-#X connect 10 1 11 0;
+#X connect 6 0 14 0;
 #X connect 10 1 12 0;
-#X connect 10 2 11 0;
-#X connect 12 0 21 0;
-#X connect 12 0 4 0;
-#X connect 12 1 20 0;
-#X connect 12 1 4 0;
-#X connect 14 0 27 0;
-#X connect 15 0 19 0;
+#X connect 12 0 35 0;
+#X connect 12 0 31 0;
+#X connect 12 1 29 0;
+#X connect 12 1 31 0;
+#X connect 14 0 18 0;
+#X connect 15 0 2 0;
 #X connect 16 0 2 0;
-#X connect 17 0 2 0;
-#X connect 18 0 16 0;
-#X connect 19 0 2 0;
-#X connect 20 0 14 0;
-#X connect 21 0 14 0;
-#X connect 27 0 3 0;
-#X connect 28 0 10 0;
+#X connect 17 0 15 0;
+#X connect 18 0 2 0;
+#X connect 19 0 20 0;
+#X connect 23 0 24 0;
+#X connect 24 0 10 0;
+#X connect 24 0 27 0;
+#X connect 28 0 22 0;
+#X connect 28 0 3 0;
 #X connect 29 0 28 0;
+#X connect 30 0 3 1;
+#X connect 31 0 30 0;
+#X connect 31 0 33 0;
+#X connect 32 0 30 0;
+#X connect 33 0 34 0;
+#X connect 34 0 32 0;
+#X connect 35 0 28 0;
diff --git a/floppies/margreet/main.py b/floppies/margreet/main.py
index d08b171..92bad17 100644
--- a/floppies/margreet/main.py
+++ b/floppies/margreet/main.py
@@ -42,7 +42,7 @@ with open('/tmp/twittersonification.csv', 'rU') as csvfile:
 		if then:
 			ti = (now-then).total_seconds()
 			#print ti/100
-			sleep_time = ti/1000
+			sleep_time = ti/40
 			print ("5.msg stderr", file=sys.stderr)