Browse Source

bugfix midi

m---w 12 years ago
parent
commit
ccda10d779
5 changed files with 111 additions and 58 deletions
  1. 10 9
      midi-help.pd
  2. 14 0
      midi_bi.pd
  3. 23 10
      midi_r.pd
  4. 31 20
      midi_s.pd
  5. 33 19
      osc2midi.pd

+ 10 - 9
midi-help.pd

@@ -83,10 +83,6 @@ window.;
 input);
 #X text 273 380 The graphical user interface provides debugging controls:
 ;
-#X text 273 300 [midi_out] provides MIDI output for the given domain
-(1st creation argument). It supports most midi message formats \, like
-control change \, note \, pitchbend \, etc. The first inlet takes midi
-messages and routes them to the right midi output.;
 #X text 273 410 "print" will print all outgoing midi messages.;
 #X text 273 430 "active" turns midi-out functionality on/off.;
 #X text 273 243 "active" turns midi-in functionality on/off.;
@@ -123,7 +119,7 @@ messages and routes them to the right midi output.;
 #X obj 530 903 hsl 128 15 1 105 0 0 /i/send/midi /i/send/midi /i/send/midi
 -2 -8 0 10 -262144 -1 -1 0 1;
 #X obj 667 904 nbx 5 14 -1e+37 1e+37 0 0 /i/send/midi /i/send/midi
-/i/send/midi 0 -8 0 10 -262144 -1 -1 1 256;
+/i/send/midi 0 -8 0 10 -262144 -1 -1 0 256;
 #X text 60 861 |;
 #X text 60 881 |;
 #X text 60 891 |;
@@ -251,7 +247,7 @@ input channel ("/<domain>/midi/in") \, output channel ("/<domain>/midi/out")
 #X obj 586 1038 hsl 128 15 5 130 0 0 /i/receive/midi /i/receive/midi
 /i/receive/midi -2 -8 0 10 -262144 -1 -1 0 1;
 #X obj 723 1039 nbx 5 14 -1e+37 1e+37 0 0 /i/receive/midi /i/receive/midi
-/i/receive/midi 0 -8 0 10 -262144 -1 -1 5 256;
+/i/receive/midi 0 -8 0 10 -262144 -1 -1 0 256;
 #X text 465 863 Turn on "print" in [midi_out_gui] above and play with
 this slider:;
 #X text 469 983 Turn on "print" in [midi_in_gui] and try to generate
@@ -338,7 +334,7 @@ between 0 and 127;
 #X obj 600 1249 hsl 128 15 -50 50 0 0 /i/do/both /i/do/both /i/do/both
 -2 -8 0 10 -262144 -1 -1 0 1;
 #X obj 737 1250 nbx 5 14 -1e+37 1e+37 0 0 /i/do/both /i/do/both /i/do/both
-0 -8 0 10 -262144 -1 -1 -50 256;
+0 -8 0 10 -262144 -1 -1 0 256;
 #X text 505 1176 Combination of [midi_s] and [midi_r] with feedback
 prevention.;
 #X text 468 956 Works just like [midi_s] \, but in opposite direction.
@@ -354,9 +350,9 @@ or bidirectional \, according to the OSC settings.;
 #X obj 430 1419 hsl 128 15 3 10 0 0 /i/map/osc/to/midi /i/map/osc/to/midi
 /i/map/osc/to/midi -2 -8 0 10 -262144 -1 -1 0 1;
 #X obj 567 1420 nbx 5 14 -1e+37 1e+37 0 0 /i/map/osc/to/midi /i/map/osc/to/midi
-/i/map/osc/to/midi 0 -8 0 10 -262144 -1 -1 3 256;
+/i/map/osc/to/midi 0 -8 0 10 -262144 -1 -1 0 256;
 #X text 297 1120 1st inlet: turn module on(1)/off(0);
-#X text 286 1349;
+#X text 286 1349 comment;
 #X text 286 1329 1st inlet: midi-out on(1)/off(0) \,;
 #X text 488 1329 2nd inlet: midi-in on(1)/off(0).;
 #X text 247 911 1st inlet: turn module on(1)/off(0);
@@ -370,4 +366,9 @@ or bidirectional \, according to the OSC settings.;
 #X text 658 1269 (-50...50);
 #X text 621 1058 (5...130);
 #X text 561 919 (1...105);
+#X text 273 300 [midi_out] provides MIDI output for the given domain
+(1st creation argument). It supports most midi message formats \, like
+control change \, note \, pitchbend \, etc. "/<domain>/midi/out" or
+the first inlet takes midi messages and routes them to the right midi
+output.;
 #X coords 0 756 1 755 85 60 0;

+ 14 - 0
midi_bi.pd

