From 850a6ce7a6fd72dacda4ca6125c69b3fe765d058 Mon Sep 17 00:00:00 2001 From: porres Date: Tue, 28 Jan 2025 20:50:18 -0300 Subject: [PATCH] MERDA use more numbers from knobs instead of number boxes --- Abstractions/Merda/Modules/chorus.m~.pd | 2 +- Abstractions/Merda/Modules/delay.m~.pd | 88 ++++++--- Abstractions/Merda/Modules/lfo.m~.pd | 2 +- .../Merda/Modules/plate.rev.m~-help.pd | 7 +- Abstractions/Merda/Modules/plate.rev.m~.pd | 183 +++++++++++------- Abstractions/Merda/Modules/rm.m~-help.pd | 4 +- Abstractions/Merda/Modules/rm.m~.pd | 97 ++++++++-- Abstractions/Merda/Modules/sig.m~-help.pd | 4 +- Abstractions/Merda/Modules/sig.m~.pd | 134 ++++++++----- 9 files changed, 359 insertions(+), 162 deletions(-) diff --git a/Abstractions/Merda/Modules/chorus.m~.pd b/Abstractions/Merda/Modules/chorus.m~.pd index 9af5e969d..c416398cf 100644 --- a/Abstractions/Merda/Modules/chorus.m~.pd +++ b/Abstractions/Merda/Modules/chorus.m~.pd @@ -64,7 +64,7 @@ #X text 174 168 Depth; #X obj 136 121 else/note 118 24 Inter empty 5 54 54 54 0 187 187 187 1 1 CHORUS; #X coords 0 1 100 -1 177 137 1 111 111; -#X restore 208 154 graph; +#X restore 207 149 graph; #N canvas 210 278 359 294 route 0; #X obj 112 41 inlet; #X obj 112 199 s \$0-set-rate; diff --git a/Abstractions/Merda/Modules/delay.m~.pd b/Abstractions/Merda/Modules/delay.m~.pd index f66230eac..cd7db5db1 100644 --- a/Abstractions/Merda/Modules/delay.m~.pd +++ b/Abstractions/Merda/Modules/delay.m~.pd @@ -1,14 +1,12 @@ -#N canvas 393 50 678 680 12; +#N canvas 502 50 678 680 12; #N canvas 227 82 476 432 (subpatch) 0; #X obj 112 112 cnv 15 213 213 empty empty empty 20 12 0 14 #dbdbdb #373737 0; -#X floatatom 194 227 7 100 5000 0 - \$0-cutoff \$0-cutoff-number 12; #X obj 197 176 else/knob 41 100 5000 2 100 \$0-cutoff \$0-set-cutoff #dfdfdf #afafaf black 0 0 0 0 1 320 0 0 100 empty empty 0 8 0 0 0 0 0 0; #X obj 275 177 bng 23 250 50 0 \$0-clear \$0-set-clear empty 0 -10 0 12 #dfdfdf #000000 #000000; #X obj 130 274 else/knob 41 -2 2 0 0 \$0-fb \$0-set-fb #000000 #afafaf #ffffff 0 0 0 0 1 320 0 0 0 empty empty 0 8 0 0 0 0 0 0; #X text 194 157 Cutoff; -#X floatatom 127 227 7 100 5000 0 - \$0-time \$0-time-number 12; -#X obj 130 176 else/knob 41 10 5000 4 100 \$0-time \$0-set-time #000000 #dfdfdf #ffffff 0 0 0 0 1 320 0 0 10 empty empty 0 8 0 0 0 0 0 0; -#X text 135 157 Time; +#X obj 127 176 else/knob 41 10 5000 4 100 \$0-time \$0-set-time #000000 #dfdfdf #ffffff 0 0 0 0 1 320 0 0 10 empty empty 0 8 0 0 0 0 0 0; +#X text 132 157 Time; #X obj 197 274 else/knob 41 0 1 0 0 \$0-reson \$0-set-reson #dfdfdf #afafaf black 0 0 0 0 1 320 0 0 0 empty empty 0 0 0 0 0 0 0 0; #X obj 275 225 tgl 23 0 \$0-freeze \$0-set-freeze empty 17 7 0 10 #dfdfdf #000000 #000000 0 1; #X obj 265 274 else/knob 41 0 1 0 0.5 \$0-wet \$0-set-wet #9f9f9f #afafaf black 0 0 0 0 1 320 0 0 0 empty empty 0 8 0 0 0 0 0 0; @@ -18,6 +16,8 @@ #X text 198 254 Reson; #X text 120 254 FeedBack; #X obj 167 116 else/note 101 24 Inter empty 5 54 54 54 0 187 187 187 1 1 DELAY; +#X obj 117 227 else/note 64 12 Menlo \$0-time-label 0 0 0 0 0 255 255 255 0 1 125.7 ms; +#X obj 192 227 else/note 64 12 Menlo \$0-cutoff-label 0 0 0 175 0 255 255 255 0 1 452.7 Hz; #X coords 0 1 100 -1 215 215 1 111 111; #X restore 208 153 graph; #X obj 49 35 inlet~; @@ -73,25 +73,41 @@ #X connect 6 0 7 0; #X connect 7 0 1 1; #X restore 311 425 pd init-savestate; -#N canvas 555 291 614 348 GUI 0; -#X msg 349 99 reson \$1; -#X obj 81 62 r \$0-wet; -#X msg 81 99 wet \$1; -#X obj 160 218 s \$0-del; -#X msg 160 99 cutoff \$1; -#X obj 160 62 r \$0-cutoff; -#X obj 258 62 r \$0-clear; -#X msg 258 99 clear; -#X obj 349 62 r \$0-reson; -#X obj 441 62 r \$0-freeze; -#X msg 441 99 freeze \$1; -#X obj 160 188 else/insert all; -#X obj 300 176 r \$0-time-number; -#X msg 300 210 set \$1; -#X obj 300 239 s \$0-set-time; -#X msg 432 211 set \$1; -#X obj 432 177 r \$0-cutoff-number; -#X obj 432 240 s \$0-set-cutoff; +#N canvas 475 192 856 623 GUI 0; +#X msg 456 420 reson \$1; +#X obj 188 383 r \$0-wet; +#X msg 188 420 wet \$1; +#X obj 267 539 s \$0-del; +#X msg 267 420 cutoff \$1; +#X obj 267 383 r \$0-cutoff; +#X obj 365 383 r \$0-clear; +#X msg 365 420 clear; +#X obj 456 383 r \$0-reson; +#X obj 548 383 r \$0-freeze; +#X msg 548 420 freeze \$1; +#X obj 267 509 else/insert all; +#X obj 67 86 else/limit 100; +#X msg 196 156 color 0 0 \$1; +#X obj 196 124 * 175; +#X obj 209 97 loadbang; +#X obj 67 54 r \$0-time; +#X msg 67 156 set \$1 ms; +#X obj 196 63 r \$0-time-active; +#X obj 222 192 r \$0-time-typing; +#X msg 222 223 set \$1| ms; +#X obj 197 273 s \$0-time-label; +#X obj 67 120 else/format %.4g; +#X obj 437 100 else/limit 100; +#X msg 566 170 color 0 0 \$1; +#X obj 566 138 * 175; +#X obj 579 111 loadbang; +#X obj 437 134 else/format %.4g; +#X obj 437 68 r \$0-cutoff; +#X obj 566 77 r \$0-cutoff-active; +#X msg 437 170 set \$1 Hz; +#X msg 592 237 set \$1| Hz; +#X obj 567 287 s \$0-cutoff-label; +#X obj 592 206 r \$0-cutoff-typing; #X connect 0 0 11 0; #X connect 1 0 2 0; #X connect 2 0 11 0; @@ -103,10 +119,26 @@ #X connect 9 0 10 0; #X connect 10 0 11 0; #X connect 11 0 3 0; -#X connect 12 0 13 0; -#X connect 13 0 14 0; -#X connect 15 0 17 0; -#X connect 16 0 15 0; +#X connect 12 0 22 0; +#X connect 13 0 21 0; +#X connect 14 0 13 0; +#X connect 15 0 14 0; +#X connect 16 0 12 0; +#X connect 17 0 21 0; +#X connect 18 0 14 0; +#X connect 19 0 20 0; +#X connect 20 0 21 0; +#X connect 22 0 17 0; +#X connect 23 0 27 0; +#X connect 24 0 32 0; +#X connect 25 0 24 0; +#X connect 26 0 25 0; +#X connect 27 0 30 0; +#X connect 28 0 23 0; +#X connect 29 0 25 0; +#X connect 30 0 32 0; +#X connect 31 0 32 0; +#X connect 33 0 31 0; #X restore 309 458 pd GUI; #X obj 78 170 else/nchs~; #X obj 78 194 change; diff --git a/Abstractions/Merda/Modules/lfo.m~.pd b/Abstractions/Merda/Modules/lfo.m~.pd index a2f604419..243d14638 100644 --- a/Abstractions/Merda/Modules/lfo.m~.pd +++ b/Abstractions/Merda/Modules/lfo.m~.pd @@ -79,7 +79,7 @@ #X connect 10 0 8 0; #X restore 535 207 pd GUI; #X text 207 50 SYNC; -#N canvas 309 241 599 474 (subpatch) 1; +#N canvas 309 241 599 474 (subpatch) 0; #X obj 51 51 cnv 19 170 220 empty empty empty 20 12 0 12 #e0e0e0 #404040 0; #X obj 66 111 else/knob 45 0.1 20 1 0.1 \$0-hz \$0-set-hz #dfdfdf #7c7c7c black 0 0 0 0 1 320 0 0 0.1 empty empty 0 8 0 0 0 0 0 0; #X obj 274 204 tgl 22 0 \$0-soft \$0-soft-set empty 0 -10 0 12 #dfdfdf #000000 #000000 0 1; diff --git a/Abstractions/Merda/Modules/plate.rev.m~-help.pd b/Abstractions/Merda/Modules/plate.rev.m~-help.pd index 9fced0670..a060aab7b 100644 --- a/Abstractions/Merda/Modules/plate.rev.m~-help.pd +++ b/Abstractions/Merda/Modules/plate.rev.m~-help.pd @@ -41,7 +41,12 @@ #X obj 81 410 else/out~; #X obj 300 214 else/plate.rev~; #X obj 50 97 else/plate.rev.m~; -#A saved 50 0.5 0.25 0.75 0.5; +#A saved 15 0.25 0.75 0.5 0.25; +#A saved; +#A saved; +#A saved; +#A saved; +#A saved; #X obj 50 34 else/player~ bubul.wav 1 1; #X connect 4 0 7 0; #X connect 7 0 5 0; diff --git a/Abstractions/Merda/Modules/plate.rev.m~.pd b/Abstractions/Merda/Modules/plate.rev.m~.pd index 0d4d208fc..89dae9a38 100644 --- a/Abstractions/Merda/Modules/plate.rev.m~.pd +++ b/Abstractions/Merda/Modules/plate.rev.m~.pd @@ -1,25 +1,24 @@ -#N canvas 686 117 443 611 12; -#N canvas 1046 182 394 451 (subpatch) 0; +#N canvas 686 117 482 613 12; +#N canvas 1076 370 394 451 (subpatch) 0; #X obj 112 112 cnv 15 148 248 empty empty empty 20 12 0 14 #dbdbdb #373737 0; -#X obj 199 243 else/knob 41 0 1 0 0 \$0-cutoff \$0-set-cutoff #dfdfdf #afafaf black 0 0 0 0 1 320 0 0 0 empty empty 0 8 0 0 0 0 0 0; -#X obj 161 326 bng 23 250 50 0 \$0-clear \$0-set-clear empty 0 -10 0 12 #dfdfdf #000000 #000000; -#X obj 130 272 else/knob 41 0 1 0 0 \$0-damp \$0-set-damp #dfdfdf #bbbbbb #000000 0 0 0 0 1 320 0 0 0 empty empty 0 8 0 0 0 0 0 0; +#X obj 199 243 else/knob 41 0 1 0 0 \$0-rev \$0-set-cutoff #dfdfdf #afafaf black 0 0 0 0 1 320 0 0 0 cutoff \$0-cutoff 0 8 0 0 0 0 0 0; +#X obj 162 326 bng 23 250 50 0 \$0-clear \$0-set-clear empty 0 -10 0 12 #dfdfdf #000000 #000000; +#X obj 130 272 else/knob 41 0 1 0 0 \$0-rev \$0-set-damp #dfdfdf #bbbbbb #000000 0 0 0 0 1 320 0 0 0 damp \$0-damp 0 8 0 0 0 0 0 0; #X text 196 224 Cutoff; -#X floatatom 119 230 6 100 5000 0 - \$0-pre \$0-pre-number 12; -#X obj 129 179 else/knob 41 10 200 4 10 \$0-pre \$0-set-pre #dfdfdf #bbbbbb #000000 0 0 0 0 1 320 0 0 10 empty empty 0 8 0 0 0 0 0 0; -#X obj 196 179 else/knob 41 0 1 0 0 \$0-size \$0-set-size #dfdfdf #afafaf black 0 0 0 0 1 320 0 0 0 empty empty 0 0 0 0 0 0 0 0; -#X obj 199 308 else/knob 41 0 1 0 0.5 \$0-wet \$0-set-wet #9f9f9f #afafaf black 0 0 0 0 1 320 0 0 0 empty empty 0 8 0 0 0 0 0 0; +#X obj 129 179 else/knob 41 10 200 4 10 \$0-rev \$0-set-pre #dfdfdf #bbbbbb #000000 0 0 0 0 1 320 0 0 10 pre \$0-pre 0 8 0 0 0 0 0 0; +#X obj 196 179 else/knob 41 0 1 0 0 \$0-rev \$0-set-size #dfdfdf #afafaf black 0 0 0 0 1 320 0 0 0 size \$0-size 0 8 0 0 0 0 0 0; +#X obj 199 308 else/knob 41 0 1 0 0.5 \$0-rev \$0-set-wet #9f9f9f #afafaf black 0 0 0 0 1 320 0 0 0 wet \$0-wet 0 8 0 0 0 0 0 0; #X text 192 288 Dry/Wet; -#X text 122 329 Clear; +#X text 120 329 Clear; #X text 134 252 Damp; #X text 201 160 Size; -#X text 166 231 ms; #X text 117 160 Pre delay; #X obj 131 123 else/note 101 24 Inter empty 5 54 54 54 0 187 187 187 1 1 REVERB; +#X obj 119 229 else/note 65 12 Menlo \$0-pre-label 0 0 0 0 0 255 255 255 0 1 25 ms; #X coords 0 1 100 -1 150 250 1 111 111; #X restore 208 150 graph; -#X obj 49 35 inlet~; -#X obj 49 551 outlet~; +#X obj 119 35 inlet~; +#X obj 119 551 outlet~; #N canvas 243 43 499 411 preset 0; #X obj 125 121 else/sender 1 \\\$0-presets; #X msg 125 86 name \$1; @@ -52,16 +51,16 @@ #X connect 3 0 5 0; #X connect 4 0 1 0; #X connect 4 0 2 0; -#X restore 275 464 pd preset; -#N canvas 468 113 601 317 init-savestate 0; -#X obj 135 63 savestate; +#X restore 345 464 pd preset; +#N canvas 121 527 602 319 init-savestate 0; +#X obj 146 59 savestate; #X obj 49 125 list; #X obj 49 43 loadbang; -#X obj 195 95 else/var \$0-pre \$0-damp \$0-cutoff \$0-size \$0-wet; -#X obj 49 222 else/dispatch \$0-set-pre \$0-set-damp \$0-set-cutoff \$0-set-size \$0-set-wet, f 37; -#X obj 49 171 else/default 50 0.5 0.25 0.75 0.5; -#X obj 97 128 route list; -#X obj 97 103 list trim; +#X obj 206 91 else/var \$0-pre \$0-damp \$0-cutoff \$0-size \$0-wet; +#X obj 49 232 else/dispatch \$0-set-pre \$0-set-damp \$0-set-cutoff \$0-set-size \$0-set-wet, f 37; +#X obj 49 181 else/default 50 0.5 0.25 0.75 0.5; +#X obj 95 125 route list; +#X obj 95 98 list trim; #X connect 0 0 7 0; #X connect 0 1 3 0; #X connect 1 0 5 0; @@ -70,45 +69,93 @@ #X connect 5 0 4 0; #X connect 6 0 1 1; #X connect 7 0 6 0; -#X restore 217 431 pd init-savestate; -#N canvas 200 115 764 360 GUI 0; -#X obj 81 62 r \$0-wet; -#X msg 81 99 wet \$1; -#X msg 160 99 cutoff \$1; -#X obj 160 62 r \$0-cutoff; -#X obj 258 62 r \$0-clear; -#X msg 258 99 clear; -#X msg 494 222 set \$1; -#X obj 351 210 s \$0-rev; -#X obj 349 62 r \$0-pre; -#X msg 349 99 pre \$1; -#X obj 441 62 r \$0-damp; -#X msg 441 99 damp \$1; -#X obj 494 188 r \$0-pre-number; -#X obj 494 251 s \$0-set-pre; -#X msg 531 99 size \$1; -#X obj 531 62 r \$0-size; -#X connect 0 0 1 0; -#X connect 1 0 7 0; -#X connect 2 0 7 0; -#X connect 3 0 2 0; +#X restore 287 431 pd init-savestate; +#N canvas 200 115 521 361 GUI 0; +#X obj 46 145 r \$0-clear; +#X msg 46 182 clear; +#X obj 45 226 s \$0-rev; +#N canvas 613 247 522 359 format 0; +#N canvas 270 246 508 557 <1 0; +#X obj 151 32 inlet; +#X obj 152 90 list fromsymbol; +#X obj 184 181 else/slice -1; +#X obj 272 209 == 48; +#X obj 152 220 else/router; +#X obj 152 152 t l l; +#X obj 226 247 else/slice -1; +#X obj 152 308 equal 48 46; +#X obj 152 118 t l l, f 27; +#X obj 313 381 list; +#X obj 152 277 t l l, f 13; +#X obj 215 381 list; +#X obj 215 417 list tosymbol; +#X obj 152 336 sel 0 1; +#X obj 215 471 outlet; +#X obj 152 62 else/format %.2f; +#X connect 0 0 15 0; +#X connect 1 0 8 0; +#X connect 2 1 3 0; +#X connect 3 0 4 1; +#X connect 4 0 10 0; +#X connect 4 1 6 0; +#X connect 5 0 4 0; +#X connect 5 1 2 0; +#X connect 6 0 5 0; +#X connect 7 0 13 0; +#X connect 8 0 5 0; +#X connect 8 1 9 1; +#X connect 9 0 12 0; +#X connect 10 0 7 0; +#X connect 10 1 11 1; +#X connect 11 0 12 0; +#X connect 12 0 14 0; +#X connect 13 0 11 0; +#X connect 13 1 9 0; +#X connect 15 0 1 0; +#X restore 104 162 pd <1; +#X obj 105 54 inlet; +#X obj 158 252 outlet; +#X obj 105 91 sel 0; +#X msg 105 117 0; +#X obj 158 162 else/format %.3g; +#X obj 152 90 else/spread 0 1; +#X connect 0 0 2 0; +#X connect 1 0 3 0; +#X connect 3 0 4 0; +#X connect 3 1 6 0; #X connect 4 0 5 0; -#X connect 5 0 7 0; -#X connect 6 0 13 0; -#X connect 8 0 9 0; -#X connect 9 0 7 0; -#X connect 10 0 11 0; -#X connect 11 0 7 0; -#X connect 12 0 6 0; -#X connect 14 0 7 0; -#X connect 15 0 14 0; -#X restore 215 464 pd GUI; -#X obj 78 170 else/nchs~; -#X obj 78 194 change; -#X msg 78 218 resize \$1; +#X connect 5 0 2 0; +#X connect 6 1 0 0; +#X connect 6 2 5 0; +#X restore 185 127 pd format; +#X obj 185 93 else/limit 100; +#X msg 314 163 color 0 0 \$1; +#X obj 314 131 * 175; +#X obj 327 104 loadbang; +#X msg 185 163 set \$1 ms; +#X msg 340 230 set \$1| ms; +#X obj 314 70 r \$0-pre-active; +#X obj 340 199 r \$0-pre-typing; +#X obj 315 280 s \$0-pre-label; +#X obj 185 31 r \$0-rev; +#X obj 185 55 route pre; +#X connect 0 0 1 0; +#X connect 1 0 2 0; +#X connect 3 0 8 0; +#X connect 4 0 3 0; +#X connect 5 0 12 0; +#X connect 6 0 5 0; +#X connect 7 0 6 0; +#X connect 8 0 12 0; +#X connect 9 0 12 0; +#X connect 10 0 6 0; +#X connect 11 0 9 0; +#X connect 13 0 14 0; +#X connect 14 0 4 0; +#X restore 285 464 pd GUI; #X text 201 129 IN; -#X obj 151 553 outlet~; -#X obj 99 404 r \$0-rev; +#X obj 221 553 outlet~; +#X obj 150 439 r \$0-rev; #N canvas 286 281 332 314 route 0; #X obj 70 26 inlet; #X obj 110 238 s \$0-set-pre; @@ -125,8 +172,8 @@ #X connect 7 3 4 0; #X connect 7 4 5 0; #X connect 7 5 6 0; -#X restore 88 72 pd route; -#X obj 49 495 else/plate.rev~; +#X restore 158 72 pd route; +#X obj 119 495 else/plate.rev~; #N canvas 476 254 251 248 MIDI-learn 0; #N canvas 776 312 577 472 pre-knob 0; #X msg 114 218 forget; @@ -298,14 +345,10 @@ #X connect 12 0 3 0; #X connect 13 0 14 0; #X restore 52 148 pd damp-knob; -#X restore 230 496 pd MIDI-learn; -#X connect 1 0 6 0; -#X connect 1 0 13 0; -#X connect 1 1 12 0; -#X connect 6 0 7 0; -#X connect 7 0 8 0; -#X connect 8 0 13 0; -#X connect 11 0 13 0; -#X connect 13 0 2 0; -#X connect 13 1 10 0; +#X restore 300 496 pd MIDI-learn; +#X connect 1 0 10 0; +#X connect 1 1 9 0; +#X connect 8 0 10 0; +#X connect 10 0 2 0; +#X connect 10 1 7 0; #X coords 0 1 100 -1 167 284 2 200 125; diff --git a/Abstractions/Merda/Modules/rm.m~-help.pd b/Abstractions/Merda/Modules/rm.m~-help.pd index 706d0142e..9760aafde 100644 --- a/Abstractions/Merda/Modules/rm.m~-help.pd +++ b/Abstractions/Merda/Modules/rm.m~-help.pd @@ -13,7 +13,9 @@ #X obj 91 41 osc~ 440; #X obj 91 209 else/rm.m~; #A saved 20 0; -#X obj 91 483 else/out~; +#A saved; +#A saved; +#X obj 91 471 else/out~; #X obj 313 261 else/rm~; #X connect 4 0 5 0; #X connect 5 0 6 0; diff --git a/Abstractions/Merda/Modules/rm.m~.pd b/Abstractions/Merda/Modules/rm.m~.pd index d0d97d924..36df5b004 100644 --- a/Abstractions/Merda/Modules/rm.m~.pd +++ b/Abstractions/Merda/Modules/rm.m~.pd @@ -52,24 +52,95 @@ #X connect 6 0 4 1; #X connect 7 0 6 0; #X restore 225 412 pd init-savestate; -#N canvas 200 115 347 203 GUI 0; -#X msg 124 95 set \$1; -#X obj 124 61 r \$0-hz-number; -#X obj 124 124 s \$0-set-hz; +#N canvas 676 101 568 428 GUI 0; +#N canvas 613 247 522 359 format 0; +#N canvas 270 246 508 557 <1 0; +#X obj 151 32 inlet; +#X obj 152 90 list fromsymbol; +#X obj 184 181 else/slice -1; +#X obj 272 209 == 48; +#X obj 152 220 else/router; +#X obj 152 152 t l l; +#X obj 226 247 else/slice -1; +#X obj 152 308 equal 48 46; +#X obj 152 118 t l l, f 27; +#X obj 313 381 list; +#X obj 152 277 t l l, f 13; +#X obj 215 381 list; +#X obj 215 417 list tosymbol; +#X obj 152 336 sel 0 1; +#X obj 215 471 outlet; +#X obj 152 62 else/format %.2f; +#X connect 0 0 15 0; +#X connect 1 0 8 0; +#X connect 2 1 3 0; +#X connect 3 0 4 1; +#X connect 4 0 10 0; +#X connect 4 1 6 0; +#X connect 5 0 4 0; +#X connect 5 1 2 0; +#X connect 6 0 5 0; +#X connect 7 0 13 0; +#X connect 8 0 5 0; +#X connect 8 1 9 1; +#X connect 9 0 12 0; +#X connect 10 0 7 0; +#X connect 10 1 11 1; +#X connect 11 0 12 0; +#X connect 12 0 14 0; +#X connect 13 0 11 0; +#X connect 13 1 9 0; +#X connect 15 0 1 0; +#X restore 104 162 pd <1; +#X obj 105 54 inlet; +#X obj 158 252 outlet; +#X obj 105 91 sel 0; +#X msg 105 117 0; +#X obj 158 162 else/format %.3g; +#X obj 152 90 else/spread 0 1 100; +#X obj 287 161 else/format %.4g; #X connect 0 0 2 0; +#X connect 1 0 3 0; +#X connect 3 0 4 0; +#X connect 3 1 6 0; +#X connect 4 0 5 0; +#X connect 5 0 2 0; +#X connect 6 1 0 0; +#X connect 6 2 5 0; +#X connect 6 3 7 0; +#X connect 7 0 2 0; +#X restore 114 116 pd format; +#X obj 114 82 else/limit 100; +#X msg 243 152 color 0 0 \$1; +#X obj 243 120 * 175; +#X obj 256 93 loadbang; +#X obj 114 50 r \$0-hz; +#X obj 243 59 r \$0-hz-active; +#X obj 269 188 r \$0-hz-typing; +#X obj 244 269 s \$0-hz-label; +#X msg 269 219 set \$1| Hz; +#X msg 114 152 set \$1 Hz; +#X connect 0 0 10 0; #X connect 1 0 0 0; +#X connect 2 0 8 0; +#X connect 3 0 2 0; +#X connect 4 0 3 0; +#X connect 5 0 1 0; +#X connect 6 0 3 0; +#X connect 7 0 9 0; +#X connect 9 0 8 0; +#X connect 10 0 8 0; #X restore 223 445 pd GUI; #X text 250 125 IN; #N canvas 227 82 394 451 (subpatch) 0; -#X obj 112 112 cnv 15 82 225 empty empty empty 20 12 0 14 #dbdbdb #373737 0; -#X obj 129 177 else/knob 50 20 2000 1 20 \$0-hz \$0-set-hz #dfdfdf #bbbbbb #000000 0 0 0 0 1 320 0 0 20 empty empty 0 0 0 0 0 0 0 0; -#X text 145 231 Hz; -#X floatatom 129 250 7 0 0 0 - \$0-hz \$0-hz-number 12; -#X obj 136 278 knob 40 -1 1 0 0 \$0-att \$0-set-att #202020 #7c7c7c #ff0400 0 0 0 0 1 320 0 0 0 empty empty 0 0 0 0 0 0 0 0; -#X text 142 318 Att.; +#X obj 112 112 cnv 15 82 210 empty empty empty 20 12 0 14 #dbdbdb #373737 0; +#X obj 129 176 else/knob 50 20 2000 1 20 \$0-hz \$0-set-hz #dfdfdf #bbbbbb #000000 0 0 0 0 1 320 0 0 20 empty empty 0 0 0 0 0 0 0 0; +#X obj 136 261 knob 40 -1 1 0 0 \$0-att \$0-set-att #202020 #7c7c7c #ff0400 0 0 0 0 1 320 0 0 0 empty empty 0 0 0 0 0 0 0 0; +#X text 142 301 Att.; #X obj 121 120 else/note 62 18 Inter empty 5 54 54 54 0 187 187 187 1 1 RING MOD; -#X coords 0 1 100 -1 84 227 1 111 111; -#X restore 256 147 graph; +#X obj 123 233 else/note 62 12 Menlo \$0-hz-label 0 0 0 0 0 255 255 255 0 1 20 Hz; +#X coords 0 1 100 -1 84 212 1 111 111; +#X restore 256 146 graph; #X obj 124 330 r \$0-hz; #X obj 106 35 inlet~; #X text 329 125 CV; @@ -172,4 +243,4 @@ #X connect 16 0 1 0; #X connect 17 0 10 1; #X connect 18 0 15 0; -#X coords 0 1 100 -1 97 257 2 250 125; +#X coords 0 1 100 -1 98 241 2 250 125; diff --git a/Abstractions/Merda/Modules/sig.m~-help.pd b/Abstractions/Merda/Modules/sig.m~-help.pd index b93c57ea0..2ce724211 100644 --- a/Abstractions/Merda/Modules/sig.m~-help.pd +++ b/Abstractions/Merda/Modules/sig.m~-help.pd @@ -1,11 +1,11 @@ -#N canvas 474 56 423 398 12; +#N canvas 602 85 423 398 12; #X text 212 195 see -->; #X text 200 138 A signal generator.; #X obj 272 195 about.MERDA; #X obj 63 28 else/knob 40 -1 1 0 0 \$0-sig \$0-set-sig #000000 #404040 #ffffff 1 0 0 0 1 320 0 0 0 empty empty 0 0 0 0 0 0 0 0; #X msg 63 83 set \$1; #X obj 63 113 else/sig.m~; -#A saved 0; +#A saved -1; #A saved; #X obj 63 315 else/numbox~ 6 12 100 #C0C0C4 #440008 10 0 0 0; #X obj 245 237 else/setdsp~; diff --git a/Abstractions/Merda/Modules/sig.m~.pd b/Abstractions/Merda/Modules/sig.m~.pd index 7cffdbdfb..b2731eb4b 100644 --- a/Abstractions/Merda/Modules/sig.m~.pd +++ b/Abstractions/Merda/Modules/sig.m~.pd @@ -49,48 +49,13 @@ #X connect 4 0 0 0; #X connect 6 0 1 1; #X restore 37 154 pd init-savestate; -#N canvas 238 198 628 377 GUI 0; -#X msg 123 147 set \$1; -#X obj 123 109 r \$0-sig; -#X obj 123 187 s \$0-set-sig; -#X obj 295 61 r \$0-sig-learn; -#X obj 331 133 savestate; -#X obj 295 98 else/midi.learn; -#A saved; -#A saved ctlin 15 12; -#X obj 295 310 s \$0-set-sig; -#X obj 416 133 list prepend teach; -#X obj 391 163 list; -#X obj 331 233 list trim; -#X obj 331 191 else/routeall teach, f 13; -#X obj 440 234 s \$0-patch; -#X msg 440 204 dirty 1; -#X obj 440 163 else/changed; -#X obj 295 278 else/rescale -1 1; -#X connect 0 0 2 0; -#X connect 1 0 0 0; -#X connect 3 0 5 0; -#X connect 4 0 10 0; -#X connect 4 1 8 0; -#X connect 5 0 14 0; -#X connect 5 1 7 0; -#X connect 7 0 8 1; -#X connect 7 0 13 0; -#X connect 8 0 4 0; -#X connect 9 0 5 0; -#X connect 10 0 9 0; -#X connect 10 0 13 1; -#X connect 12 0 11 0; -#X connect 13 0 12 0; -#X connect 14 0 6 0; -#X restore 35 187 pd GUI; -#N canvas 561 130 302 415 (subpatch) 0; -#X obj 112 112 cnv 15 90 155 empty empty empty 20 12 0 14 #dbdbdb #373737 0; -#X obj 126 155 else/knob 60 -1 1 0 0 \$0-sig \$0-set-sig #000000 #404040 #ffffff 0 0 0 0 1 320 0 0 0 empty empty 0 0 0 0 0 0 0 0; -#X floatatom 127 227 6 0 1 0 - \$0-sig \$0-sig-nbx 16; +#N canvas 350 298 302 415 (subpatch) 0; +#X obj 112 112 cnv 15 90 135 empty empty empty 20 12 0 14 #dbdbdb #373737 0; +#X obj 126 155 else/knob 60 -1 1 0 0 \$0-sig \$0-set-sig #000000 #404040 #ffffff 0 0 0 0 1 320 0 0 0 empty empty 0 14 0 50 0 0 0 0; #X obj 125 121 else/note 62 18 Inter empty 5 54 54 54 0 187 187 187 1 1 SIG; -#X coords 0 1 100 -1 92 157 1 111 111; -#X restore 209 135 graph; +#X obj 124 224 else/note 62 14 Menlo \$0-sig-label 0 0 0 0 0 255 255 255 0 1 -1; +#X coords 0 1 100 -1 92 137 1 111 111; +#X restore 209 134 graph; #X obj 65 264 r \$0-sig; #X obj 65 297 else/f2s~; #X obj 75 27 inlet; @@ -132,8 +97,87 @@ #X connect 13 0 14 0; #X restore 52 67 pd hz-sig; #X restore 46 220 pd MIDI-learn; -#X connect 5 0 6 0; -#X connect 6 0 0 0; +#N canvas 639 209 568 428 GUI 0; +#N canvas 613 247 314 348 format 0; +#N canvas 270 246 508 557 <1 0; +#X obj 151 32 inlet; +#X obj 152 90 list fromsymbol; +#X obj 184 181 else/slice -1; +#X obj 272 209 == 48; +#X obj 152 220 else/router; +#X obj 152 152 t l l; +#X obj 226 247 else/slice -1; +#X obj 152 308 equal 48 46; +#X obj 152 118 t l l, f 27; +#X obj 313 381 list; +#X obj 152 277 t l l, f 13; +#X obj 215 381 list; +#X obj 215 417 list tosymbol; +#X obj 152 336 sel 0 1; +#X obj 215 471 outlet; +#X obj 152 62 else/format %\ .2f; +#X connect 0 0 15 0; +#X connect 1 0 8 0; +#X connect 2 1 3 0; +#X connect 3 0 4 1; +#X connect 4 0 10 0; +#X connect 4 1 6 0; +#X connect 5 0 4 0; +#X connect 5 1 2 0; +#X connect 6 0 5 0; +#X connect 7 0 13 0; +#X connect 8 0 5 0; +#X connect 8 1 9 1; +#X connect 9 0 12 0; +#X connect 10 0 7 0; +#X connect 10 1 11 1; +#X connect 11 0 12 0; +#X connect 12 0 14 0; +#X connect 13 0 11 0; +#X connect 13 1 9 0; +#X connect 15 0 1 0; +#X restore 211 162 pd <1; +#X obj 70 59 inlet; +#X obj 158 252 outlet; +#X msg 70 122 0; +#X obj 71 162 else/format %g; +#X obj 70 96 sel 0 -1 1, f 16; +#X msg 100 121 -1; +#X msg 132 122 1; +#X connect 0 0 2 0; +#X connect 1 0 5 0; +#X connect 3 0 4 0; +#X connect 4 0 2 0; +#X connect 5 0 3 0; +#X connect 5 1 6 0; +#X connect 5 2 7 0; +#X connect 5 3 0 0; +#X connect 6 0 4 0; +#X connect 7 0 4 0; +#X restore 114 116 pd format; +#X obj 114 82 else/limit 100; +#X msg 243 152 color 0 0 \$1; +#X obj 243 120 * 175; +#X obj 256 93 loadbang; +#X obj 114 50 r \$0-sig; +#X obj 243 59 r \$0-sig-active; +#X obj 269 188 r \$0-sig-typing; +#X msg 269 219 set \$1|; +#X msg 114 152 set \$1; +#X obj 244 269 s \$0-sig-label; +#X connect 0 0 9 0; +#X connect 1 0 0 0; +#X connect 2 0 10 0; +#X connect 3 0 2 0; +#X connect 4 0 3 0; +#X connect 5 0 1 0; +#X connect 6 0 3 0; #X connect 7 0 8 0; -#X connect 8 0 9 0; -#X coords 0 1 100 -1 112 177 2 200 125; +#X connect 8 0 10 0; +#X connect 9 0 10 0; +#X restore 38 186 pd GUI; +#X connect 4 0 5 0; +#X connect 5 0 0 0; +#X connect 6 0 7 0; +#X connect 7 0 8 0; +#X coords 0 1 100 -1 112 156 2 200 125;