# HG changeset patch # User Giulio Moro # Date 1460150804 -3600 # Node ID a0a7f00cf98df25d19936c3f856bb69394fd9ce9 # Parent 97f5219429b3131d7a629ebe88ac1c607ed08e7d Fixed midi-heavy: stray [spigot] diff -r 97f5219429b3 -r a0a7f00cf98d core/Midi.cpp --- a/core/Midi.cpp Fri Apr 01 05:04:13 2016 +0100 +++ b/core/Midi.cpp Fri Apr 08 22:26:44 2016 +0100 @@ -173,10 +173,9 @@ objAddrs[kMidiInput].push_back(this); inputPort = open("/dev/midi1", O_RDONLY | O_NONBLOCK | O_NOCTTY); if(inputPort < 0){ - printf("Error occurred while opening midi input port %d: %d", port, inputPort); return -1; } else { - printf("Reading from port %d\n", port); + printf("Reading from Midi port %d\n", port); BeagleRT_scheduleAuxiliaryTask(midiInputTask); return 1; } @@ -186,7 +185,6 @@ objAddrs[kMidiOutput].push_back(this); outputPort = open("/dev/midi1", O_WRONLY, 0); if(outputPort < 0){ - printf("Error occurred while opening midi output port %d: %d", port, outputPort); return -1; } else { printf("Writing to Midi port %d\n", port); diff -r 97f5219429b3 -r a0a7f00cf98d projects/heavy/pd/hello-midi/_main.pd --- a/projects/heavy/pd/hello-midi/_main.pd Fri Apr 01 05:04:13 2016 +0100 +++ b/projects/heavy/pd/hello-midi/_main.pd Fri Apr 08 22:26:44 2016 +0100 @@ -1,4 +1,4 @@ -#N canvas 94 174 1280 685 10; +#N canvas 85 58 1280 685 10; #X obj 19 396 dac~ 1 2; #X text 39 1 Hello world!; #X text 37 11 ============; @@ -7,11 +7,9 @@ #X text 202 438 @krighxz / BELA / heavy / 12/2015; #X text 226 457 beaglert.cc / enzienaudio.com; #X obj 39 132 mtof; -#X text 140 29 <== the heavy equivalent of ==>; -#X obj 334 24 notein; -#X floatatom 79 59 5 0 0 0 - - -, f 5; -#X floatatom 122 59 5 0 0 0 - - -, f 5; -#X floatatom 41 63 5 0 0 0 - - -, f 5; +#X floatatom 79 59 5 0 0 0 - - -; +#X floatatom 122 59 5 0 0 0 - - -; +#X floatatom 41 63 5 0 0 0 - - -; #X obj 26 170 phasor~ 440; #X text 100 363 (the harsh sound of success); #X obj 260 83 * 20; @@ -19,18 +17,12 @@ #X obj 132 85 loadbang; #X msg 131 111 1000; #X obj 125 166 sig~; -#X text 483 121 <== the heavy equivalent of ==>; -#X text 349 57 <== the heavy equivalent of ==>; -#X text 682 122 [pgmin]; +#X text 673 121 [pgmin]; #X obj 218 178 * 10; #X obj 30 250 hip~; #X obj 26 275 hip~; #X obj 20 302 hip~; #X obj 19 323 hip~; -#X obj 40 28 hv_notein 0; -#X obj 408 122 hv_pgmin 3; -#X obj 260 60 hv_ctlin 5 0; -#X obj 220 151 hv_ctlin 6 0; #X obj 87 192 lop~ 4; #X obj 152 256 line; #X obj 200 200 + 50; @@ -38,43 +30,50 @@ #X msg 93 114 0; #X msg 185 112 0; #X obj 29 224 vcf~ 4; -#X obj 557 54 ctlin 5 0; -#X obj 323 156 ctlin 6 0; #X obj 70 333 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; #X obj 42 92 mono; +#X obj 40 28 bela_notein 0; +#X obj 260 60 bela_ctlin 5 0; +#X obj 220 151 bela_ctlin 6 0; +#X obj 408 121 bela_pgmin 3; +#X text 537 58 [ctlin]; +#X text 332 27 [notein]; +#X text 140 29 <== the bela equivalent of ==>; +#X text 349 59 <== the bela equivalent of ==>; +#X text 483 121 <== the bela equivalent of ==>; #X connect 3 0 0 1; #X connect 3 0 0 0; -#X connect 7 0 13 0; -#X connect 10 0 42 1; -#X connect 12 0 42 0; -#X connect 13 0 38 0; +#X connect 7 0 11 0; +#X connect 8 0 32 1; +#X connect 10 0 32 0; +#X connect 11 0 30 0; +#X connect 13 0 14 0; +#X connect 14 0 17 0; #X connect 15 0 16 0; -#X connect 16 0 19 0; -#X connect 17 0 18 0; -#X connect 17 0 37 0; -#X connect 17 0 36 0; -#X connect 18 0 19 0; -#X connect 19 0 32 0; -#X connect 23 0 34 0; -#X connect 24 0 25 0; -#X connect 25 0 26 0; +#X connect 15 0 29 0; +#X connect 15 0 28 0; +#X connect 16 0 17 0; +#X connect 17 0 24 0; +#X connect 19 0 26 0; +#X connect 20 0 21 0; +#X connect 21 0 22 0; +#X connect 22 0 23 0; +#X connect 23 0 3 0; +#X connect 24 0 30 1; +#X connect 25 0 20 1; +#X connect 25 0 21 1; +#X connect 25 0 22 1; +#X connect 25 0 23 1; #X connect 26 0 27 0; -#X connect 27 0 3 0; -#X connect 28 0 12 0; -#X connect 28 1 10 0; -#X connect 28 2 11 0; -#X connect 30 0 15 0; -#X connect 31 0 23 0; -#X connect 32 0 38 1; -#X connect 33 0 24 1; -#X connect 33 0 25 1; -#X connect 33 0 26 1; -#X connect 33 0 27 1; -#X connect 34 0 35 0; -#X connect 35 0 33 0; -#X connect 37 0 23 0; -#X connect 38 0 24 0; -#X connect 41 0 3 1; -#X connect 42 0 7 0; -#X connect 42 1 41 0; +#X connect 27 0 25 0; +#X connect 29 0 19 0; +#X connect 30 0 20 0; +#X connect 31 0 3 1; +#X connect 32 0 7 0; +#X connect 32 1 31 0; +#X connect 33 0 10 0; +#X connect 33 1 8 0; +#X connect 33 2 9 0; +#X connect 34 0 13 0; +#X connect 35 0 19 0; diff -r 97f5219429b3 -r a0a7f00cf98d projects/heavy/pd/hello-midi/countTo.pd --- a/projects/heavy/pd/hello-midi/countTo.pd Fri Apr 01 05:04:13 2016 +0100 +++ b/projects/heavy/pd/hello-midi/countTo.pd Fri Apr 08 22:26:44 2016 +0100 @@ -1,4 +1,4 @@ -#N canvas 586 250 450 300 10; +#N canvas 584 255 450 300 10; #X obj 65 196 outlet; #X obj 98 8 inlet; #X text 189 49 counts from 0 to the given number -1; @@ -7,13 +7,12 @@ #X obj 143 61 f; #X obj 100 138 spigot; #X obj 129 89 <; -#X obj 129 113 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1 +#X obj 129 113 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; #X obj 95 28 t b f b; #X obj 92 74 + 1; -#X obj 43 73 f, f 4; +#X obj 43 73 f; #X obj 63 104 t b f f f; -#X obj 143 155 spigot; #X msg 92 53 0; #X obj 16 144 delay 0; #X connect 1 0 9 0; @@ -23,12 +22,12 @@ #X connect 8 0 6 1; #X connect 9 0 11 0; #X connect 9 1 5 0; -#X connect 9 1 14 0; +#X connect 9 1 13 0; #X connect 10 0 11 1; #X connect 11 0 12 0; -#X connect 12 0 15 0; +#X connect 12 0 14 0; #X connect 12 1 0 0; #X connect 12 2 7 0; #X connect 12 3 10 0; -#X connect 14 0 11 1; -#X connect 15 0 6 0; +#X connect 13 0 11 1; +#X connect 14 0 6 0;