Forráskód Böngészése

initial commit to dev

m---w 11 éve
szülő
commit
747564bcf2
29 módosított fájl, 3491 hozzáadás és 2608 törlés
  1. 16 1
      README.txt
  2. 300 50
      ds_gui.pd
  3. 1935 1545
      ds_logic.pd
  4. 651 503
      ds_reg.pd
  5. 75 13
      ds_reg_global.pd
  6. 48 46
      ds_reg_settings.pd
  7. 20 7
      ds_route.pd
  8. 20 20
      fadecurve-help.pd
  9. 193 189
      fadecurve.pd
  10. 3 3
      kdemux2.pd
  11. 14 14
      list_accumulate.pd
  12. 3 0
      list_read-help.pd
  13. 2 2
      midi_bi.pd
  14. 19 19
      midi_gen.pd
  15. 43 43
      midi_gen_gui.pd
  16. 39 39
      midi_in.pd
  17. 6 6
      midi_in_gui.pd
  18. 3 3
      midi_out.pd
  19. 3 3
      midi_out_gui.pd
  20. 1 1
      midi_r.pd
  21. 1 1
      midi_s.pd
  22. 1 0
      msg_monitor.pd
  23. 42 41
      osc-help.pd
  24. 9 9
      osc2send-help.pd
  25. 16 22
      osc2send.pd
  26. 10 10
      osc_bi.pd
  27. 4 4
      osc_r.pd
  28. 3 3
      osc_s.pd
  29. 11 11
      schange.pd

+ 16 - 1
README.txt

@@ -9,13 +9,28 @@ Description
 -----------
 
 KOLLABS is an abstraction library for Pure Data, that covers data management, OSC- and MIDI-communication and state saving.
-    
+
 This library is still work in progress.
     
 For questions or bug reports, contact me:
 mail@marianweger.com
 
 
+Getting started
+---------------
+
+open [ds-help] for state-saving.
+open [midi-help] for MIDI communication,
+open [osc-help] for OSC communication
+
+
+Requirements
+------------
+
+Kollabs is built completely in Pd-Vanilla and thereby does not require any external libraries (except mrpeach/iemnet for OSC communication).
+It works with any Pd version above 0.42, but >= 0.43 is highly recommended.
+
+
 Source
 ------
 

+ 300 - 50
ds_gui.pd

@@ -1,66 +1,316 @@
-#N canvas 569 22 561 523 10;
-#X obj 101 115 cnv 15 148 114 empty empty empty 20 12 0 14 -228856
+#N canvas 76 105 582 597 10;
+#X obj 101 115 cnv 15 148 106 empty empty empty 20 12 0 14 -228856
 -66577 0;
-#X obj 104 173 bng 15 250 50 0 /\$1/ds/save /\$1/ds/save save 17 7
+#X obj 104 163 bng 15 250 50 0 /ds/\$1/save /ds/\$1/save save 17 7
 0 10 -258113 -1 -1;
-#X obj 104 193 bng 15 250 50 0 /\$1/ds/load /\$1/ds/load load 17 7
+#X obj 104 183 bng 15 250 50 0 /ds/\$1/load /ds/\$1/load load 17 7
 0 10 -4034 -1 -1;
-#X obj 174 173 bng 15 250 50 0 /\$1/ds/resave /\$1/ds/resave resave
+#X obj 174 163 bng 15 250 50 0 /ds/\$1/resave /ds/\$1/resave resave
 17 7 0 10 -258113 -1 -1;
-#X obj 174 193 bng 15 250 50 0 /\$1/ds/reload /\$1/ds/reload reload
+#X obj 174 183 bng 15 250 50 0 /ds/\$1/reload /ds/\$1/reload reload
 17 7 0 10 -4034 -1 -1;
-#X obj 123 129 nbx 3 15 0 999 0 0 /\$1/ds/scene/current /\$1/ds/scene/current
-scene 0 -8 0 12 -204786 -1 -1 0 256;
-#X obj 104 129 bng 15 250 50 0 /\$1/ds/scene/current/prev /\$1/ds/scene/current/prev
+#X obj 123 119 nbx 3 15 0 1e+37 0 0 /ds/\$1/scene/current /ds/\$1/scene/current
+empty 0 -8 0 12 -204786 -1 -1 0 256;
+#X obj 104 119 bng 15 250 50 0 /ds/\$1/scene/current/prev /ds/\$1/scene/current/prev
 < 4 7 0 10 -204786 -1 -1;
-#X obj 174 129 bng 15 250 50 0 /\$1/ds/scene/current/next /\$1/ds/scene/current/next
+#X obj 174 119 bng 15 250 50 0 /ds/\$1/scene/current/next /ds/\$1/scene/current/next
 > 5 7 0 10 -204786 -1 -1;
 #X text 101 70 (gui for ds_logic);
 #X text 91 40 ds_gui <domain>;
-#X text 302 246 (c)2011-2012 Marian Weger;
-#X obj 104 212 bng 15 250 50 0 /\$1/ds/advanced/vis /\$1/ds/advanced/vis
+#X obj 174 203 bng 15 250 50 0 /ds/\$1/advanced/vis /ds/\$1/advanced/vis
 advanced 17 7 0 10 -262144 -1 -1;
-#X msg 327 326 vis 1;
-#X obj 327 348 s pd-\$0-advanced;
-#N canvas 398 52 189 189 \$0-advanced 0;
-#X obj 2 -119 cnv 15 180 180 empty empty empty 20 12 0 14 -228856 -66577
-0;
-#X obj 9 -89 tgl 15 1 /\$1/ds/settings/state /\$1/ds/settings/state
-recall_settings 17 7 0 10 -262144 -1 -1 1 1;
-#X obj 9 -69 tgl 15 1 /\$1/ds/data/state /\$1/ds/data/state recall_data
-17 7 0 10 -262144 -1 -1 1 1;
-#X obj 9 -39 bng 15 250 50 0 /\$1/ds/reg/dialog /\$1/ds/reg/dialog
-register_settings 17 7 0 10 -4032 -1 -1;
-#X obj 9 -109 tgl 15 1 /\$1/ds/global/state /\$1/ds/global/state recall_global
-17 7 0 10 -262144 -1 -1 0 1;
-#X obj 9 21 bng 15 250 50 0 /\$1/ds/edit/dialog /\$1/ds/edit/dialog
-edit 17 7 0 10 -258113 -1 -1;
-#X obj 9 -19 bng 15 250 50 0 /\$1/ds/reg/settings/buffer /\$1/ds/reg/settings/buffer
-register_settings_buffer 17 7 0 10 -257985 -1 -1;
-#X coords 0 189 1 188 85 60 0;
-#X restore 327 374 pd \$0-advanced;
-#X obj 196 151 bng 15 250 50 0 /\$1/ds/store /\$1/ds/store store 17
+#X obj 196 140 bng 15 250 50 0 /ds/\$1/store /ds/\$1/store store 17
 7 0 10 -258113 -1 -1;
-#X obj 327 304 r /\$1/ds/advanced/vis;
-#X obj 123 150 nbx 3 15 0 999 0 0 /\$1/ds/scene/selected /\$1/ds/scene/selected
-empty 0 -8 0 12 -261234 -1 -1 0 256;
-#X obj 104 150 bng 15 250 50 0 /\$1/ds/scene/selected/prev /\$1/ds/scene/selected/prev
+#X obj 123 140 nbx 3 15 0 1e+37 0 0 /ds/\$1/scene/selected /ds/\$1/scene/selected
+empty 0 -8 0 12 -261234 -1 -1 23 256;
+#X obj 104 140 bng 15 250 50 0 /ds/\$1/scene/selected/prev /ds/\$1/scene/selected/prev
 < 4 7 0 10 -261234 -1 -1;
-#X obj 174 150 bng 15 250 50 0 /\$1/ds/scene/selected/next /\$1/ds/scene/selected/next
+#X obj 174 140 bng 15 250 50 0 /ds/\$1/scene/selected/next /ds/\$1/scene/selected/next
 > 5 7 0 10 -261234 -1 -1;
-#X obj 196 129 bng 15 250 50 0 /\$1/ds/recall /\$1/ds/recall recall
+#X obj 196 119 bng 15 250 50 0 /ds/\$1/recall /ds/\$1/recall recall
 17 7 0 10 -4034 -1 -1;
-#X obj 174 212 bng 15 250 50 0 /\$1/ds/playlist/vis /\$1/ds/playlist/vis
-playlist 17 7 0 10 -262144 -1 -1;
-#X msg 85 332 vis 1;
-#X obj 85 354 s pd-\$0-playlist;
-#N canvas 604 68 333 238 \$0-playlist 0;
-#X obj 3 4 ds_pl_gui \$1;
-#X restore 84 381 pd \$0-playlist;
-#X obj 85 309 r /\$1/ds/playlist/vis;
+#X obj 104 203 bng 15 250 50 0 /ds/\$1/edit/vis /ds/\$1/edit/vis edit
+17 7 0 10 -262144 -1 -1;
 #X text 300 55 for help: see [ds-help];
-#X connect 12 0 13 0;
-#X connect 16 0 12 0;
+#X text 108 278 (c)2011 Marian Weger;
+#N canvas 0 22 450 300 ADVANCED 0;
+#X msg 82 112 vis 1;
+#X obj 82 134 s pd-\$0-advanced;
+#N canvas 702 22 232 481 \$0-advanced 0;
+#X obj 4 -118 cnv 15 200 105 empty empty Recall 5 10 0 14 -228856 -66577
+0;
+#X obj 28 -94 tgl 15 0 /ds/\$1/recall/data/state /ds/\$1/recall/data/state
+data 17 7 0 10 -262144 -1 -1 1 1;
+#X obj 4 60 cnv 15 200 250 empty empty Print 5 10 0 14 -228856 -66577
+0;
+#X obj 82 -94 tgl 15 0 /ds/\$1/change /ds/\$1/change changes_only 17
+7 0 10 -262144 -1 -1 0 1;
+#X obj 28 -74 tgl 15 0 /ds/\$1/recall/tables/state /ds/\$1/recall/tables/state
+tables 17 7 0 10 -262144 -1 -1 1 1;
+#X obj 4 -9 cnv 15 200 65 empty empty Store 5 10 0 14 -228856 -66577
+0;
+#X obj 28 15 tgl 15 0 /ds/\$1/store/data/state /ds/\$1/store/data/state
+data 17 7 0 10 -262144 -1 -1 1 1;
+#X obj 28 35 tgl 15 0 /ds/\$1/store/tables/state /ds/\$1/store/tables/state
+tables 17 7 0 10 -262144 -1 -1 1 1;
+#X obj 28 -54 bng 15 250 50 0 /ds/\$1/recall/global /ds/\$1/recall/global
+global 17 7 0 10 -262144 -1 -1;
+#X obj 4 314 cnv 15 200 30 empty empty System 5 10 0 14 -228856 -66577
+0;
+#X obj 87 321 tgl 15 0 /ds/\$1/dsp/mute /ds/\$1/dsp/mute dsp_muting
+17 7 0 10 -262144 -1 -1 0 1;
+#X obj 28 85 tgl 15 0 /ds/\$1/print/info/state /ds/\$1/print/info/state
+info 17 7 0 10 -262144 -1 -1 1 1;
+#X obj 28 106 tgl 15 0 /ds/\$1/print/errors/state /ds/\$1/print/errors/state
+errors 17 7 0 10 -262144 -1 -1 1 1;
+#X obj 28 147 tgl 15 0 /ds/\$1/print/datastream/state /ds/\$1/print/datastream/state
+datastream 17 7 0 10 -262144 -1 -1 0 1;
+#X obj 28 168 bng 15 250 50 0 /ds/\$1/print/buffer /ds/\$1/print/buffer
+clipboard 17 7 0 10 -262144 -1 -1;
+#X obj 28 189 bng 15 250 50 0 /ds/\$1/print/scenes /ds/\$1/print/scenes
+all_scenes 17 7 0 10 -262144 -1 -1;
+#X obj 28 209 bng 15 250 50 0 /ds/\$1/scene/selected/print /ds/\$1/scene/selected/print
+selected_scene 17 7 0 10 -262144 -1 -1;
+#X obj 28 229 bng 15 250 50 0 /ds/\$1/print/main /ds/\$1/print/main
+recently_loaded/saved 17 7 0 10 -262144 -1 -1;
+#X obj 28 249 bng 15 250 50 0 /ds/\$1/print/global /ds/\$1/print/global
+global_settings 17 7 0 10 -262144 -1 -1;
+#X obj 28 269 bng 15 250 50 0 /ds/\$1/reg/print/dialog /ds/\$1/reg/print/dialog
+register_list 17 7 0 10 -262144 -1 -1;
+#X obj 28 289 bng 15 250 50 0 /ds/\$1/reg/global/print/dialog /ds/\$1/reg/global/print/dialog
+global_register_list 17 7 0 10 -262144 -1 -1;
+#X obj 28 -34 tgl 15 0 /ds/\$1/dispatch /ds/\$1/dispatch dispatch 17
+7 0 10 -262144 -1 -1 1 1;
+#X obj 28 127 tgl 15 0 /ds/\$1/print/debug/state /ds/\$1/print/debug/state
+debug 17 7 0 10 -262144 -1 -1 1 1;
+#X coords 0 481 1 480 85 60 0;
+#X restore 82 160 pd \$0-advanced;
+#X obj 82 60 r /ds/\$1/advanced/vis;
+#X obj 82 85 anyonce /ds/\$1/advanced/vis;
+#N canvas 43 108 913 589 register-list-loader 0;
+#X obj 451 433 + 1;
+#X obj 389 467 * 20;
+#X msg 652 425 clear;
+#X obj 389 433 f 0;
+#X msg 451 400 0;
+#X obj 389 520 list append;
+#X obj 389 400 t b a;
+#X msg 44 346 vis 1;
+#X obj 389 542 list append \$1;
+#X obj 327 273 t b b b b b;
+#X obj 510 232 t b b b;
+#X obj 515 470 list append \$1;
+#X msg 515 494 obj 30 20 cnv 15 300 20 empty empty Register_list_for_"\$1"
+5 10 0 14 -1 -262144 0;
+#X obj 389 489 + 46;
+#X obj 44 323 del 0;
+#X obj 124 498 f \$0;
+#X msg 124 520 \$1-reg-names;
+#X obj 124 559 s;
+#X obj 213 498 list prepend \$1;
+#X msg 213 520 symbol /ds/\$1/name/route;
+#X obj 124 464 t b b;
+#X obj 389 366 r \$0-reg-names;
+#X obj 308 61 r /ds/\$1/reg/print/dialog;
+#X obj 308 93 anyonce /ds/\$1/reg/print/dialog;
+#X obj 44 368 s pd-\$0-register-list;
+#X msg 389 615 obj 30 \$1 bng 15 250 50 0 /ds/\$3\$2/print /ds/\$3\$2/print
+\$2 20 7 0 10 -262144 -1 -1;
+#X obj 652 675 s pd-\$0-register-list;
+#X obj 491 126 loadbang;
+#X obj 491 158 t b b b;
+#X obj 308 170 t b b b;
+#X msg 397 211 0;
+#X msg 348 211 1;
+#X obj 397 244 s /ds/\$1/dsp;
+#X connect 0 0 3 1;
+#X connect 1 0 13 0;
+#X connect 2 0 26 0;
+#X connect 3 0 0 0;
+#X connect 3 0 1 0;
+#X connect 4 0 3 1;
+#X connect 5 0 8 0;
+#X connect 6 0 3 0;
+#X connect 6 1 5 1;
+#X connect 7 0 24 0;
+#X connect 8 0 25 0;
+#X connect 9 0 14 0;
+#X connect 9 1 20 0;
+#X connect 9 2 4 0;
+#X connect 9 3 11 0;
+#X connect 9 4 2 0;
+#X connect 10 0 4 0;
+#X connect 10 1 11 0;
+#X connect 10 2 2 0;
+#X connect 11 0 12 0;
+#X connect 12 0 26 0;
+#X connect 13 0 5 0;
+#X connect 14 0 7 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 18 0 19 0;
+#X connect 19 0 17 1;
+#X connect 20 0 15 0;
+#X connect 20 1 18 0;
+#X connect 21 0 6 0;
 #X connect 22 0 23 0;
