some new, some changed.

svn path=/trunk/abstractions/rradical/; revision=2088

3 files changed, 43 insertions, 43 deletions

diff --git a/instruments/analogue.pd b/instruments/analogue.pd
index 0a8ca00..42c6ada 100644
--- a/instruments/analogue.pd
+++ b/instruments/analogue.pd
@@ -12,8 +12,8 @@
 #X msg 572 170 control #4 \$1;
 #X obj 286 135 clip 0.0441 22005;
 #X obj 460 135 clip 0 1;
-#X obj 458 111 scale 0 127 0 1;
-#X obj 567 114 scale 0 127 0 1;
+#X obj 458 111 rrad.scale 0 127 0 1;
+#X obj 567 114 rrad.scale 0 127 0 1;
 #X obj 569 138 clip 0 1;
 #X obj 325 271 outlet~;
 #X obj 164 36 inlet waveform;
diff --git a/instruments/analosc.pd b/instruments/analosc.pd
index c8b7900..8a00023 100644
--- a/instruments/analosc.pd
+++ b/instruments/analosc.pd
@@ -2,12 +2,6 @@
 #X obj 2 14 cnv 15 382 130 empty empty empty 20 12 0 14 -195568 -66577
 0;
 #N canvas 37 548 782 304 interna 0;
-#X obj 55 37 r \$0-wave-out;
-#X obj 57 108 s \$0-wave-in;
-#X obj 172 42 r \$0-warm-out;
-#X obj 177 109 s \$0-warm-in;
-#X obj 310 61 r \$0-inst-out;
-#X obj 310 109 s \$0-inst-in;
 #X obj 528 241 originator \$1 \$0;
 #X obj 425 143 inlet;
 #X msg 487 189 substate \$1;
@@ -34,37 +28,43 @@
 #X obj 433 113 s \$0-lfo;
 #X msg 293 217 lfo \$1;
 #X obj 433 86 commun /lfo \$0;
-#X connect 0 0 11 0;
-#X connect 0 0 22 0;
-#X connect 2 0 21 0;
-#X connect 2 0 24 0;
-#X connect 4 0 13 0;
-#X connect 4 0 25 0;
-#X connect 7 0 9 0;
-#X connect 8 0 6 0;
-#X connect 8 0 12 0;
+#X obj 172 42 r \$0-warm;
+#X obj 55 35 r \$0-wave;
+#X obj 57 108 s \$0-wave;
+#X obj 177 109 s \$0-warm;
+#X obj 310 61 r \$0-inst;
+#X obj 310 109 s \$0-inst;
+#X connect 1 0 3 0;
+#X connect 2 0 0 0;
+#X connect 2 0 6 0;
+#X connect 3 0 4 0;
+#X connect 3 1 2 0;
+#X connect 4 0 0 0;
+#X connect 4 0 6 0;
+#X connect 5 0 17 0;
+#X connect 7 0 31 0;
 #X connect 9 0 10 0;
-#X connect 9 1 8 0;
-#X connect 10 0 6 0;
-#X connect 10 0 12 0;
-#X connect 11 0 23 0;
-#X connect 13 0 5 0;
-#X connect 15 0 16 0;
-#X connect 16 0 14 0;
-#X connect 17 0 19 0;
+#X connect 10 0 8 0;
+#X connect 11 0 13 0;
+#X connect 12 0 11 0;
+#X connect 15 0 29 0;
+#X connect 16 0 28 0;
+#X connect 17 0 20 0;
 #X connect 18 0 17 0;
-#X connect 21 0 3 0;
-#X connect 22 0 1 0;
-#X connect 23 0 26 0;
-#X connect 24 0 23 0;
-#X connect 24 1 23 1;
+#X connect 18 1 17 1;
+#X connect 19 0 17 0;
+#X connect 19 1 17 2;
+#X connect 20 0 21 0;
+#X connect 22 0 24 0;
+#X connect 22 0 25 0;
+#X connect 24 0 21 0;
 #X connect 25 0 23 0;
-#X connect 25 1 23 2;
-#X connect 26 0 27 0;
-#X connect 28 0 30 0;
-#X connect 28 0 31 0;
-#X connect 30 0 27 0;
-#X connect 31 0 29 0;
+#X connect 26 0 15 0;
+#X connect 26 0 18 0;
+#X connect 27 0 5 0;
+#X connect 27 0 16 0;
+#X connect 30 0 7 0;
+#X connect 30 0 19 0;
 #X restore 191 2 pd interna;
 #X obj 10 33 cnv 15 105 100 empty empty empty 20 12 0 14 -233017 -66577
 0;
@@ -85,12 +85,12 @@
 #X obj 222 40 mgadsr \$1-adsr;
 #X obj 307 2 inlet OSC;
 #X obj 329 127 outlet;
-#X obj 146 42 hsl 48 15 0 127 0 0 \$0-warm-in \$0-warm-out warm -2
--6 1 8 -261689 -258699 -1 800 1;
-#X obj 147 80 hsl 48 15 0 127 0 0 \$0-inst-in \$0-inst-out inst -2
--6 1 8 -261689 -62784 -1 700 1;
-#X obj 147 116 hsl 48 15 0 127 0 0 \$0-lfo-in \$0-lfo-out lfo -2 -6
-1 8 -261689 -35591 -1 800 1;
+#X obj 146 42 hsl 48 15 0 127 0 0 \$0-warm \$0-warm warm -2 -6 1 8
+-261689 -258699 -1 0 1;
+#X obj 147 80 hsl 48 15 0 127 0 0 \$0-inst \$0-inst inst -2 -6 1 8
+-261689 -62784 -1 700 1;
+#X obj 147 116 hsl 48 15 0 127 0 0 \$0-lfo \$0-lfo lfo -2 -6 1 8 -261689
+-35591 -1 4600 1;
 #X connect 1 0 12 0;
 #X connect 1 1 10 0;
 #X connect 8 0 9 0;
diff --git a/instruments/user.pd b/instruments/user.pd
index 673ad9a..b93cd67 100644
--- a/instruments/user.pd
+++ b/instruments/user.pd
@@ -56,7 +56,7 @@
 #X floatatom 777 489 5 0 0 0 - - -;
 #X obj 808 460 ctlin;
 #X obj 641 442 ctlin;
-#X obj 639 466 scale 0 128 1 5;
+#X obj 639 466 rrad.scale 0 128 1 5;
 #X obj 851 534 route 15 14;
 #X obj 424 548 netcontrol /erster inst;
 #X obj 881 620 loadbang;