@@ -60,6 +60,12 @@
 #X obj 326 209 r \$0-channel;
 #X obj 37 527 s /\$1/midi/out;
 #X obj 37 220 route float;
+#X obj 194 158 loadbang;
+#X obj 194 180 symbol \$3;
+#X msg 194 224 16383;
+#X msg 239 224 127;
+#X obj 194 202 sel bend;
+#X obj 194 246 t f;
 #X connect 1 0 27 0;
 #X connect 2 0 35 0;
 #X connect 3 0 1 0;
@@ -97,3 +103,11 @@
 #X connect 35 0 25 0;
 #X connect 36 0 35 1;
 #X connect 38 0 19 0;
+#X connect 39 0 40 0;
+#X connect 40 0 43 0;
+#X connect 41 0 44 0;
+#X connect 42 0 44 0;
+#X connect 43 0 41 0;
+#X connect 43 1 42 0;
+#X connect 44 0 16 1;
+#X connect 44 0 29 1;

+ 23 - 10
midi_r.pd

@@ -1,5 +1,5 @@
-#N canvas 24 22 456 615 10;
-#X text 200 515 (c)2011 \, Marian Weger;
+#N canvas 24 22 426 658 10;
+#X text 200 602 (c)2011 \, Marian Weger;
 #X text 33 14 midi_r: <domain> <name> <type> <cc#/note#/prg#/...> <ch#>
 <scaling> <offset> <interpol.time> <grain rate>;
 #X obj 91 141 spigot 1;
@@ -27,19 +27,25 @@
 #X connect 7 1 8 0;
 #X connect 9 0 7 0;
 #X restore 279 193 pd init;
-#X obj 91 338 * 1;
-#X obj 91 289 / 127;
+#X obj 91 455 * 1;
+#X obj 91 406 / 127;
 #X obj 204 94 inlet in-state;
-#X obj 91 382 kdemux2 \$8;
-#X obj 148 409 pack f \$8;
-#X obj 148 437 line 0 \$9;
+#X obj 91 499 kdemux2 \$8;
+#X obj 148 526 pack f \$8;
+#X obj 148 554 line 0 \$9;
 #X obj 91 267 route \$4;
-#X obj 106 313 r \$0-scaling;
+#X obj 106 430 r \$0-scaling;
 #X obj 91 171 route \$3;
-#X obj 91 360 + \$7;
-#X obj 91 498 s \$2;
+#X obj 91 477 + \$7;
+#X obj 91 585 s \$2;
 #X obj 91 245 route 1;
 #X obj 130 224 r \$0-channel;
+#X obj 118 293 loadbang;
+#X obj 118 315 symbol \$3;
+#X msg 118 359 16383;
+#X msg 163 359 127;
+#X obj 118 337 sel bend;
+#X obj 118 381 t f;
 #X connect 2 0 14 0;
 #X connect 3 0 17 0;
 #X connect 4 0 2 0;
@@ -56,3 +62,10 @@
 #X connect 15 0 9 0;
 #X connect 17 0 12 0;
 #X connect 18 0 17 1;
+#X connect 19 0 20 0;
+#X connect 20 0 23 0;
+#X connect 21 0 24 0;
+#X connect 22 0 24 0;
+#X connect 23 0 21 0;
+#X connect 23 1 22 0;
+#X connect 24 0 7 1;

+ 31 - 20
midi_s.pd

@@ -5,13 +5,12 @@
 #X obj 37 80 r \$2;
 #X obj 37 360 + 0.5;
 #X obj 37 380 int;
-#X obj 37 218 spigot 1;
-#X obj 37 306 / 1;
+#X obj 37 256 / 1;
 #X obj 37 328 * 127;
 #X obj 155 80 inlet out-state;
 #X obj 37 102 route float;
-#X obj 37 254 - \$7;
-#X obj 52 282 r \$0-scaling;
+#X obj 37 204 - \$7;
+#X obj 52 232 r \$0-scaling;
 #X obj 37 433 list append \$4;
 #X obj 37 401 list prepend \$3;
 #X text 249 472 (c)2011 \, Marian Weger;
@@ -38,22 +37,34 @@
 #X connect 7 0 6 0;
 #X connect 7 1 8 0;
 #X connect 9 0 7 0;
-#X restore 279 193 pd init;
+#X restore 315 183 pd init;
 #X obj 37 485 list append 1;
 #X obj 112 463 r \$0-channel;
-#X connect 1 0 5 0;
-#X connect 2 0 9 0;
+#X obj 194 158 loadbang;
+#X obj 194 180 symbol \$3;
+#X msg 194 224 16383;
+#X msg 239 224 127;
+#X obj 194 202 sel bend;
+#X obj 194 246 t f;
+#X connect 1 0 9 0;
+#X connect 2 0 8 0;
 #X connect 3 0 4 0;