-#X connect 25 0 22 0;
-#X coords 0 -1 1 1 150 130 1 100 100;
+#X connect 23 0 29 0;
+#X connect 25 0 26 0;
+#X connect 27 0 28 0;
+#X connect 28 0 31 0;
+#X connect 28 1 10 0;
+#X connect 28 2 30 0;
+#X connect 29 0 31 0;
+#X connect 29 1 9 0;
+#X connect 29 2 30 0;
+#X connect 30 0 32 0;
+#X connect 31 0 32 0;
+#X restore 82 210 pd register-list-loader;
+#N canvas 726 25 402 401 \$0-register-list 0;
+#X obj 30 20 cnv 15 300 20 empty empty Register_list_for_"domain" 5
+10 0 14 -1 -262144 0;
+#X restore 82 230 pd \$0-register-list;
+#N canvas 249 96 913 589 global-list-loader 0;
+#X obj 451 433 + 1;
+#X obj 389 467 * 20;
+#X msg 652 425 clear;
+#X obj 389 433 f 0;
+#X msg 451 400 0;
+#X obj 389 520 list append;
+#X obj 389 400 t b a;
+#X msg 44 346 vis 1;
+#X obj 389 542 list append \$1;
+#X obj 327 273 t b b b b b;
+#X obj 613 232 t b b b;
+#X obj 515 470 list append \$1;
+#X obj 389 489 + 46;
+#X obj 44 323 del 0;
+#X obj 64 498 f \$0;
+#X obj 64 559 s;
+#X obj 173 498 list prepend \$1;
+#X obj 64 464 t b b;
+#X msg 389 615 obj 30 \$1 bng 15 250 50 0 /ds/\$3\$2/print /ds/\$3\$2/print
+\$2 20 7 0 10 -262144 -1 -1;
+#X msg 515 494 obj 30 20 cnv 15 300 20 empty empty Global_registers_for_"\$1"
+5 10 0 14 -1 -262144 0;
+#X obj 308 91 r /ds/\$1/reg/global/print/dialog;
+#X obj 308 123 anyonce /ds/\$1/reg/global/print/dialog;
+#X obj 44 368 s pd-\$0-global-list;
+#X obj 389 366 r \$0-global-names;
+#X msg 64 520 \$1-global-names;
+#X obj 652 675 s pd-\$0-global-list;
+#X msg 173 520 symbol /ds/\$1/global/name/route;
+#X obj 594 126 loadbang;
+#X obj 594 158 t b b b;
+#X obj 308 170 t b b b;
+#X msg 467 211 0;
+#X msg 418 211 1;
+#X obj 467 244 s /ds/\$1/dsp;
+#X connect 0 0 3 1;
+#X connect 1 0 12 0;
+#X connect 2 0 25 0;
+#X connect 3 0 0 0;
+#X connect 3 0 1 0;
+#X connect 4 0 3 1;
+#X connect 5 0 8 0;
+#X connect 6 0 3 0;
+#X connect 6 1 5 1;
+#X connect 7 0 22 0;
+#X connect 8 0 18 0;
+#X connect 9 0 13 0;
+#X connect 9 1 17 0;
+#X connect 9 2 4 0;
+#X connect 9 3 11 0;
+#X connect 9 4 2 0;
+#X connect 10 0 4 0;
+#X connect 10 1 11 0;
+#X connect 10 2 2 0;
+#X connect 11 0 19 0;
+#X connect 12 0 5 0;
+#X connect 13 0 7 0;
+#X connect 14 0 24 0;
+#X connect 16 0 26 0;
+#X connect 17 0 14 0;
+#X connect 17 1 16 0;
+#X connect 18 0 25 0;
+#X connect 19 0 25 0;
+#X connect 20 0 21 0;
+#X connect 21 0 29 0;
+#X connect 23 0 6 0;
+#X connect 24 0 15 0;
+#X connect 26 0 15 1;
+#X connect 27 0 28 0;
+#X connect 28 0 31 0;
+#X connect 28 1 10 0;
+#X connect 28 2 30 0;
+#X connect 29 0 31 0;
+#X connect 29 1 9 0;
+#X connect 29 2 30 0;
+#X connect 30 0 32 0;
+#X connect 31 0 32 0;
+#X restore 257 210 pd global-list-loader;
+#N canvas 726 25 383 661 \$0-global-list 0;
+#X obj 30 20 cnv 15 300 20 empty empty Global_registers_for_"domain"
+5 10 0 14 -1 -262144 0;
+#X restore 257 230 pd \$0-global-list;
+#X connect 0 0 1 0;
+#X connect 3 0 4 0;
+#X connect 4 0 0 0;
+#X restore 283 149 pd ADVANCED;
+#N canvas 0 22 450 300 EDIT 0;
+#X msg 136 183 vis 1;
+#X obj 136 101 r /ds/\$1/edit/vis;
+#X obj 136 126 anyonce /ds/\$1/edit/vis;
+#X obj 136 205 s pd-\$0-edit;
+#N canvas 97 54 219 276 \$0-edit 1;
+#X obj 4 -275 cnv 15 98 50 empty empty all 5 10 0 14 -233017 -66577
+0;
+#X obj 4 -221 cnv 15 200 30 empty empty selected 5 10 0 14 -233017
+-66577 0;
+#X obj 140 -211 nbx 5 14 -1e+37 1e+37 0 0 /ds/\$1/scene/selected /ds/\$1/scene/selected
+empty 0 -8 0 10 -261234 -1 -1 23 256;
+#X obj 14 -250 bng 15 250 50 0 /ds/\$1/edit/clear /ds/\$1/edit/clear
+delete 17 7 0 10 -258113 -1 -1;
+#X obj 106 -275 cnv 15 98 50 empty empty lock 5 10 0 14 -1 -262144
+0;
+#X obj 167 -262 tgl 25 0 /ds/\$1/edit/lock /ds/\$1/edit/lock empty
+22 12 0 10 -262144 -1 -262144 1 1;
+#X obj 4 -189 cnv 15 79 180 empty empty empty 5 10 0 14 -228856 -66577
+0;
+#X obj 85 -189 cnv 15 119 180 empty empty empty 5 10 0 14 -228856 -66577
+0;
+#X obj 14 -140 bng 15 250 50 0 /ds/\$1/edit/scene/cut /ds/\$1/edit/scene/cut
+cut 17 7 0 10 -260097 -1 -1;
+#X obj 14 -120 bng 15 250 50 0 /ds/\$1/edit/scene/delete /ds/\$1/edit/scene/delete
+delete 17 7 0 10 -258113 -1 -1;
+#X obj 94 -160 bng 15 250 50 0 /ds/\$1/edit/scene/paste-override /ds/\$1/edit/scene/paste-override
+paste_overwrite 17 7 0 10 -4160 -1 -1;
+#X obj 14 -160 bng 15 250 50 0 /ds/\$1/edit/scene/copy /ds/\$1/edit/scene/copy
+copy 17 7 0 10 -257985 -1 -1;
+#X obj 94 -120 bng 15 250 50 0 /ds/\$1/edit/scene/insert /ds/\$1/edit/scene/insert
+insert_blank 17 7 0 10 -4034 -1 -1;
+#X obj 94 -140 bng 15 250 50 0 /ds/\$1/edit/scene/paste-insert /ds/\$1/edit/scene/paste-insert
+paste_insert 17 7 0 10 -4032 -1 -1;
+#X obj 14 -180 bng 15 250 50 0 /ds/\$1/edit/scene/clear /ds/\$1/edit/scene/clear
+clear 17 7 0 10 -159808 -1 -1;
+#X obj 94 -50 tgl 15 0 /ds/\$1/edit/scene/paste/data /ds/\$1/edit/scene/paste/data
+data 17 7 0 10 -262144 -1 -1 0 1;
+#X obj 94 -90 tgl 15 0 /ds/\$1/edit/scene/paste/settings /ds/\$1/edit/scene/paste/settings
+settings 17 7 0 10 -262144 -1 -1 0 1;
+#X obj 94 -70 tgl 15 0 /ds/\$1/edit/scene/paste/tables /ds/\$1/edit/scene/paste/tables
+tables 17 7 0 10 -262144 -1 -1 0 1;
+#X obj 94 -30 tgl 15 0 /ds/\$1/edit/scene/paste/properties /ds/\$1/edit/scene/paste/properties
+properties 17 7 0 10 -262144 -1 -1 0 1;
+#X coords 0 276 1 275 85 60 0;
+#X restore 136 231 pd \$0-edit;
+#X obj 221 205 s /ds/\$1/edit/lock;
+#X msg 221 183 1;
+#X obj 136 148 t b b;
+#X connect 0 0 3 0;
+#X connect 1 0 2 0;
+#X connect 2 0 7 0;
+#X connect 6 0 5 0;
+#X connect 7 0 0 0;
+#X connect 7 1 6 0;
+#X restore 283 169 pd EDIT;
+#X coords 0 -1 1 1 150 122 1 100 100;

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1935 - 1545
ds_logic.pd


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 651 - 503
ds_reg.pd


+ 75 - 13
ds_reg_global.pd

