Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/tgc3

master
Michael Murtaugh 8 years ago
commit 489a165541

@ -1,10 +1,9 @@
#N canvas 553 37 553 723 10; #N canvas 553 37 553 723 10;
#X declare -lib unpackOSC; #X declare -lib unpackOSC;
#X obj 34 92 unpackOSC;
#X text 360 432 attack; #X text 360 432 attack;
#X text 431 433 release; #X text 431 433 release;
#X obj 362 569 line~; #X obj 362 569 line~;
#X obj 179 589 *~; #X obj 176 638 *~;
#X obj 361 452 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 #X obj 361 452 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
-1; -1;
#X obj 435 455 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 #X obj 435 455 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
@ -12,7 +11,7 @@
#X msg 371 480 stop; #X msg 371 480 stop;
#X text 70 455 #ikstem; #X text 70 455 #ikstem;
#X text 188 454 #gestemd; #X text 188 454 #gestemd;
#X obj 179 685 dac~; #X obj 176 693 dac~;
#X obj 34 142 unpack s s s; #X obj 34 142 unpack s s s;
#X obj 19 243 print; #X obj 19 243 print;
#X obj 133 345 select #ikstem both; #X obj 133 345 select #ikstem both;
@ -30,29 +29,32 @@
#X msg 211 244 \; pd dsp 1; #X msg 211 244 \; pd dsp 1;
#X text 16 34 comment; #X text 16 34 comment;
#X text 176 446 comment; #X text 176 446 comment;
#X obj 34 48 mrpeach/udpreceive 127.0.0.1 4000; #X obj 174 596 *~ 10;
#X connect 0 0 11 0; #X obj 34 92 unpackOSC;
#X connect 3 0 4 1; #X obj 34 48 udpreceive 127.0.0.1 4000;
#X connect 4 0 10 0; #X connect 2 0 3 0;
#X connect 5 0 18 0; #X connect 3 0 9 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 16 0;
#X connect 5 0 19 0; #X connect 5 0 6 0;
#X connect 6 0 17 0; #X connect 6 0 15 0;
#X connect 6 0 7 0; #X connect 10 1 11 0;
#X connect 7 0 16 0; #X connect 10 1 12 0;
#X connect 11 1 12 0; #X connect 10 2 11 0;
#X connect 11 1 13 0; #X connect 12 0 21 0;
#X connect 11 2 12 0; #X connect 12 0 4 0;
#X connect 13 0 22 0; #X connect 12 1 20 0;
#X connect 13 0 5 0; #X connect 12 1 4 0;
#X connect 13 1 21 0; #X connect 14 0 27 0;
#X connect 13 1 5 0; #X connect 15 0 19 0;
#X connect 15 0 4 0; #X connect 16 0 2 0;
#X connect 16 0 20 0; #X connect 17 0 2 0;
#X connect 17 0 3 0; #X connect 18 0 16 0;
#X connect 18 0 3 0; #X connect 19 0 2 0;
#X connect 19 0 17 0; #X connect 20 0 14 0;
#X connect 20 0 3 0; #X connect 21 0 14 0;
#X connect 21 0 15 0; #X connect 27 0 3 0;
#X connect 22 0 15 0; #X connect 28 0 10 0;
#X connect 28 0 0 0; #X connect 29 0 28 0;

@ -17,8 +17,8 @@ msg.setAddress("/twitter-ikstem")
#msg.append('hello from python') #msg.append('hello from python')
#client.send(msg) #client.send(msg)
#os.system('xzcat /media/floppy/twittersonification.csv.xz > /tmp/twittersonification.csv') #floppydisk os.system('xzcat /media/floppy/twittersonification.csv.xz > /tmp/twittersonification.csv') #floppydisk
os.system('xzcat twittersonification.csv.xz > /tmp/twittersonification.csv') #lokaal #os.system('xzcat twittersonification.csv.xz > /tmp/twittersonification.csv') #lokaal

@ -6,7 +6,7 @@ FLOPPY="/media/floppy"
MAINPY="${FLOPPY}/main.py" MAINPY="${FLOPPY}/main.py"
PYRUN="python ${MAINPY}" PYRUN="python ${MAINPY}"
MAINPD="${FLOPPY}/main.pd" MAINPD="${FLOPPY}/main.pd"
PDRUN="pd -lib import -path /usr/local/lib/pd-externals/net/ -path /usr/local/lib/pd-externals/osc/ -oss -r 48000 -rt -nogui ${MAINPD}" PDRUN="pd -lib import -path /usr/local/lib/pd-externals/net/ -path /usr/local/lib/pd-externals/osc/ -lib osc -lib udpreceive -oss -r 48000 -rt -nogui ${MAINPD}"
stdbuf -oL -- udevadm monitor --udev -p ${FD} | while read -r -- STATE _ _ _ _ stdbuf -oL -- udevadm monitor --udev -p ${FD} | while read -r -- STATE _ _ _ _
do do

Loading…
Cancel
Save