-#X connect 4 0 13 0;
-#X connect 5 0 10 0;
-#X connect 6 0 7 0;
-#X connect 7 0 3 0;
-#X connect 8 0 1 1;
-#X connect 9 0 1 0;
-#X connect 10 0 6 0;
-#X connect 11 0 6 1;
-#X connect 12 0 18 0;
-#X connect 13 0 12 0;
-#X connect 16 0 15 0;
-#X connect 18 0 16 0;
-#X connect 19 0 18 1;
+#X connect 4 0 12 0;
+#X connect 5 0 6 0;
+#X connect 6 0 3 0;
+#X connect 7 0 1 1;
+#X connect 8 0 1 0;
+#X connect 9 0 5 0;
+#X connect 10 0 5 1;
+#X connect 11 0 17 0;
+#X connect 12 0 11 0;
+#X connect 15 0 14 0;
+#X connect 17 0 15 0;
+#X connect 18 0 17 1;
+#X connect 19 0 20 0;
+#X connect 20 0 23 0;
+#X connect 21 0 24 0;
+#X connect 22 0 24 0;
+#X connect 23 0 21 0;
+#X connect 23 1 22 0;
+#X connect 24 0 6 1;

+ 33 - 19
osc2midi.pd

@@ -6,33 +6,33 @@
 #X obj 365 80 inlet in-state;
 #X obj 37 202 route float;
 #X text 434 294 (c)2012 \, Marian Weger;
-#X obj 277 528 s /\$1/osc/in;
+#X obj 277 558 s /\$1/osc/in;
 #X obj 37 169 route \$2;
 #X text 23 14 osc2midi <domain> <osc-name> <midi-type> <cc#/note#/prg#/...>
 <ch#> <scaling> <offset> <interpol.time> <grain rate>;
 #X obj 37 80 r /\$1/osc/out;
-#X obj 37 340 + 0.5;
-#X obj 37 360 int;
+#X obj 37 370 + 0.5;
+#X obj 37 390 int;
 #X obj 37 286 / 1;
-#X obj 37 308 * 127;
+#X obj 37 338 * 127;
 #X obj 37 234 - \$7;
 #X obj 52 262 r \$0-scaling;
-#X obj 37 413 list append \$4;
-#X obj 37 381 list prepend \$3;
-#X obj 37 487 list trim;
-#X obj 37 465 list append 1;
-#X obj 112 442 r \$0-channel;
-#X obj 37 507 s /\$1/midi/out;
+#X obj 37 443 list append \$4;
+#X obj 37 411 list prepend \$3;
+#X obj 37 517 list trim;
+#X obj 37 495 list append 1;
+#X obj 112 472 r \$0-channel;
+#X obj 37 537 s /\$1/midi/out;
 #X msg 277 172 \$3 \$2 \$1;
-#X obj 277 317 * 1;
-#X obj 277 268 / 127;
-#X obj 277 361 kdemux2 \$8;
-#X obj 334 388 pack f \$8;
-#X obj 334 416 line 0 \$9;
+#X obj 277 347 * 1;
+#X obj 277 298 / 127;
+#X obj 277 391 kdemux2 \$8;
+#X obj 334 418 pack f \$8;
+#X obj 334 446 line 0 \$9;
 #X obj 277 246 route \$4;
-#X obj 292 292 r \$0-scaling;
+#X obj 292 322 r \$0-scaling;
 #X obj 277 150 route \$3;
-#X obj 277 339 + \$7;
+#X obj 277 369 + \$7;
 #N canvas 499 22 270 248 init 0;
 #X obj 63 49 loadbang;
 #X msg 63 115 1;
@@ -57,8 +57,14 @@
 #X restore 479 186 pd init;
 #X obj 277 224 route 1;
 #X obj 316 202 r \$0-channel;
-#X obj 277 477 list prepend \$2;
-#X obj 277 499 list trim;
+#X obj 277 507 list prepend \$2;
+#X obj 277 529 list trim;
+#X obj 194 158 loadbang;
+#X obj 194 180 symbol \$3;
+#X msg 194 224 16383;
+#X msg 239 224 127;
+#X obj 194 202 sel bend;
+#X obj 194 246 t f;
 #X connect 0 0 31 0;
 #X connect 1 0 0 0;
 #X connect 2 0 8 0;
@@ -93,3 +99,11 @@
 #X connect 35 0 34 1;
 #X connect 36 0 37 0;
 #X connect 37 0 7 0;
+#X connect 38 0 39 0;
+#X connect 39 0 42 0;
+#X connect 40 0 43 0;
+#X connect 41 0 43 0;
+#X connect 42 0 40 0;
+#X connect 42 1 41 0;
+#X connect 43 0 14 1;
+#X connect 43 0 25 1;