@@ -1,14 +1,76 @@
-#N canvas 632 315 362 304 10;
-#X obj 78 211 s \$1/ds/fetched;
-#X obj 78 115 t b;
-#X obj 93 139 r \$1\$2;
-#X obj 78 185 list prepend \$1\$2;
-#X obj 78 163 f 0;
-#X text 191 262 (c)2012 Marian Weger;
-#X obj 78 93 r \$1/ds/fetch/global/data;
+#N canvas 280 110 875 507 10;
+#X text 358 307 (c)2012 Marian Weger;
 #X text 27 22 ds_reg_global <domain> <subname>;
-#X connect 1 0 4 0;
-#X connect 2 0 4 1;
-#X connect 3 0 0 0;
-#X connect 4 0 3 0;
-#X connect 6 0 1 0;
+#X obj 348 224 r /ds/\$1\$2/dispatch;
+#X obj 348 254 s /ds/\$1\$2;
+#X obj 78 147 t b b;
+#X msg 174 181 0;
+#X obj 78 267 kdemux2;
+#X obj 221 313 s;
+#X msg 242 185 1;
+#X obj 223 159 t b b a;
+#X text 232 120 route value;
+#X obj 236 274 symbol;
+#X obj 223 137 r /ds/\$1\$2/route;
+#X obj 78 327 list prepend \$2;
+#X obj 93 181 r /ds/\$1\$2;
+#X obj 78 353 s /ds/\$1/fetched/global;
+#X obj 78 93 r /ds/\$1/fetch/global;
+#X obj 435 145 list trim;
+#X obj 435 100 b;
+#X obj 435 123 list prepend /ds/\$1\$2;
+#X obj 435 167 s /ds/\$1\$2/route;
+#X obj 659 86 loadbang;
+#X obj 659 133 s /ds/\$1\$2/name \$2;
+#X obj 659 108 list prepend \$2;
+#X obj 659 169 ds_route /ds/\$1\$2/name;
+#X obj 659 211 r /ds/\$1\$2/print;
+#X obj 659 342 r \$0-print;
+#X obj 659 283 list prepend \$0-print;
+#X obj 659 305 s /ds/\$1\$2/route;
+#X obj 661 452 s /ds/\$1\$2/name/route;
+#X obj 661 430 r /ds/\$1/global/name/route;
+#X obj 669 231 r /ds/\$1/print/global;
+#X obj 659 258 b;
+#X obj 435 78 r /ds/\$1/recall/global;
+#X obj 387 367 r /ds/\$1\$2/resend;
+#X obj 387 389 b;
+#X obj 387 411 list prepend /ds/\$1\$2;
+#X obj 387 433 list trim;
+#X obj 387 455 s /ds/\$1\$2/route;
+#X obj 659 364 list prepend \$2:;
+#X obj 659 385 s /ds/\$1/print;
+#X obj 78 225 value /ds/\$1\$2/v;
+#X connect 2 0 3 0;
+#X connect 4 0 41 0;
+#X connect 4 1 5 0;
+#X connect 5 0 6 1;
+#X connect 6 0 13 0;
+#X connect 6 1 7 0;
+#X connect 8 0 6 1;
+#X connect 9 0 41 0;
+#X connect 9 1 8 0;
+#X connect 9 2 11 0;
+#X connect 11 0 7 1;
+#X connect 12 0 9 0;
+#X connect 13 0 15 0;
+#X connect 14 0 41 0;
+#X connect 16 0 4 0;
+#X connect 17 0 20 0;
+#X connect 18 0 19 0;
+#X connect 19 0 17 0;
+#X connect 21 0 23 0;
+#X connect 23 0 22 0;
+#X connect 25 0 32 0;
+#X connect 26 0 39 0;
+#X connect 27 0 28 0;
+#X connect 30 0 29 0;
+#X connect 31 0 32 0;
+#X connect 32 0 27 0;
+#X connect 33 0 18 0;
+#X connect 34 0 35 0;
+#X connect 35 0 36 0;
+#X connect 36 0 37 0;
+#X connect 37 0 38 0;
+#X connect 39 0 40 0;
+#X connect 41 0 6 0;

+ 48 - 46
ds_reg_settings.pd

@@ -1,50 +1,52 @@
-#N canvas 519 22 524 394 10;
+#N canvas 38 106 797 450 10;
 #X text 27 22 ds_reg_settings <domain> <subname>;
 #X text 27 52 used by [ds_reg] for registering its settings;
-#X obj 78 253 f 0;
-#X text 327 323 (c)2012 Marian Weger;
-#X obj 93 229 r \$2;
-#X obj 78 335 list prepend \$2;
-#X obj 78 93 r /\$1/ds/fetch/settings;
-#X obj 78 361 s /\$1/ds/fetched;
-#X obj 339 93 r \$2/dispatch;
-#X obj 339 275 s \$2;
-#X obj 339 245 change;
-#X obj 442 163 r \$2;
-#X msg 442 185 set \$1;
+#X text 357 323 (c)2012 Marian Weger;
 #X obj 78 169 spigot 1;
-#X obj 339 155 spigot 1;
+#X obj 369 155 spigot 1;
 #X obj 78 195 t b b;
-#X msg 134 229 0;
-#X obj 78 275 kdemux2;
-#X obj 221 341 s;
-#X msg 242 233 1;
-#X obj 223 185 r \$2/route;
-#X obj 223 207 t b b a;
-#X text 232 168 route value;
-#X obj 236 302 symbol;
-#X obj 123 133 r \$2/save/state;
-#X obj 384 130 r \$2/dispatch/state;
-#X connect 2 0 17 0;
-#X connect 4 0 2 1;
-#X connect 5 0 7 0;
-#X connect 6 0 13 0;
-#X connect 8 0 14 0;
-#X connect 10 0 9 0;
-#X connect 11 0 12 0;
-#X connect 12 0 10 0;
-#X connect 13 0 15 0;
-#X connect 14 0 10 0;
-#X connect 15 0 2 0;
-#X connect 15 1 16 0;
-#X connect 16 0 17 1;
-#X connect 17 0 5 0;
-#X connect 17 1 18 0;
-#X connect 19 0 17 1;
-#X connect 20 0 21 0;
-#X connect 21 0 2 0;
-#X connect 21 1 19 0;
-#X connect 21 2 23 0;
-#X connect 23 0 18 1;
-#X connect 24 0 13 1;
-#X connect 25 0 14 1;
+#X msg 174 229 0;
+#X obj 78 325 kdemux2;
+#X obj 251 371 s;
+#X msg 272 233 1;
+#X obj 253 207 t b b a;
+#X text 262 168 route value;
+#X obj 266 332 symbol;
+#X obj 253 185 r /ds/\$1\$2/route;
+#X obj 369 93 r /ds/\$1\$2/dispatch;
+#X obj 369 275 s /ds/\$1\$2;
+#X obj 78 365 list prepend \$2;
+#X obj 93 229 r /ds/\$1\$2;
+#X obj 78 93 r /ds/\$1/fetch/settings;
+#X obj 78 391 s /ds/\$1/fetched;
+#X obj 213 116 r /ds/\$1\$2/reg/state;
+#X obj 588 101 r /ds/\$1\$2/resend;
+#X obj 588 123 b;
+#X obj 588 145 list append /ds/\$1\$2;
+#X obj 588 167 list trim;
+#X obj 588 189 s /ds/\$1\$2/route;
+#X obj 78 270 v /ds/\$1\$2/v;
+#X connect 3 0 5 0;
+#X connect 4 0 15 0;
+#X connect 5 0 26 0;
+#X connect 5 1 6 0;
+#X connect 6 0 7 1;
+#X connect 7 0 16 0;
+#X connect 7 1 8 0;
+#X connect 9 0 7 1;
+#X connect 10 0 26 0;
+#X connect 10 1 9 0;
+#X connect 10 2 12 0;
+#X connect 12 0 8 1;
+#X connect 13 0 10 0;
+#X connect 14 0 4 0;
+#X connect 16 0 19 0;
+#X connect 17 0 26 0;
+#X connect 18 0 3 0;
+#X connect 20 0 3 1;
+#X connect 20 0 4 1;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 23 0 24 0;
+#X connect 24 0 25 0;
+#X connect 26 0 7 0;

+ 20 - 7
ds_route.pd

@@ -1,20 +1,33 @@
-#N canvas 534 144 241 341 10;
+#N canvas 534 144 439 383 10;
 #X text 20 21 ds_route <name>;
-#X obj 95 245 s;
+#X obj 95 285 s;
 #X text 92 78 route value;
-#X obj 110 216 symbol;
+#X obj 110 256 symbol;
 #X obj 83 117 t b a;
-#X obj 38 170 list;
-#X obj 38 216 route bang;
-#X text 62 290 (c)2012 Marian Weger;
+#X obj 38 210 list;
+#X obj 38 256 route bang;
+#X text 62 330 (c)2012 Marian Weger;
 #X obj 38 95 r \$1;
 #X obj 83 95 r \$1/route;
-#X obj 38 192 list trim;
+#X obj 38 232 list trim;
+#X obj 323 141 r \$1/resend;
+#X obj 323 163 b;
+#X obj 323 185 list prepend \$1;
+#X obj 323 207 list trim;
+#X obj 323 229 s \$1/route;
+#X obj 169 216 route float;
+#X obj 169 238 v \$1/v;
 #X connect 3 0 1 1;
 #X connect 4 0 5 0;
 #X connect 4 1 3 0;
 #X connect 5 0 10 0;
 #X connect 6 1 1 0;
 #X connect 8 0 5 1;
+#X connect 8 0 16 0;
 #X connect 9 0 4 0;
 #X connect 10 0 6 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 16 0 17 0;

+ 20 - 20
fadecurve-help.pd

@@ -1,8 +1,8 @@
-#N canvas 562 22 978 656 10;
+#N canvas 320 22 929 656 10;
 #X obj 269 84 vsl 15 128 -3 3 0 0 empty empty empty 0 -9 0 10 -262130
--1 -1 3200 1;
+-1 -1 0 1;
 #X obj 381 84 vsl 15 128 0 1 0 0 empty empty empty 0 -9 0 10 -262130
--1 -1 12700 1;
+-1 -1 0 1;
 #X msg 269 242 shape \$1;
 #X msg 381 242 weight \$1;
 #X floatatom 381 291 7 0 0 1 10...10000 - -;
@@ -35,16 +35,12 @@
 #X text 571 357 0 < abs(shape) < 1 && 1 <abs(shape) < 2;
 #X text 571 370 --> linear interpolation;
 #X text 571 188 MATHEMATICAL EXPLANATION:;
-#X text 641 94 2: linear interpolation;
-#X text 641 108 3: tabread4 4-point polynomianl interpolation;
-#X text 641 80 1: no interpolation;
 #X text 570 448 -1.67 --> mix between "cosine" and "1-(1-x)^2";
-#X obj 164 220 hradio 15 1 0 4 empty empty 0..1..2..3 0 -8 0 10 -262144
+#X obj 164 220 hradio 15 1 0 4 empty empty 0..1..2 0 -8 0 10 -262144
 -1 -1 0;
 #X obj 164 364 t b a;
 #X text 45 516 (size=N+3 \, N=resolution);
 #X text 449 47 2nd (optional): init resolution N (default=100);
-#X text 641 66 0: bypass --> output=input (default);
 #X text 571 208 abs(shape) = 0: f(x) = sin^2(x*pi/2);
 #X text 392 539 alternatively set parameters via send/receive:;
 #X text 571 328 input: 0 <= x <= 1;
@@ -66,26 +62,30 @@
 #X obj 534 581 s \$0-curve/resolution;
 #X obj 414 601 s \$0-curve/vis;
 #X obj 534 601 s \$0-curve/loadbang;
+#X text 631 67 0: no interpolation;
+#X text 631 81 1: linear interpolation;
+#X text 631 95 2: tabread4 4-point polynomianl interpolation;
+#X text 448 137 If weight=0 \, the abstraction is bypassed.;
 #X connect 0 0 8 0;
 #X connect 1 0 9 0;
-#X connect 2 0 38 0;
-#X connect 3 0 38 0;
+#X connect 2 0 35 0;
+#X connect 3 0 35 0;
 #X connect 4 0 5 0;
-#X connect 5 0 38 0;
+#X connect 5 0 35 0;
 #X connect 8 0 2 0;
 #X connect 9 0 3 0;
 #X connect 14 0 24 0;
 #X connect 16 0 15 0;
-#X connect 18 0 38 0;
+#X connect 18 0 35 0;
 #X connect 19 0 25 0;
 #X connect 21 0 20 0;
 #X connect 24 0 16 0;
 #X connect 25 0 21 0;
-#X connect 37 0 18 0;
-#X connect 38 0 49 0;
-#X connect 38 1 50 1;
-#X connect 48 0 49 0;
-#X connect 49 0 50 0;
-#X connect 50 0 47 0;
-#X connect 51 0 53 0;
-#X connect 53 0 38 0;
+#X connect 34 0 18 0;
+#X connect 35 0 45 0;
+#X connect 35 1 46 1;
+#X connect 44 0 45 0;
+#X connect 45 0 46 0;
+#X connect 46 0 43 0;
+#X connect 47 0 49 0;
+#X connect 49 0 35 0;

+ 193 - 189
fadecurve.pd

@@ -1,12 +1,11 @@
-#N canvas 87 101 860 610 10;
-#X text 492 542 (c)2012 Marian Weger;
+#N canvas 233 95 860 610 10;
+#X text 492 562 (c)2012 Marian Weger;
 #X obj 16 396 tabread4 \$1;
 #X obj 94 541 outlet;
 #N canvas 774 81 317 328 init 0;
 #X obj 54 -61 loadbang;
 #X obj 157 51 float \$2;
 #X obj 157 73 sel 0;
-#X msg 157 95 100;
 #X obj 54 51 list prepend \$1;
 #X obj 54 103 list append;
 #X obj 54 -9 t b b;
@@ -14,27 +13,28 @@
 #X msg 54 168 \; \$1 bounds 1 1 \$2 0 \; \$1/resolution \$2 \; \$1/quality
 \$3 \;;
 #X obj 119 -61 r \$1/loadbang;
-#X connect 0 0 6 0;
+#X msg 157 95 128;
+#X connect 0 0 5 0;
 #X connect 1 0 2 0;
-#X connect 2 0 3 0;
-#X connect 2 1 5 1;
-#X connect 3 0 5 1;
-#X connect 4 0 5 0;
-#X connect 5 0 7 0;
-#X connect 6 0 4 0;
-#X connect 6 1 1 0;
-#X connect 7 0 8 0;
-#X connect 9 0 6 0;
+#X connect 2 0 9 0;
+#X connect 2 1 4 1;
+#X connect 3 0 4 0;
+#X connect 4 0 6 0;
+#X connect 5 0 3 0;
+#X connect 5 1 1 0;
+#X connect 6 0 7 0;
+#X connect 8 0 5 0;
+#X connect 9 0 4 1;
 #X coords 0 328 1 327 85 60 0;
-#X restore 490 331 pd init;
-#X obj 382 241 s \$1/shape;
-#X obj 430 219 s \$1/weight;
-#X obj 479 197 s \$1/resolution;
+#X restore 490 351 pd init;
+#X obj 382 291 s \$1/shape;
+#X obj 430 269 s \$1/weight;
+#X obj 479 247 s \$1/resolution;
 #X obj 246 421 + 1;
 #X obj 152 443 tabread \$1;
 #X obj 246 443 tabread \$1;
 #X text 19 30 fadecurve <name> <resolution> <quality>;
-#X obj 527 177 s \$1/quality;
+#X obj 527 227 s \$1/quality;
 #X obj 139 175 r \$1/quality;
 #N canvas 466 47 586 541 demux 0;
 #X obj 64 99 inlet;
@@ -50,56 +50,56 @@
 #X obj 406 429 outlet;
 #X obj 406 227 spigot 0;
 #X obj 406 400 + 1;
-#X obj 307 325 - 1;
-#X obj 406 378 * 99;
+#X obj 303 325 - 1;
 #X obj 286 400 + 1;
-#X obj 286 378 * 99;
 #X obj 166 400 + 1;
-#X obj 166 378 * 99;
-#X obj 307 273 r \$1/resolution;
-#X obj 307 295 clip 10 10000;
+#X obj 303 273 r \$1/resolution;
+#X obj 303 295 clip 10 10000;
 #X obj 109 181 <= 0;
 #X obj 451 181 >= 3;
+#X obj 166 378 * 127;
+#X obj 286 378 * 127;
+#X obj 406 378 * 127;
 #X connect 0 0 2 0;
 #X connect 0 0 5 0;
 #X connect 0 0 9 0;
 #X connect 0 0 11 0;
 #X connect 1 0 6 0;
 #X connect 1 0 7 0;
-#X connect 1 0 21 0;
-#X connect 1 0 22 0;
+#X connect 1 0 18 0;
+#X connect 1 0 19 0;
 #X connect 2 0 4 0;
-#X connect 5 0 18 0;
+#X connect 5 0 20 0;
 #X connect 6 0 5 1;
 #X connect 7 0 9 1;
-#X connect 9 0 16 0;
-#X connect 11 0 14 0;
+#X connect 9 0 21 0;
+#X connect 11 0 22 0;
 #X connect 12 0 10 0;
-#X connect 13 0 14 1;
-#X connect 13 0 16 1;
-#X connect 13 0 18 1;
-#X connect 14 0 12 0;
-#X connect 15 0 8 0;
-#X connect 16 0 15 0;
-#X connect 17 0 3 0;
-#X connect 18 0 17 0;
-#X connect 19 0 20 0;
-#X connect 20 0 13 0;
-#X connect 21 0 2 1;
-#X connect 22 0 11 1;
+#X connect 13 0 20 1;
+#X connect 13 0 21 1;
+#X connect 13 0 22 1;
+#X connect 14 0 8 0;
+#X connect 15 0 3 0;
+#X connect 16 0 17 0;
+#X connect 17 0 13 0;
+#X connect 18 0 2 1;
+#X connect 19 0 11 1;
+#X connect 20 0 15 0;
+#X connect 21 0 14 0;
+#X connect 22 0 12 0;
 #X restore 94 297 pd demux;
 #X obj 109 396 tabread \$1;
 #X obj 109 344 + 0.5;
 #X obj 109 366 int;
 #X obj 341 443 wrap;
 #X obj 227 396 t f f f;
-#X obj 139 229 int;
+#X obj 139 199 int;
 #X obj 225 175 r \$1/weight;
 #X obj 225 207 > 0;
 #X obj 139 271 *;
 #X obj 225 229 t b f;
 #X obj 94 133 clip 0 1;
-#N canvas 221 88 964 756 curve-calculation 0;
+#N canvas 223 22 964 756 curve-calculation 0;
 #X obj 87 350 until;
 #X obj 87 379 f;
 #X obj 127 379 + 1;
@@ -108,15 +108,12 @@
 #X obj 328 104 t b f;
 #X obj 51 1233 tabwrite \$1;
 #X obj 237 466 - 1;
-#X obj 166 550 / 99;
 #X obj 87 152 f 0;
 #X obj 328 79 f 0;
-#X obj 166 466 moses 100;
 #X obj 87 401 t f f;
 #X msg 51 608 0;
 #X obj 127 446 moses 2;
 #X obj 114 229 + 3;
-#X obj 87 297 f 103;
 #X msg 81 608 1;
 #X obj 166 488 - 1;
 #X obj 193 784 s \$0-linear;
@@ -183,140 +180,143 @@
 #X obj 337 784 expr 1.0-pow(1.0-$f1 \, $f2);
 #X obj 337 874 expr 1.0-cos($f1*1.570796326794897);
 #X obj 337 844 expr pow(sin($f1*1.570796326794897) \, 2);
+#X obj 87 297 f 131;
+#X obj 166 550 / 127;
+#X obj 166 466 moses 128;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
-#X connect 1 0 12 0;
+#X connect 1 0 10 0;
 #X connect 2 0 1 1;
 #X connect 3 0 0 0;
 #X connect 3 1 4 0;
 #X connect 4 0 1 1;
-#X connect 5 0 9 0;
-#X connect 5 1 21 2;
-#X connect 7 0 8 1;
-#X connect 8 0 22 0;
-#X connect 9 0 24 0;
-#X connect 10 0 5 0;
-#X connect 11 0 18 0;
-#X connect 11 1 17 0;
-#X connect 12 0 14 0;
-#X connect 12 1 6 1;
-#X connect 13 0 6 0;
-#X connect 14 0 13 0;
-#X connect 14 1 11 0;
-#X connect 15 0 78 0;
-#X connect 16 0 3 0;
-#X connect 17 0 6 0;
-#X connect 18 0 8 0;
-#X connect 20 0 21 1;
-#X connect 21 0 6 0;
-#X connect 22 0 23 0;
-#X connect 22 1 19 0;
-#X connect 22 1 60 0;
-#X connect 22 1 59 0;
-#X connect 22 1 58 0;
-#X connect 22 1 57 0;
-#X connect 22 1 56 0;
-#X connect 23 0 26 0;
-#X connect 24 0 16 0;
-#X connect 24 1 54 0;
-#X connect 25 0 46 0;
-#X connect 26 0 25 0;
-#X connect 27 0 34 0;
-#X connect 28 0 30 0;
-#X connect 28 1 29 0;
-#X connect 29 0 34 3;
-#X connect 29 0 36 0;
-#X connect 29 0 40 0;
-#X connect 29 1 33 0;
-#X connect 29 1 39 0;
-#X connect 29 1 45 0;
-#X connect 29 1 53 0;
-#X connect 30 0 31 0;
-#X connect 30 0 38 0;
-#X connect 30 0 42 0;
-#X connect 30 1 41 0;
-#X connect 30 1 44 0;
-#X connect 30 1 32 0;
-#X connect 31 0 43 0;
-#X connect 31 0 53 0;
-#X connect 32 0 34 2;
-#X connect 33 0 64 0;
-#X connect 34 0 61 0;
-#X connect 35 0 65 0;
-#X connect 36 0 37 0;
-#X connect 37 0 34 2;
-#X connect 38 0 67 0;
-#X connect 39 0 34 2;
-#X connect 39 0 34 1;
-#X connect 39 0 27 1;
-#X connect 40 0 34 1;
-#X connect 40 0 27 1;
-#X connect 40 0 34 4;
-#X connect 41 0 34 3;
-#X connect 41 0 27 1;
-#X connect 41 0 34 4;
-#X connect 42 0 34 2;
-#X connect 42 0 34 3;
-#X connect 42 0 34 4;
-#X connect 43 0 66 0;
-#X connect 44 0 34 1;
-#X connect 45 0 35 0;
-#X connect 46 0 47 0;
-#X connect 46 1 48 0;
-#X connect 46 2 49 0;
-#X connect 46 3 50 0;
-#X connect 46 4 51 0;
-#X connect 46 5 47 1;
-#X connect 46 6 48 1;
-#X connect 46 7 49 1;
-#X connect 46 8 50 1;
-#X connect 46 9 51 1;
-#X connect 47 0 52 0;
-#X connect 48 0 52 1;
-#X connect 49 0 52 2;
-#X connect 50 0 52 3;
-#X connect 51 0 52 4;
-#X connect 52 0 21 0;
-#X connect 53 0 69 1;
-#X connect 53 0 80 1;
-#X connect 54 0 27 0;
-#X connect 54 1 28 0;
-#X connect 55 0 56 1;
-#X connect 55 1 57 1;
-#X connect 55 2 58 1;
-#X connect 55 3 59 1;
-#X connect 55 4 60 1;
-#X connect 56 0 80 0;
-#X connect 57 0 70 0;
-#X connect 58 0 82 0;
-#X connect 59 0 81 0;
-#X connect 60 0 69 0;
-#X connect 62 0 25 1;
-#X connect 63 0 55 0;
-#X connect 64 0 34 4;
-#X connect 65 0 34 3;
-#X connect 66 0 27 1;
-#X connect 67 0 34 1;
-#X connect 68 0 9 0;
-#X connect 69 0 26 4;
-#X connect 70 0 26 1;
+#X connect 5 0 8 0;
+#X connect 5 1 18 2;
+#X connect 7 0 81 1;
+#X connect 8 0 21 0;
+#X connect 9 0 5 0;
+#X connect 10 0 12 0;
+#X connect 10 1 6 1;
+#X connect 11 0 6 0;
+#X connect 12 0 11 0;
+#X connect 12 1 82 0;
+#X connect 13 0 75 0;
+#X connect 14 0 6 0;
+#X connect 15 0 81 0;
+#X connect 17 0 18 1;
+#X connect 18 0 6 0;
+#X connect 19 0 20 0;
+#X connect 19 1 16 0;
+#X connect 19 1 57 0;
+#X connect 19 1 56 0;
+#X connect 19 1 55 0;
+#X connect 19 1 54 0;
+#X connect 19 1 53 0;
+#X connect 20 0 23 0;
+#X connect 21 0 80 0;
+#X connect 21 1 51 0;
+#X connect 22 0 43 0;
+#X connect 23 0 22 0;
+#X connect 24 0 31 0;
+#X connect 25 0 27 0;
+#X connect 25 1 26 0;
+#X connect 26 0 31 3;
+#X connect 26 0 33 0;
+#X connect 26 0 37 0;
+#X connect 26 1 30 0;
+#X connect 26 1 36 0;
+#X connect 26 1 42 0;
+#X connect 26 1 50 0;
+#X connect 27 0 28 0;
+#X connect 27 0 35 0;
+#X connect 27 0 39 0;
+#X connect 27 1 38 0;
+#X connect 27 1 41 0;
+#X connect 27 1 29 0;
+#X connect 28 0 40 0;
+#X connect 28 0 50 0;
+#X connect 29 0 31 2;
+#X connect 30 0 61 0;
+#X connect 31 0 58 0;
+#X connect 32 0 62 0;
+#X connect 33 0 34 0;
+#X connect 34 0 31 2;
+#X connect 35 0 64 0;
+#X connect 36 0 31 2;
+#X connect 36 0 31 1;
+#X connect 36 0 24 1;
+#X connect 37 0 31 1;
+#X connect 37 0 24 1;
+#X connect 37 0 31 4;
+#X connect 38 0 31 3;
+#X connect 38 0 24 1;
+#X connect 38 0 31 4;
+#X connect 39 0 31 2;
+#X connect 39 0 31 3;
+#X connect 39 0 31 4;
+#X connect 40 0 63 0;
+#X connect 41 0 31 1;
+#X connect 42 0 32 0;
+#X connect 43 0 44 0;
+#X connect 43 1 45 0;
+#X connect 43 2 46 0;
+#X connect 43 3 47 0;
+#X connect 43 4 48 0;
+#X connect 43 5 44 1;
+#X connect 43 6 45 1;
+#X connect 43 7 46 1;
+#X connect 43 8 47 1;
+#X connect 43 9 48 1;
+#X connect 44 0 49 0;
+#X connect 45 0 49 1;
+#X connect 46 0 49 2;
+#X connect 47 0 49 3;
+#X connect 48 0 49 4;
+#X connect 49 0 18 0;
+#X connect 50 0 66 1;
+#X connect 50 0 77 1;
+#X connect 51 0 24 0;
+#X connect 51 1 25 0;
+#X connect 52 0 53 1;
+#X connect 52 1 54 1;
+#X connect 52 2 55 1;
+#X connect 52 3 56 1;
+#X connect 52 4 57 1;
+#X connect 53 0 77 0;
+#X connect 54 0 67 0;
+#X connect 55 0 79 0;
+#X connect 56 0 78 0;
+#X connect 57 0 66 0;
+#X connect 59 0 22 1;
+#X connect 60 0 52 0;
+#X connect 61 0 31 4;
+#X connect 62 0 31 3;
+#X connect 63 0 24 1;
+#X connect 64 0 31 1;
+#X connect 65 0 8 0;
+#X connect 66 0 23 4;
+#X connect 67 0 23 1;
+#X connect 68 0 69 0;
+#X connect 69 0 8 0;
+#X connect 69 1 70 0;
+#X connect 70 0 76 0;
 #X connect 71 0 72 0;
 #X connect 72 0 9 0;
-#X connect 72 1 73 0;
-#X connect 73 0 79 0;
-#X connect 74 0 75 0;
-#X connect 75 0 10 0;
-#X connect 76 0 77 0;
-#X connect 78 0 16 1;
-#X connect 78 1 76 0;
-#X connect 79 0 15 0;
-#X connect 79 1 11 1;
-#X connect 79 2 7 0;
-#X connect 80 0 23 1;
-#X connect 81 0 26 3;
-#X connect 82 0 26 2;
+#X connect 73 0 74 0;
+#X connect 75 0 80 1;
+#X connect 75 1 73 0;
+#X connect 76 0 13 0;
+#X connect 76 1 82 1;
+#X connect 76 2 7 0;
+#X connect 77 0 20 1;
+#X connect 78 0 23 3;
+#X connect 79 0 23 2;
+#X connect 80 0 3 0;
+#X connect 81 0 19 0;
+#X connect 82 0 15 0;
+#X connect 82 1 14 0;
 #X coords 0 756 1 755 85 60 0;
-#X restore 490 351 pd curve-calculation;
+#X restore 490 371 pd curve-calculation;
 #N canvas 0 22 290 330 resize 0;
 #X obj 80 100 r \$0-resolution;
 #X obj 80 124 + 3;
@@ -325,17 +325,19 @@
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
-#X restore 490 371 pd resize;
+#X restore 490 391 pd resize;
 #X obj 152 470 expr ($f1*(1.0-$f3)) + ($f2*$f3);
 #X obj 382 101 inlet control;
 #X obj 94 101 inlet;
-#X obj 382 133 route shape weight resolution quality vis;
-#X obj 593 401 r \$1/vis;
-#X obj 593 423 t b;
-#X msg 593 445 vis 1;
-#X obj 576 157 s \$1/vis;
-#X obj 593 467 s pd-\$1;
-#X obj 490 401 table \$1 100;
+#X obj 593 421 r \$1/vis;
+#X msg 593 465 vis 1;
+#X obj 576 207 s \$1/vis;
+#X obj 593 487 s pd-\$1;
+#X obj 490 421 table \$1 131;
+#X obj 139 221 + 1;
+#X obj 382 133 route shape weight resolution quality vis loadbang;
+#X obj 629 184 s \$1/loadbang;
+#X obj 593 443 b;
 #X connect 1 0 2 0;
 #X connect 7 0 9 0;
 #X connect 8 0 27 0;
@@ -352,7 +354,7 @@
 #X connect 18 0 8 0;
 #X connect 18 1 7 0;
 #X connect 18 2 17 0;
-#X connect 19 0 22 0;
+#X connect 19 0 35 0;
 #X connect 20 0 21 0;
 #X connect 21 0 23 0;
 #X connect 22 0 13 1;
@@ -360,14 +362,16 @@
 #X connect 23 1 22 1;
 #X connect 24 0 13 0;
 #X connect 27 0 2 0;
-#X connect 28 0 30 0;
+#X connect 28 0 36 0;
 #X connect 29 0 24 0;
-#X connect 30 0 4 0;
-#X connect 30 1 5 0;
-#X connect 30 2 6 0;
-#X connect 30 3 11 0;
-#X connect 30 4 34 0;
-#X connect 31 0 32 0;
-#X connect 32 0 33 0;
-#X connect 33 0 35 0;
+#X connect 30 0 38 0;
+#X connect 31 0 33 0;
+#X connect 35 0 22 0;
+#X connect 36 0 4 0;
+#X connect 36 1 5 0;
+#X connect 36 2 6 0;
+#X connect 36 3 11 0;
+#X connect 36 4 32 0;
+#X connect 36 5 37 0;
+#X connect 38 0 31 0;
 #X coords 0 610 1 609 85 60 0;

+ 3 - 3
kdemux2.pd

@@ -1,4 +1,4 @@
-#N canvas 463 341 470 347 10;
+#N canvas 39 323 470 347 10;
 #X obj 74 109 inlet;
 #X obj 201 109 inlet;
 #X text 226 10 0: left inlet to left outlet;
@@ -8,8 +8,8 @@
 #X obj 74 279 outlet;
 #X obj 119 161 == 0;
 #X obj 201 161 != 0;
-#X obj 119 86 loadbang;
-#X obj 119 108 float \$1;
+#X obj 119 87 loadbang;
+#X obj 119 109 float \$1;
 #X obj 156 257 spigot 0;
 #X text 244 287 (c)2012 Marian Weger;
 #X text 43 11 kdemux2 <init value>;

+ 14 - 14
list_accumulate.pd

@@ -3,23 +3,23 @@
 #X text 44 38 list_accumulate;
 #X obj 106 77 inlet create;
 #X obj 177 199 list prepend;
-#X obj 177 241 t a a;
 #X obj 131 324 outlet list;
 #X obj 131 295 list;
 #X obj 221 77 inlet elements;
 #X obj 221 99 route bang;
-#X obj 106 123 t b;
-#X obj 152 123 t b;
 #X obj 106 99 route bang clear;
-#X connect 2 0 11 0;
-#X connect 3 0 4 0;
-#X connect 4 0 6 1;
-#X connect 4 1 3 1;
-#X connect 6 0 5 0;
-#X connect 7 0 8 0;
-#X connect 8 1 3 0;
-#X connect 9 0 6 0;
-#X connect 10 0 6 1;
+#X obj 106 123 b;
+#X obj 152 123 b;
+#X obj 177 241 t a a;
+#X connect 2 0 8 0;
+#X connect 3 0 11 0;
+#X connect 5 0 4 0;
+#X connect 6 0 7 0;
+#X connect 7 1 3 0;
+#X connect 8 0 9 0;
+#X connect 8 1 10 0;
+#X connect 9 0 5 0;
+#X connect 10 0 5 1;
 #X connect 10 0 3 1;
-#X connect 11 0 9 0;
-#X connect 11 1 10 0;
+#X connect 11 0 5 1;
+#X connect 11 1 3 1;

+ 3 - 0
list_read-help.pd

@@ -8,7 +8,10 @@
 #X text 74 195 if the indexed element is not existent \, a "bang" will
 be sent to the output.;
 #X text 17 16 list_read <index init (optional)>;
+#X obj 30 83 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+-1;
 #X connect 2 0 3 0;
 #X connect 3 0 1 0;
 #X connect 4 0 5 0;
 #X connect 5 0 3 1;
+#X connect 8 0 3 0;

+ 2 - 2
midi_bi.pd

@@ -2,7 +2,7 @@
 #X text 430 514 (c)2011 \, Marian Weger;
 #X obj 287 127 spigot 1;
 #X msg 287 179 \$3 \$2 \$1;
-#X obj 287 80 r /\$1/midi/in;
+#X obj 287 80 r /midi/\$1/in;
 #X obj 37 142 spigot 1;
 #X obj 37 80 r \$2;
 #X obj 37 360 + 0.5;
@@ -58,7 +58,7 @@
 #X obj 112 462 r \$0-channel;
 #X obj 287 231 route 1;
 #X obj 326 209 r \$0-channel;
-#X obj 37 527 s /\$1/midi/out;
+#X obj 37 527 s /midi/\$1/out;
 #X obj 37 220 route float;
 #X obj 194 158 loadbang;
 #X obj 194 180 symbol \$3;

+ 19 - 19
midi_gen.pd

@@ -1,9 +1,9 @@
 #N canvas 523 201 509 361 10;
 #N canvas 288 31 780 668 note 0;
 #X obj 222 427 makenote 127 100;
-#X obj 538 323 r /\$1/midi/gen/note/velocity;
-#X obj 432 71 r /\$1/midi/gen/note/duration;
-#X obj 319 519 r /\$1/midi/gen/ch;
+#X obj 538 323 r /midi/\$1/gen/note/velocity;
+#X obj 432 71 r /midi/\$1/gen/note/duration;
+#X obj 319 519 r /midi/\$1/gen/ch;
 #X obj 262 591 list prepend note;
 #X obj 432 93 sel 0;
 #X obj 262 339 spigot 1;
@@ -15,12 +15,12 @@
 #X msg 324 313 1;
 #X msg 462 313 0;
 #X obj 262 645 outlet;
-#X obj 571 396 r /\$1/midi/gen/note/send/vel;
+#X obj 571 396 r /midi/\$1/gen/note/send/vel;
 #X obj 538 345 t b f;
 #X obj 250 45 t b f;
-#X obj 250 20 r /\$1/midi/gen/note/nr;
-#X obj 67 149 r /\$1/midi/gen/note/send/note;
-#X obj 306 50 r /\$1/midi/gen/note/send;
+#X obj 250 20 r /midi/\$1/gen/note/nr;
+#X obj 67 149 r /midi/\$1/gen/note/send/note;
+#X obj 306 50 r /midi/\$1/gen/note/send;
 #X obj 306 72 t b;
 #X obj 262 225 f;
 #X obj 538 419 spigot;
@@ -62,9 +62,9 @@
 #X connect 25 0 4 0;
 #X restore 84 69 pd note;
 #N canvas 673 250 450 300 bend 0;
-#X obj 109 77 r /\$1/midi/gen/bend;
+#X obj 109 77 r /midi/\$1/gen/bend;
 #X obj 109 124 pack f 1;
-#X obj 154 98 r /\$1/midi/gen/ch;
+#X obj 154 98 r /midi/\$1/gen/ch;
 #X obj 109 146 list prepend bend;
 #X obj 109 190 outlet;
 #X connect 0 0 1 0;
@@ -72,25 +72,25 @@
 #X connect 2 0 1 1;
 #X connect 3 0 4 0;
 #X restore 205 69 pd bend;
-#X obj 228 133 r /\$1/midi/gen/dest;
-#X obj 168 255 s /\$1/midi/out;
+#X obj 228 133 r /midi/\$1/gen/dest;
+#X obj 168 255 s /midi/\$1/out;
 #X obj 147 179 list trim;
 #X text 251 289 (c)2011 \, Marian Weger;
 #N canvas 448 97 636 400 ctl 0;
 #X obj -1228 305 outlet;
-#X obj -1482 118 r /\$1/midi/gen/ctl/send;
-#X obj -1100 79 r /\$1/midi/gen/ctl/value;
-#X obj -1295 117 r /\$1/midi/gen/ctl/send/ctl;
+#X obj -1482 118 r /midi/\$1/gen/ctl/send;
+#X obj -1100 79 r /midi/\$1/gen/ctl/value;
+#X obj -1295 117 r /midi/\$1/gen/ctl/send/ctl;
 #X obj -1482 140 t b;
 #X obj -1328 80 t b f;
 #X obj -1228 224 f;
 #X obj -1328 146 spigot;
-#X obj -1171 228 r /\$1/midi/gen/ctl/ch;
+#X obj -1171 228 r /midi/\$1/gen/ctl/ch;
 #X obj -1228 256 pack f f 1;
-#X obj -1328 55 r /\$1/midi/gen/ctl/nr;
+#X obj -1328 55 r /midi/\$1/gen/ctl/nr;
 #X obj -1100 101 t b f;
 #X obj -1100 151 spigot;
-#X obj -1067 128 r /\$1/midi/gen/ctl/send/val;
+#X obj -1067 128 r /midi/\$1/gen/ctl/send/val;
 #X obj -1228 278 list prepend ctl;
 #X connect 1 0 4 0;
 #X connect 2 0 11 0;
@@ -112,8 +112,8 @@
 #X text 67 24 midi_gen <domain>;
 #X obj 147 156 list prepend 0;
 #X obj 147 202 route 0 1 2;
-#X obj 189 232 s /\$1/midi/gen;
-#X obj 147 277 s /\$1/midi/in;
+#X obj 189 232 s /midi/\$1/gen;
+#X obj 147 277 s /midi/\$1/in;
 #X obj 75 322 outlet;
 #X connect 0 0 8 0;
 #X connect 0 0 12 0;

+ 43 - 43
midi_gen_gui.pd

@@ -29,9 +29,9 @@
 -1;
 #X obj 217 219 bng 15 250 50 0 empty empty empty 17 7 0 10 -1 -262144
 -1;
-#X obj 104 228 bng 15 250 50 0 /\$1/midi/gen/note/octave/prev /\$1/midi/gen/note/octave/prev
+#X obj 104 228 bng 15 250 50 0 /midi/\$1/gen/note/octave/prev /midi/\$1/gen/note/octave/prev
 < 4 7 0 10 -260097 -1 -1;
-#X obj 244 228 bng 15 250 50 0 /\$1/midi/gen/note/octave/next /\$1/midi/gen/note/octave/next
+#X obj 244 228 bng 15 250 50 0 /midi/\$1/gen/note/octave/next /midi/\$1/gen/note/octave/next
 > 5 7 0 10 -260097 -1 -1;
 #X msg 35 292 0;
 #X msg 65 292 1;
@@ -45,82 +45,82 @@
 #X msg 305 292 9;
 #X msg 335 292 10;
 #X msg 365 292 11;
-#X obj 223 201 nbx 3 14 -1e+37 1e+37 0 0 /\$1/midi/gen/note/octave
-/\$1/midi/gen/note/octave octave 0 -8 0 10 -260097 -1 -1 0 256;
-#X obj 184 143 nbx 4 14 0 9999 0 0 /\$1/midi/gen/note/duration /\$1/midi/gen/note/duration
+#X obj 223 201 nbx 3 14 -1e+37 1e+37 0 0 /midi/\$1/gen/note/octave
+/midi/\$1/gen/note/octave octave 0 -8 0 10 -260097 -1 -1 0 256;
+#X obj 184 143 nbx 4 14 0 9999 0 0 /midi/\$1/gen/note/duration /midi/\$1/gen/note/duration
 duration 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 144 143 nbx 3 14 0 127 0 0 /\$1/midi/gen/note/velocity /\$1/midi/gen/note/velocity
+#X obj 144 143 nbx 3 14 0 127 0 0 /midi/\$1/gen/note/velocity /midi/\$1/gen/note/velocity
 vel 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 104 143 nbx 3 14 0 127 0 0 /\$1/midi/gen/note/nr /\$1/midi/gen/note/nr
+#X obj 104 143 nbx 3 14 0 127 0 0 /midi/\$1/gen/note/nr /midi/\$1/gen/note/nr
 note 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 446 472 r /\$1/midi/gen/note/octave;
-#X obj 104 161 bng 15 250 50 0 /\$1/midi/gen/note/nr/prev /\$1/midi/gen/note/nr/prev
+#X obj 446 472 r /midi/\$1/gen/note/octave;
+#X obj 104 161 bng 15 250 50 0 /midi/\$1/gen/note/nr/prev /midi/\$1/gen/note/nr/prev
 < 4 7 0 10 -262144 -1 -1;
-#X obj 123 161 bng 15 250 50 0 /\$1/midi/gen/note/nr/next /\$1/midi/gen/note/nr/next
+#X obj 123 161 bng 15 250 50 0 /midi/\$1/gen/note/nr/next /midi/\$1/gen/note/nr/next
 > 5 7 0 10 -262144 -1 -1;
-#X obj 327 157 nbx 3 14 0 127 0 0 /\$1/midi/gen/ctl/value /\$1/midi/gen/ctl/value
+#X obj 327 157 nbx 3 14 0 127 0 0 /midi/\$1/gen/ctl/value /midi/\$1/gen/ctl/value
 value 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 287 157 nbx 3 14 0 127 0 0 /\$1/midi/gen/ctl/nr /\$1/midi/gen/ctl/nr
+#X obj 287 157 nbx 3 14 0 127 0 0 /midi/\$1/gen/ctl/nr /midi/\$1/gen/ctl/nr
 ctl 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 287 194 bng 15 250 50 0 /\$1/midi/gen/ctl/send /\$1/midi/gen/ctl/send
+#X obj 287 194 bng 15 250 50 0 /midi/\$1/gen/ctl/send /midi/\$1/gen/ctl/send
 send 17 7 0 10 -258113 -1 -1;
-#X obj 287 175 bng 15 250 50 0 /\$1/midi/gen/ctl/nr/prev /\$1/midi/gen/ctl/nr/prev
+#X obj 287 175 bng 15 250 50 0 /midi/\$1/gen/ctl/nr/prev /midi/\$1/gen/ctl/nr/prev
 < 4 7 0 10 -262144 -1 -1;
-#X obj 306 175 bng 15 250 50 0 /\$1/midi/gen/ctl/nr/next /\$1/midi/gen/ctl/nr/next
+#X obj 306 175 bng 15 250 50 0 /midi/\$1/gen/ctl/nr/next /midi/\$1/gen/ctl/nr/next
 > 5 7 0 10 -262144 -1 -1;
-#X obj 268 144 vsl 15 100 0 127 0 0 /\$1/midi/gen/ctl/value /\$1/midi/gen/ctl/value
+#X obj 268 144 vsl 15 100 0 127 0 0 /midi/\$1/gen/ctl/value /midi/\$1/gen/ctl/value
 empty 0 -9 0 10 -1 -262144 -1 0 1;
-#X obj 327 175 bng 15 250 50 0 /\$1/midi/gen/ctl/value/prev /\$1/midi/gen/ctl/value/prev
+#X obj 327 175 bng 15 250 50 0 /midi/\$1/gen/ctl/value/prev /midi/\$1/gen/ctl/value/prev
 < 4 7 0 10 -262144 -1 -1;
-#X obj 346 175 bng 15 250 50 0 /\$1/midi/gen/ctl/value/next /\$1/midi/gen/ctl/value/next
+#X obj 346 175 bng 15 250 50 0 /midi/\$1/gen/ctl/value/next /midi/\$1/gen/ctl/value/next
 > 5 7 0 10 -262144 -1 -1;
-#X obj 144 161 bng 15 250 50 0 /\$1/midi/gen/note/velocity/prev /\$1/midi/gen/note/velocity/prev
+#X obj 144 161 bng 15 250 50 0 /midi/\$1/gen/note/velocity/prev /midi/\$1/gen/note/velocity/prev
 < 4 7 0 10 -262144 -1 -1;
-#X obj 163 161 bng 15 250 50 0 /\$1/midi/gen/note/velocity/next /\$1/midi/gen/note/velocity/next
+#X obj 163 161 bng 15 250 50 0 /midi/\$1/gen/note/velocity/next /midi/\$1/gen/note/velocity/next
 > 5 7 0 10 -262144 -1 -1;
-#X obj 195 358 s /\$1/midi/gen/note/kbd;
-#X obj 431 448 r /\$1/midi/gen/note/kbd;
-#X obj 378 144 vsl 15 100 0 16383 0 0 /\$1/midi/gen/bend /\$1/midi/gen/bend
+#X obj 195 358 s /midi/\$1/gen/note/kbd;
+#X obj 431 448 r /midi/\$1/gen/note/kbd;
+#X obj 378 144 vsl 15 100 0 16383 0 0 /midi/\$1/gen/bend /midi/\$1/gen/bend
 empty 0 -9 0 10 -1 -262144 -1 0 1;
-#X obj 397 214 nbx 5 14 0 16383 0 0 /\$1/midi/gen/bend /\$1/midi/gen/bend
+#X obj 397 214 nbx 5 14 0 16383 0 0 /midi/\$1/gen/bend /midi/\$1/gen/bend
 bend 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 397 232 bng 15 250 50 0 /\$1/midi/gen/bend/prev /\$1/midi/gen/bend/prev
+#X obj 397 232 bng 15 250 50 0 /midi/\$1/gen/bend/prev /midi/\$1/gen/bend/prev
 < 4 7 0 10 -262144 -1 -1;
-#X obj 416 232 bng 15 250 50 0 /\$1/midi/gen/bend/next /\$1/midi/gen/bend/next
+#X obj 416 232 bng 15 250 50 0 /midi/\$1/gen/bend/next /midi/\$1/gen/bend/next
 > 5 7 0 10 -262144 -1 -1;
-#X obj 287 213 tgl 15 0 /\$1/midi/gen/ctl/send/ctl /\$1/midi/gen/ctl/send/ctl
+#X obj 287 213 tgl 15 0 /midi/\$1/gen/ctl/send/ctl /midi/\$1/gen/ctl/send/ctl
 send_on_ctl 17 7 0 10 -262144 -1 -1 0 1;
-#X obj 287 232 tgl 15 0 /\$1/midi/gen/ctl/send/val /\$1/midi/gen/ctl/send/val
+#X obj 287 232 tgl 15 0 /midi/\$1/gen/ctl/send/val /midi/\$1/gen/ctl/send/val
 send_on_val 17 7 0 10 -262144 -1 -1 0 1;
-#X obj 104 180 tgl 15 0 /\$1/midi/gen/note/send/note /\$1/midi/gen/note/send/note
+#X obj 104 180 tgl 15 0 /midi/\$1/gen/note/send/note /midi/\$1/gen/note/send/note
 send_on_note 17 7 0 10 -262144 -1 -1 0 1;
-#X obj 104 200 tgl 15 0 /\$1/midi/gen/note/send/vel /\$1/midi/gen/note/send/vel
+#X obj 104 200 tgl 15 0 /midi/\$1/gen/note/send/vel /midi/\$1/gen/note/send/vel
 send_on_vel 17 7 0 10 -262144 -1 -1 0 1;
-#X obj 184 161 bng 15 250 50 0 /\$1/midi/gen/note/send /\$1/midi/gen/note/send
+#X obj 184 161 bng 15 250 50 0 /midi/\$1/gen/note/send /midi/\$1/gen/note/send
 send 17 7 0 10 -258113 -1 -1;
 #X obj 457 115 cnv 20 42 139 empty empty empty 20 12 0 14 -228856 -66577
 0;
-#X obj 460 143 nbx 3 14 1 128 0 0 /\$1/midi/gen/ch /\$1/midi/gen/ch
+#X obj 460 143 nbx 3 14 1 128 0 0 /midi/\$1/gen/ch /midi/\$1/gen/ch
 ch 0 -8 0 10 -257985 -1 -1 1 256;
-#X obj 460 202 vradio 15 1 0 3 /\$1/midi/gen/dest /\$1/midi/gen/dest
+#X obj 460 202 vradio 15 1 0 3 /midi/\$1/gen/dest /midi/\$1/gen/dest
 dest 0 -8 0 10 -4034 -1 -1 0;
 #X text 476 202 in;
 #X text 476 217 out;
-#X obj 460 161 bng 15 250 50 0 /\$1/midi/gen/ch/prev /\$1/midi/gen/ch/prev
+#X obj 460 161 bng 15 250 50 0 /midi/\$1/gen/ch/prev /midi/\$1/gen/ch/prev
 < 4 7 0 10 -257985 -1 -1;
-#X obj 479 161 bng 15 250 50 0 /\$1/midi/gen/ch/next /\$1/midi/gen/ch/next
+#X obj 479 161 bng 15 250 50 0 /midi/\$1/gen/ch/next /midi/\$1/gen/ch/next
 > 5 7 0 10 -257985 -1 -1;
 #X text 321 628 (c)2011 \, Marian Weger;
 #X text 112 51 midi_gen_gui <domain>;
-#X obj 431 521 s /\$1/midi/gen/note/nr;
+#X obj 431 521 s /midi/\$1/gen/note/nr;
 #X text 476 231 gen;
-#X obj 431 309 prev-next /\$1/midi/gen/note/nr 0 127 1;
-#X obj 431 349 prev-next /\$1/midi/gen/note/octave 0 127 12;
-#X obj 431 289 prev-next /\$1/midi/gen/ch 1 16 1;
-#X obj 431 329 prev-next /\$1/midi/gen/note/velocity 0 127 1;
-#X obj 431 369 prev-next /\$1/midi/gen/ctl/value 0 127 1;
-#X obj 431 389 prev-next /\$1/midi/gen/ctl/nr 0 127 1;
-#X obj 431 409 prev-next /\$1/midi/gen/bend 0 16383 1;
+#X obj 431 309 prev-next /midi/\$1/gen/note/nr 0 127 1;
+#X obj 431 349 prev-next /midi/\$1/gen/note/octave 0 127 12;
+#X obj 431 289 prev-next /midi/\$1/gen/ch 1 16 1;
+#X obj 431 329 prev-next /midi/\$1/gen/note/velocity 0 127 1;
+#X obj 431 369 prev-next /midi/\$1/gen/ctl/value 0 127 1;
+#X obj 431 389 prev-next /midi/\$1/gen/ctl/nr 0 127 1;
+#X obj 431 409 prev-next /midi/\$1/gen/bend 0 16383 1;
 #X obj 431 497 + 0;
 #X connect 3 0 17 0;
 #X connect 4 0 19 0;

+ 39 - 39
midi_in.pd

@@ -30,14 +30,7 @@
 #X obj 909 147 list prepend raw;
 #X obj 419 281 spigot 1;
 #X obj 419 306 list trim;
-#X obj 280 387 r /\$1/midi/in/print;
-#X obj 591 370 r /\$1/midi/in/showinfo;
-#X obj 558 415 s /\$1/midi/in/info;
-#X obj 494 281 r /\$1/midi/in/active;
-#X obj 419 502 s /\$1/midi/in;
-#X obj 942 96 r /\$1/midi/in/raw;
 #X obj 525 504 outlet;
-#X obj 863 236 r /\$1/midi/in/raw;
 #X obj 863 258 == 0;
 #X obj 863 280 s \$0-noraw;
 #X obj 822 96 r \$0-noraw;
@@ -55,66 +48,73 @@
 #X obj 639 121 spigot 1;
 #X obj 789 121 spigot 1;
 #X obj 909 121 spigot;
+#X obj 863 236 r /midi/\$1/in/raw;
+#X obj 494 281 r /midi/\$1/in/active;
+#X obj 591 370 r /midi/\$1/in/showinfo;
+#X obj 558 415 s /midi/\$1/in/info;
+#X obj 419 502 s /midi/\$1/in;
+#X obj 280 387 r /midi/\$1/in/print;
+#X obj 942 96 r /midi/\$1/in/raw;
 #X connect 0 0 1 0;
 #X connect 0 1 1 1;
 #X connect 0 2 1 2;
-#X connect 1 0 48 0;
+#X connect 1 0 41 0;
 #X connect 2 0 29 0;
-#X connect 3 0 49 0;
+#X connect 3 0 42 0;
 #X connect 4 0 3 0;
 #X connect 4 1 3 1;
 #X connect 4 2 3 2;
 #X connect 5 0 29 0;
 #X connect 6 0 7 0;
 #X connect 6 1 7 1;
-#X connect 7 0 50 0;
+#X connect 7 0 43 0;
 #X connect 8 0 29 0;
-#X connect 9 0 51 0;
+#X connect 9 0 44 0;
 #X connect 10 0 9 0;
 #X connect 10 1 9 1;
 #X connect 11 0 29 0;
-#X connect 12 0 52 0;
+#X connect 12 0 45 0;
 #X connect 13 0 12 0;
 #X connect 13 1 12 1;
 #X connect 14 0 29 0;
 #X connect 15 0 16 0;
 #X connect 15 1 16 1;
 #X connect 15 2 16 2;
-#X connect 16 0 53 0;
+#X connect 16 0 46 0;
 #X connect 17 0 29 0;
 #X connect 18 0 19 0;
 #X connect 18 1 19 1;
-#X connect 19 0 54 0;
+#X connect 19 0 47 0;
 #X connect 20 0 29 0;
 #X connect 21 0 22 0;
-#X connect 23 0 33 0;
-#X connect 26 0 55 0;
+#X connect 23 0 52 0;
+#X connect 26 0 48 0;
 #X connect 27 0 26 0;
 #X connect 27 1 26 1;
 #X connect 28 0 29 0;
 #X connect 29 0 30 0;
 #X connect 30 0 23 0;
 #X connect 30 0 21 0;
-#X connect 30 0 35 0;
-#X connect 30 0 37 0;
-#X connect 31 0 21 1;
-#X connect 32 0 23 1;
-#X connect 34 0 29 1;
-#X connect 36 0 55 1;
-#X connect 38 0 39 0;
-#X connect 39 0 40 0;
-#X connect 41 0 54 1;
-#X connect 42 0 53 1;
-#X connect 43 0 52 1;
-#X connect 44 0 51 1;
-#X connect 45 0 50 1;
-#X connect 46 0 49 1;
-#X connect 47 0 48 1;
-#X connect 48 0 2 0;
-#X connect 49 0 5 0;
-#X connect 50 0 8 0;
-#X connect 51 0 11 0;
-#X connect 52 0 14 0;
-#X connect 53 0 17 0;
-#X connect 54 0 20 0;
-#X connect 55 0 28 0;
+#X connect 30 0 31 0;
+#X connect 30 0 53 0;
+#X connect 32 0 33 0;
+#X connect 34 0 47 1;
+#X connect 35 0 46 1;
+#X connect 36 0 45 1;
+#X connect 37 0 44 1;
+#X connect 38 0 43 1;
+#X connect 39 0 42 1;
+#X connect 40 0 41 1;
+#X connect 41 0 2 0;
+#X connect 42 0 5 0;
+#X connect 43 0 8 0;
+#X connect 44 0 11 0;
+#X connect 45 0 14 0;
+#X connect 46 0 17 0;
+#X connect 47 0 20 0;
+#X connect 48 0 28 0;
+#X connect 49 0 32 0;
+#X connect 50 0 29 1;
+#X connect 51 0 23 1;
+#X connect 54 0 21 1;
+#X connect 55 0 48 1;

+ 6 - 6
midi_in_gui.pd

@@ -5,9 +5,9 @@
 #X obj 104 118 tgl 15 0 \$1/midi/in/print \$1/midi/in/print print 17
 7 0 10 -262144 -1 -1 0 1;
 #X text 173 25 midi_in_gui: <domain>;
-#X obj 172 118 tgl 15 0 /\$1/midi/in/showinfo /\$1/midi/in/showinfo
+#X obj 172 118 tgl 15 0 /midi/\$1/in/showinfo /midi/\$1/in/showinfo
 info 17 7 0 10 -262144 -1 -1 0 1;
-#X obj 242 118 tgl 15 0 /\$1/midi/in/active /\$1/midi/in/active active
+#X obj 242 118 tgl 15 0 /midi/\$1/in/active /midi/\$1/in/active active
 17 7 0 10 -4034 -1 -1 1 1;
 #X obj 122 182 nbx 5 14 -1e+37 1e+37 0 0 empty empty value_1 0 -8 0
 10 -191407 -1 -1 0 256;
@@ -25,17 +25,17 @@ info 17 7 0 10 -262144 -1 -1 0 1;
 #X obj 393 146 t a b;
 #X obj 104 181 bng 15 250 50 0 empty empty empty 17 7 0 10 -191407
 -1 -1;
-#X obj 242 145 tgl 15 0 /\$1/midi/in/raw /\$1/midi/in/raw raw 17 7
+#X obj 242 145 tgl 15 0 /midi/\$1/in/raw /midi/\$1/in/raw raw 17 7
 0 10 -262144 -1 -1 0 1;
 #N canvas 755 69 371 260 init 0;
 #X obj 123 75 loadbang;
 #X obj 123 97 list prepend \$1;
-#X msg 123 119 \; /\$1/midi/in/active 1 \; /\$1/midi/in/showinfo 0
-\; /\$1/midi/in/print 0 \;;
+#X msg 123 119 \; /midi/\$1/in/active 1 \; /midi/\$1/in/showinfo 0
+\; /midi/\$1/in/print 0 \;;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
 #X restore 229 265 pd init;
-#X obj 393 124 r /\$1/midi/in/info;
+#X obj 393 124 r /midi/\$1/in/info;
 #X connect 11 0 10 0;
 #X connect 11 1 6 0;
 #X connect 11 2 7 0;

+ 3 - 3
midi_out.pd

@@ -19,9 +19,9 @@
 #X text 322 24 midi_out <domain>;
 #X obj 391 80 spigot 1;
 #X obj 391 102 print MIDI_OUT;
-#X obj 137 37 r /\$1/midi/out;
-#X obj 182 84 r /\$1/midi/out/active;
-#X obj 436 55 r /\$1/midi/out/print;
+#X obj 137 37 r /midi/\$1/out;
+#X obj 182 84 r /midi/\$1/out/active;
+#X obj 436 55 r /midi/\$1/out/print;
 #X obj 254 37 inlet;
 #X connect 0 0 13 0;
 #X connect 2 0 1 0;

+ 3 - 3
midi_out_gui.pd

@@ -2,15 +2,15 @@
 #X obj 101 115 cnv 15 198 34 empty empty empty 20 12 0 14 -191407 -66577
 0;
 #X text 312 340 (c)2011 \, Marian Weger;
-#X obj 106 125 tgl 15 0 /\$1/midi/out/print /\$1/midi/out/print print
+#X obj 106 125 tgl 15 0 /midi/\$1/out/print /midi/\$1/out/print print
 17 7 0 10 -262144 -1 -1 0 1;
-#X obj 243 125 tgl 15 0 /\$1/midi/out/active /\$1/midi/out/active active
+#X obj 243 125 tgl 15 0 /midi/\$1/out/active /midi/\$1/out/active active
 17 7 0 10 -4034 -1 -1 1 1;
 #X text 173 25 midi_out_gui: <domain>;
 #N canvas 755 69 371 260 init 0;
 #X obj 123 75 loadbang;
 #X obj 123 97 list prepend \$1;
-#X msg 123 119 \; /\$1/midi/out/active 1 \; /\$1/midi/out/print 0 \;
+#X msg 123 119 \; /midi/\$1/out/active 1 \; /midi/\$1/out/print 0 \;
 ;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;

+ 1 - 1
midi_r.pd

@@ -4,7 +4,7 @@
 <scaling> <offset> <interpol.time> <grain rate>;
 #X obj 91 141 spigot 1;
 #X msg 91 193 \$3 \$2 \$1;
-#X obj 91 94 r /\$1/midi/in;
+#X obj 91 94 r /midi/\$1/in;
 #N canvas 499 22 270 248 init 0;
 #X obj 63 49 loadbang;
 #X msg 63 115 1;

+ 1 - 1
midi_s.pd

@@ -14,7 +14,7 @@
 #X obj 37 433 list append \$4;
 #X obj 37 401 list prepend \$3;
 #X text 249 472 (c)2011 \, Marian Weger;
-#X obj 37 537 s /\$1/midi/out;
+#X obj 37 537 s /midi/\$1/out;
 #X obj 37 507 list trim;
 #N canvas 499 22 270 248 init 0;
 #X obj 63 49 loadbang;

+ 1 - 0
msg_monitor.pd

@@ -25,6 +25,7 @@
 #X connect 5 0 0 0;
 #X connect 6 0 11 0;
 #X connect 7 0 10 0;
+#X connect 7 0 11 0;
 #X connect 8 0 9 0;
 #X connect 8 1 6 1;
 #X connect 9 0 6 1;

+ 42 - 41
osc-help.pd

@@ -12,56 +12,27 @@
 #X obj 14 261 cnv 15 750 200 empty empty Example 20 12 0 14 -204800
 -66577 0;
 #X obj 612 355 hsl 128 15 0 127 0 0 /i/send/data /i/send/data /i/send/data
--2 -8 0 10 -262144 -1 -1 0 1;
+-2 -8 0 10 -262144 -1 -1 2900 1;
 #X obj 620 303 nbx 5 14 -1e+37 1e+37 0 0 /i/receive/data /i/receive/data
-/i/receive/data 0 -8 0 10 -262144 -1 -1 0 256;
-#X obj 27 301 osc_r 0 /i/receive/data;
-#X obj 31 363 osc_s 0 /i/send/data;
-#X text 188 300 This registers "/i/receive/data" to receive OSC from
-domain "0";
-#X text 180 357 This registers "/i/send/data" to send OSC from domain
-"0";
-#X obj 34 420 osc_bi 0 /i/do/both;
-#X text 185 419 This registers "/i/do/both" for bidirectional OSC communication
-with domain "0";
+/i/receive/data 0 -8 0 10 -262144 -1 -1 42 256;
 #X obj 14 472 cnv 15 750 180 empty empty OSC_Output 20 12 0 14 -204786
 -66577 0;
-#X obj 150 499 r /0/osc/out;
-#X obj 150 599 print /0/osc/out;
 #X obj 150 575 spigot 1;
 #X obj 195 550 tgl 15 0 empty empty print_osc_output 17 7 0 10 -262144
 -1 -1 0 1;
-#X text 537 548 [packOSC];
-#X text 537 558 |;
-#X text 537 568 |;
-#X text 537 578 [udpsend 127.0.0.1];
-#X text 537 538 |;
-#X text 537 528 |;
-#X text 537 518 [r /0/osc/out];
 #X obj 14 661 cnv 15 750 220 empty empty OSC_Input 20 12 0 14 -204786
 -66577 0;
-#X text 502 829 |;
-#X text 502 839 |;
-#X text 502 809 |;
-#X text 502 799 |;
-#X obj 144 790 s /0/osc/in;
-#X text 502 789 [udreceive 127.0.0.1];
-#X text 502 819 [unpackOSC];
-#X text 502 849 [s /0/osc/in];
 #X obj 20 698 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -8 0 10
--262144 -1 -1 0 256;
+-262144 -1 -1 42 256;
 #X msg 20 717 /i/receive/data \$1;
 #X msg 144 717 /i/do/both \$1;
 #X obj 147 697 hsl 128 15 0 127 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 0 1;
-#X text 223 788 <-- put your OSC input in here. Like this:;
+#X text 233 788 <-- put your OSC input in here. Like this:;
 #X obj 612 425 hsl 128 15 0 127 0 0 /i/do/both /i/do/both /i/do/both
--2 -8 0 10 -262144 -1 -1 0 1;
+-2 -8 0 10 -262144 -1 -1 2100 1;
 #X text 160 520 Connect this to your OSC externals \, i.e. mrpeach
 or iemnet:;
-#X text 127 477 The OSC output can be accessed und under "/<domain>/osc/out"
-;
-#X text 123 667 The OSC input must be sent to "/<domain>/osc/out";
 #X text 21 621 Play around with the patch on top of the page \, and
 see what's going to be printed...;
 #X text 598 19 (c)2011-2012 Marian Weger;
@@ -70,11 +41,41 @@ the [osc_...] modules.;
 #X text 23 208 SYNTAX: [osc_xx <domain> <variable_name>] \, where <domain>
 is the name of the storage you want to register to \, and <variable_name>
 is the complete name of your variable.;
-#X connect 17 0 19 0;
-#X connect 19 0 18 0;
-#X connect 20 0 19 1;
-#X connect 37 0 38 0;
-#X connect 38 0 33 0;
-#X connect 39 0 33 0;
-#X connect 40 0 39 0;
+#X text 123 667 The OSC input must be sent to "/osc/<domain>/out";
+#X text 127 477 The OSC output can be accessed und under "/osc/<domain>/out"
+;
+#X obj 538 554 packOSC;
+#X obj 538 521 r /osc/help/out;
+#X obj 150 499 r /osc/help/out;
+#X obj 150 599 print /osc/help/out;
+#X obj 144 790 s /osc/help/in;
+#X obj 31 363 osc_s help /i/send/data;
+#X obj 34 420 osc_bi help /i/do/both;
+#X obj 27 301 osc_r help /i/receive/data;
+#X text 185 419 This registers "/i/do/both" for bidirectional OSC communication
+with domain "help";
+#X text 180 357 This registers "/i/send/data" to send OSC from domain
+"help";
+#X text 188 300 This registers "/i/receive/data" to receive OSC from
+domain "help";
+#X obj 537 757 udpreceive 6666;
+#X obj 537 789 unpackOSC;
+#X obj 537 821 s /osc/help/in;
+#X obj 538 606 udpsend;
+#X obj 610 552 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X msg 610 572 connect 127.0.0.1 6666;
+#X connect 11 0 30 0;
+#X connect 12 0 11 1;
+#X connect 14 0 15 0;
+#X connect 15 0 31 0;
+#X connect 16 0 31 0;
+#X connect 17 0 16 0;
+#X connect 27 0 41 0;
+#X connect 28 0 27 0;
+#X connect 29 0 11 0;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 42 0 43 0;
+#X connect 43 0 41 0;
 #X coords 0 756 1 755 85 60 0;

+ 9 - 9
osc2send-help.pd

@@ -1,7 +1,5 @@
 #N canvas 678 110 351 374 10;
 #X text 28 -59 osc2send;
-#X text 27 -22 routes them to the corresponding send;
-#X text 27 -32 takes osc style messages and;
 #X floatatom 42 25 5 0 0 0 - - -;
 #X msg 42 44 /bla/blub \$1;
 #X obj 42 86 osc2send;
@@ -15,12 +13,14 @@
 #X symbolatom 206 179 10 0 0 0 - - -;
 #X text 49 233 (c)2011 Marian Weger;
 #X msg 149 44 /pling/plong \$1 #blip?\$1;
-#X connect 3 0 4 0;
+#X text 27 -32 takes osc style messages and routes them to the corresponding
+send/receive;
+#X connect 1 0 2 0;
+#X connect 2 0 3 0;
 #X connect 4 0 5 0;
-#X connect 6 0 7 0;
-#X connect 8 0 14 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 10 1 12 0;
-#X connect 14 0 5 0;
+#X connect 6 0 12 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 8 1 10 0;
+#X connect 12 0 3 0;
 #X coords 0 374 1 373 85 60 0;

+ 16 - 22
osc2send.pd

@@ -1,30 +1,24 @@
 #N canvas 212 191 416 534 10;
-#X obj 149 400 s;
-#X obj 95 338 list;
-#X obj 95 360 list trim;
-#X obj 95 248 list split 1;
-#X obj 32 202 inlet;
+#X obj 102 392 s;
+#X obj 45 324 list;
+#X obj 45 346 list trim;
+#X obj 32 244 list split 1;
 #X text 28 91 osc2send;
-#X obj 137 288 t b s;
-#X obj 32 224 route float;
+#X obj 90 284 t b s;
 #X text 27 128 routes them to the corresponding send;
 #X text 27 118 takes osc style messages and;
 #X text 121 173 example:;
-#X text 123 191 inlet: "/bla/blub 1 2 3";
-#X text 123 211 --> "1 2 3" is sent to "/bla/blub";
-#X msg 32 431 WARNING: need list but got float;
-#X obj 32 453 print osc2send;
-#X obj 32 246 t b;
-#X text 178 461 (c)2011 Marian Weger;
+#X text 191 467 (c)2011 Marian Weger;
+#X obj 45 368 route bang;
+#X obj 32 202 inlet list;
+#X text 123 211 --> "1 two 3" is sent to "/bla/blub";
+#X text 123 191 inlet: "/bla/blub 1 two 3";
 #X connect 1 0 2 0;
-#X connect 2 0 0 0;
-#X connect 3 0 6 0;
+#X connect 2 0 10 0;
+#X connect 3 0 5 0;
 #X connect 3 1 1 1;
-#X connect 4 0 7 0;
-#X connect 6 0 1 0;
-#X connect 6 1 0 1;
-#X connect 7 0 15 0;
-#X connect 7 1 3 0;
-#X connect 13 0 14 0;
-#X connect 15 0 13 0;
+#X connect 5 0 1 0;
+#X connect 5 1 0 1;
+#X connect 10 1 0 0;
+#X connect 11 0 3 0;
 #X coords 0 534 1 533 85 60 0;

+ 10 - 10
osc_bi.pd

@@ -12,26 +12,26 @@
 #X obj 49 179 t b a;
 #X msg 94 245 1;
 #X text 121 280 feedback prevention;
-#X obj 115 74 r /\$1/osc/in;
 #X obj 49 317 list prepend \$2;
-#X obj 49 374 s /\$1/osc/out;
 #X obj 49 74 r \$2;
 #X obj 115 157 route \$2;
 #X obj 194 245 s \$2;
 #X text 50 15 osc_bi <domain> <name>;
+#X obj 115 74 r /osc/\$1/in;
+#X obj 49 374 s /osc/\$1/out;
 #X connect 0 0 2 1;
-#X connect 1 0 15 0;
-#X connect 2 0 14 0;
-#X connect 3 0 17 0;
+#X connect 1 0 19 0;
+#X connect 2 0 13 0;
+#X connect 3 0 15 0;
 #X connect 4 0 10 0;
-#X connect 5 0 18 0;
+#X connect 5 0 16 0;
 #X connect 5 1 0 0;
 #X connect 6 0 4 1;
 #X connect 7 0 3 1;
 #X connect 10 0 11 0;
 #X connect 10 1 2 0;
 #X connect 11 0 2 1;
-#X connect 13 0 3 0;
-#X connect 14 0 1 0;
-#X connect 16 0 4 0;
-#X connect 17 0 5 0;
+#X connect 13 0 1 0;
+#X connect 14 0 4 0;
+#X connect 15 0 5 0;
+#X connect 18 0 3 0;

+ 4 - 4
osc_r.pd

@@ -2,11 +2,11 @@
 #X obj 43 97 spigot 1;
 #X text 141 140 (c)2011 Marian Weger;
 #X obj 129 55 inlet status_switch;
-#X obj 43 55 r /\$1/osc/in;
 #X obj 43 128 route \$2;
 #X obj 43 152 s \$2;
 #X text 33 14 osc_r <domain> <name>;
-#X connect 0 0 4 0;
+#X obj 43 55 r /osc/\$1/in;
+#X connect 0 0 3 0;
 #X connect 2 0 0 1;
-#X connect 3 0 0 0;
-#X connect 4 0 5 0;
+#X connect 3 0 4 0;
+#X connect 6 0 0 0;

+ 3 - 3
osc_s.pd

@@ -4,11 +4,11 @@
 #X obj 104 58 inlet status_switch;
 #X text 55 214 (c)2011 Marian Weger;
 #X obj 49 125 list prepend \$2;
-#X obj 49 182 s /\$1/osc/out;
 #X obj 49 58 r \$2;
 #X text 33 14 osc_s <domain> <name>;
-#X connect 0 0 5 0;
+#X obj 49 182 s /osc/\$1/out;
+#X connect 0 0 7 0;
 #X connect 1 0 4 0;
 #X connect 2 0 1 1;
 #X connect 4 0 0 0;
-#X connect 6 0 1 0;
+#X connect 5 0 1 0;

+ 11 - 11
schange.pd

@@ -1,18 +1,18 @@
 #N canvas 563 102 454 351 10;
-#X obj 116 56 inlet;
-#X obj 116 250 spigot 1;
-#X msg 187 214 0;
-#X obj 177 319 outlet;
+#X obj 116 66 inlet;
+#X obj 116 240 spigot 1;
+#X msg 187 204 0;
+#X obj 167 299 outlet;
 #X text 39 26 schange <init value>;
 #X text 258 30 [change] for symbols;
 #X text 36 313 (c)2012 Marian Weger;
-#X obj 116 138 t a a b;
-#X obj 177 292 t a a;
-#X msg 155 214 1;
-#X obj 187 190 sel init;
-#X obj 272 56 loadbang;
-#X obj 272 78 symbol \$1;
-#X obj 166 56 inlet set;
+#X obj 116 128 t a a b;
+#X obj 167 272 t a a;
+#X msg 155 204 1;
+#X obj 187 180 sel init;
+#X obj 249 94 loadbang;
+#X obj 232 128 symbol \$1;
+#X obj 232 66 inlet set;
 #X connect 0 0 7 0;
 #X connect 1 0 8 0;
 #X connect 2 0 1 1;