Add a lot more MIDI test-cases.

Code coverage increased to 98%, only 5 lines missed. 4 are from
handle_channel_msg_generic().

diff --git a/decoder/test/midi/channel_modes.output b/decoder/test/midi/channel_modes.output
new file mode 100644 (file)
index 0000000..6c72243
--- /dev/null
+++ b/decoder/test/midi/channel_modes.output
@@ -0,0 +1,7 @@
+7-106 midi: text-verbose: "Channel 1: mode message 'all sound off' "
+118-216 midi: text-verbose: "Channel 1: mode message 'all sound off' (non-standard param value of 0x05)"
+229-328 midi: text-verbose: "Channel 2: mode message 'local control' off"
+340-439 midi: text-verbose: "Channel 2: mode message 'local control' on"
+451-551 midi: text-verbose: "Channel 2: mode message 'local control' (non-standard param value of 0x05)"
+562-661 midi: text-verbose: "Channel 3: mode message 'mono mode on' (5 channels)"
+673-772 midi: text-verbose: "Channel 3: mode message 'mono mode on' (channels 'basic' through 16)"

diff --git a/decoder/test/midi/controller_misc.output b/decoder/test/midi/controller_misc.output
new file mode 100644 (file)
index 0000000..1e7eafc
--- /dev/null
+++ b/decoder/test/midi/controller_misc.output
@@ -0,0 +1,4 @@
+7-106 midi: text-verbose: "Channel 1: control function 'legato footswitch' = normal"
+118-217 midi: text-verbose: "Channel 1: control function 'legato footswitch' = legato"
+229-328 midi: text-verbose: "Channel 2: control function 'portamento control' (source note = 48 / C2)"
+340-439 midi: text-verbose: "Channel 3: control change to function 'undefined 0x29' (param = 0x05)"

diff --git a/decoder/test/midi/falcosoft_channel_pressure_program_change_pitch_bend.output b/decoder/test/midi/falcosoft_channel_pressure_program_change_pitch_bend.output
new file mode 100644 (file)
index 0000000..9d51801
--- /dev/null
+++ b/decoder/test/midi/falcosoft_channel_pressure_program_change_pitch_bend.output
@@ -0,0 +1,123 @@
+281-344 midi: text-verbose: "Channel 1: channel pressure / aftertouch 0"
+355-454 midi: text-verbose: "Channel 1: pitch bend change 0x00 0x40 (8192)"
+466-565 midi: text-verbose: "Channel 1: control change to function 'Registered Parameter Number LSB' (param = 0x00)"
+575-672 midi: text-verbose: "Channel 1: control change to function 'Registered Parameter Number MSB' (param = 0x00)"
+683-780 midi: text-verbose: "Channel 1: control change to function 'data entry MSB' (param = 0x02)"
+790-888 midi: text-verbose: "Channel 1: control change to function 'bank select LSB' (param = 0x00)"
+898-996 midi: text-verbose: "Channel 1: pitch bend change 0x00 0x40 (8192)"
+1006-1104 midi: text-verbose: "Channel 1: control change to function 'effects 3 depth (formerly chorus depth)' (param = 0x00)"
+1115-1212 midi: text-verbose: "Channel 1: control change to function 'effects 1 depth (formerly external effects depth)' (param = 0x28)"
+1223-1320 midi: text-verbose: "Channel 1: control change to function 'damper pedal (sustain)' (param = 0x00)"
+1331-1428 midi: text-verbose: "Channel 1: control change to function 'expression controller MSB' (param = 0x7f)"
+1439-1536 midi: text-verbose: "Channel 1: control change to function 'pan MSB' (param = 0x40)"
+1547-1645 midi: text-verbose: "Channel 1: control change to function 'channel volume MSB (formerly main volume)' (param = 0x64)"
+1655-1753 midi: text-verbose: "Channel 1: control change to function 'modulation wheel/lever MSB' (param = 0x00)"
+1763-1861 midi: text-verbose: "Channel 1: note off (note = 0 'C-2', velocity = 0)"
+1871-1968 midi: text-verbose: "Channel 1: note off (note = 0 'C-2', velocity = 0)"
+1979-2076 midi: text-verbose: "Channel 1: control change to function 'breath controller MSB' (param = 0x00)"
+2086-2186 midi: text-verbose: "Channel 1: control change to function 'Non-Registered Parameter Number MSB' (param = 0x78)"
+2197-2294 midi: text-verbose: "Channel 1: control change to function 'Non-Registered Parameter Number LSB' (param = 0x22)"
+2305-2402 midi: text-verbose: "Channel 1: control change to function 'data entry LSB' (param = 0x0e)"
+2413-2510 midi: text-verbose: "Channel 1: control change to function 'channel volume MSB (formerly main volume)' (param = 0x00)"
+2521-2618 midi: text-verbose: "Channel 1: control change to function 'bank select MSB' (param = 0x01)"
+2629-2689 midi: text-verbose: "Channel 1: program change to instrument 30 (assuming Overdriven Guitar)"
+2701-2798 midi: text-verbose: "Channel 1: control change to function 'channel volume MSB (formerly main volume)' (param = 0x77)"
+2810-2905 midi: text-verbose: "Channel 1: control change to function 'pan MSB' (param = 0x2c)"
+2916-3014 midi: text-verbose: "Channel 1: control change to function 'Registered Parameter Number MSB' (param = 0x00)"
+3024-3121 midi: text-verbose: "Channel 1: control change to function 'Registered Parameter Number LSB' (param = 0x00)"
+3133-3229 midi: text-verbose: "Channel 1: control change to function 'data entry MSB' (param = 0x01)"
+3240-3302 midi: text-verbose: "Channel 2: channel pressure / aftertouch 0"
+3312-3409 midi: text-verbose: "Channel 2: pitch bend change 0x00 0x40 (8192)"
+3421-3517 midi: text-verbose: "Channel 2: control change to function 'Registered Parameter Number LSB' (param = 0x00)"
+3528-3625 midi: text-verbose: "Channel 2: control change to function 'Registered Parameter Number MSB' (param = 0x00)"
+3636-3734 midi: text-verbose: "Channel 2: control change to function 'data entry MSB' (param = 0x02)"
+3744-3841 midi: text-verbose: "Channel 2: control change to function 'bank select LSB' (param = 0x00)"
+3853-3950 midi: text-verbose: "Channel 2: pitch bend change 0x00 0x40 (8192)"
+3960-4058 midi: text-verbose: "Channel 2: control change to function 'effects 3 depth (formerly chorus depth)' (param = 0x00)"
+4068-4166 midi: text-verbose: "Channel 2: control change to function 'effects 1 depth (formerly external effects depth)' (param = 0x28)"
+4177-4273 midi: text-verbose: "Channel 2: control change to function 'damper pedal (sustain)' (param = 0x00)"
+4285-4382 midi: text-verbose: "Channel 2: control change to function 'expression controller MSB' (param = 0x7f)"
+4394-4491 midi: text-verbose: "Channel 2: control change to function 'pan MSB' (param = 0x40)"
+4501-4599 midi: text-verbose: "Channel 2: control change to function 'channel volume MSB (formerly main volume)' (param = 0x64)"
+4609-4707 midi: text-verbose: "Channel 2: control change to function 'modulation wheel/lever MSB' (param = 0x00)"
+4717-4814 midi: text-verbose: "Channel 2: note off (note = 0 'C-2', velocity = 0)"
+4824-4923 midi: text-verbose: "Channel 2: note off (note = 0 'C-2', velocity = 0)"
+4933-5031 midi: text-verbose: "Channel 2: control change to function 'breath controller MSB' (param = 0x00)"
+5041-5139 midi: text-verbose: "Channel 2: control change to function 'Non-Registered Parameter Number MSB' (param = 0x78)"
+5150-5246 midi: text-verbose: "Channel 2: control change to function 'Non-Registered Parameter Number LSB' (param = 0x22)"
+5258-5355 midi: text-verbose: "Channel 2: control change to function 'data entry LSB' (param = 0x0e)"
+5365-5464 midi: text-verbose: "Channel 2: control change to function 'channel volume MSB (formerly main volume)' (param = 0x00)"
+5474-5572 midi: text-verbose: "Channel 2: control change to function 'channel volume MSB (formerly main volume)' (param = 0x7e)"
+5582-5679 midi: text-verbose: "Channel 2: control change to function 'pan MSB' (param = 0x54)"
+5691-5788 midi: text-verbose: "Channel 2: control change to function 'Registered Parameter Number MSB' (param = 0x00)"
+5798-5896 midi: text-verbose: "Channel 2: control change to function 'Registered Parameter Number LSB' (param = 0x00)"
+5907-6004 midi: text-verbose: "Channel 2: control change to function 'data entry MSB' (param = 0x01)"
+6015-6076 midi: text-verbose: "Channel 3: channel pressure / aftertouch 0"
+6086-6184 midi: text-verbose: "Channel 3: pitch bend change 0x00 0x40 (8192)"
+6194-6292 midi: text-verbose: "Channel 3: control change to function 'Registered Parameter Number LSB' (param = 0x00)"
+6303-6399 midi: text-verbose: "Channel 3: control change to function 'Registered Parameter Number MSB' (param = 0x00)"
+6411-6507 midi: text-verbose: "Channel 3: control change to function 'data entry MSB' (param = 0x02)"
+6518-6615 midi: text-verbose: "Channel 3: control change to function 'bank select LSB' (param = 0x00)"
+6626-6723 midi: text-verbose: "Channel 3: pitch bend change 0x00 0x40 (8192)"
+6734-6831 midi: text-verbose: "Channel 3: control change to function 'effects 3 depth (formerly chorus depth)' (param = 0x00)"
+6842-6939 midi: text-verbose: "Channel 3: control change to function 'effects 1 depth (formerly external effects depth)' (param = 0x28)"
+6950-7047 midi: text-verbose: "Channel 3: control change to function 'damper pedal (sustain)' (param = 0x00)"
+7058-7156 midi: text-verbose: "Channel 3: control change to function 'expression controller MSB' (param = 0x7f)"
+7167-7264 midi: text-verbose: "Channel 3: control change to function 'pan MSB' (param = 0x40)"
+7275-7372 midi: text-verbose: "Channel 3: control change to function 'channel volume MSB (formerly main volume)' (param = 0x7e)"
+7382-7480 midi: text-verbose: "Channel 3: control change to function 'modulation wheel/lever MSB' (param = 0x00)"
+7491-7588 midi: text-verbose: "Channel 3: control change to function 'bank select MSB' (param = 0x01)"
+7600-7660 midi: text-verbose: "Channel 3: program change to instrument 30 (assuming Overdriven Guitar)"
+7671-7768 midi: text-verbose: "Channel 3: note off (note = 0 'C-2', velocity = 0)"
+7779-7876 midi: text-verbose: "Channel 3: note off (note = 0 'C-2', velocity = 0)"
+7887-7983 midi: text-verbose: "Channel 3: control change to function 'breath controller MSB' (param = 0x00)"
+7995-8092 midi: text-verbose: "Channel 3: control change to function 'Non-Registered Parameter Number MSB' (param = 0x78)"
+8102-8201 midi: text-verbose: "Channel 3: control change to function 'Non-Registered Parameter Number LSB' (param = 0x22)"
+8211-8308 midi: text-verbose: "Channel 3: control change to function 'data entry LSB' (param = 0x0e)"
+8319-8416 midi: text-verbose: "Channel 3: control change to function 'channel volume MSB (formerly main volume)' (param = 0x00)"
+8428-8488 midi: text-verbose: "Channel 10: channel pressure / aftertouch 0"
+8499-8596 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+8607-8705 midi: text-verbose: "Channel 10: control change to function 'Registered Parameter Number LSB' (param = 0x00)"
+8716-8813 midi: text-verbose: "Channel 10: control change to function 'Registered Parameter Number MSB' (param = 0x00)"
+8824-8921 midi: text-verbose: "Channel 10: control change to function 'data entry MSB' (param = 0x02)"
+8931-9029 midi: text-verbose: "Channel 10: control change to function 'bank select LSB' (param = 0x00)"
+9039-9137 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+9148-9244 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+9256-9353 midi: text-verbose: "Channel 10: control change to function 'effects 3 depth (formerly chorus depth)' (param = 0x00)"
+9364-9462 midi: text-verbose: "Channel 10: control change to function 'effects 1 depth (formerly external effects depth)' (param = 0x28)"
+9472-9570 midi: text-verbose: "Channel 10: control change to function 'damper pedal (sustain)' (param = 0x00)"
+9580-9677 midi: text-verbose: "Channel 10: control change to function 'expression controller MSB' (param = 0x7f)"
+9689-9786 midi: text-verbose: "Channel 10: control change to function 'pan MSB' (param = 0x40)"
+9797-9894 midi: text-verbose: "Channel 10: control change to function 'modulation wheel/lever MSB' (param = 0x00)"
+9905-10002 midi: text-verbose: "Channel 10: control change to function 'bank select MSB' (param = 0x01)"
+10013-10074 midi: text-verbose: "Channel 10: program change to drum kit 17 (assuming GS Power Kit)"
+10084-10182 midi: text-verbose: "Channel 10: control change to function 'breath controller MSB' (param = 0x00)"
+10193-10290 midi: text-verbose: "Channel 10: control change to function 'Non-Registered Parameter Number MSB' (param = 0x78)"
+10301-10399 midi: text-verbose: "Channel 10: control change to function 'Non-Registered Parameter Number LSB' (param = 0x22)"
+10410-10506 midi: text-verbose: "Channel 10: control change to function 'data entry LSB' (param = 0x0e)"
+10516-10614 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+10624-10722 midi: text-verbose: "Channel 10: control change to function 'channel volume MSB (formerly main volume)' (param = 0x00)"
+10733-10829 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+10841-10938 midi: text-verbose: "Channel 10: control change to function 'channel volume MSB (formerly main volume)' (param = 0x6c)"
+10949-11047 midi: text-verbose: "Channel 10: control change to function 'breath controller MSB' (param = 0x00)"
+11057-11155 midi: text-verbose: "Channel 10: control change to function 'Non-Registered Parameter Number MSB' (param = 0x78)"
+11166-11262 midi: text-verbose: "Channel 10: control change to function 'Non-Registered Parameter Number LSB' (param = 0x22)"
+11274-11371 midi: text-verbose: "Channel 10: control change to function 'data entry LSB' (param = 0x0e)"
+11381-11480 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+11490-11588 midi: text-verbose: "Channel 10: control change to function 'channel volume MSB (formerly main volume)' (param = 0x00)"
+11598-11696 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+11706-11803 midi: text-verbose: "Channel 10: control change to function 'channel volume MSB (formerly main volume)' (param = 0x6c)"
+11815-11912 midi: text-verbose: "Channel 10: control change to function 'breath controller MSB' (param = 0x00)"
+11922-12020 midi: text-verbose: "Channel 10: control change to function 'Non-Registered Parameter Number MSB' (param = 0x78)"
+12031-12129 midi: text-verbose: "Channel 10: control change to function 'Non-Registered Parameter Number LSB' (param = 0x22)"
+12139-12236 midi: text-verbose: "Channel 10: control change to function 'data entry LSB' (param = 0x0e)"
+12248-12345 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+12355-12453 midi: text-verbose: "Channel 10: control change to function 'channel volume MSB (formerly main volume)' (param = 0x00)"
+12463-12562 midi: text-verbose: "Channel 10: pitch bend change 0x00 0x40 (8192)"
+12572-12669 midi: text-verbose: "Channel 10: control change to function 'channel volume MSB (formerly main volume)' (param = 0x6c)"
+12680-12777 midi: text-verbose: "Channel 1: note on (note = 57 'A2', velocity = 101)"
+12788-12885 midi: text-verbose: "Channel 2: control change to function 'bank select MSB' (param = 0x01)"
+12896-12957 midi: text-verbose: "Channel 2: program change to instrument 34 (assuming Electric Bass (finger))"
+12968-13066 midi: text-verbose: "Channel 2: note on (note = 33 'A0', velocity = 127)"
+13076-13175 midi: text-verbose: "Channel 10: note on (note = 36 'assuming Bass Drum 1', velocity = 127)"
+13187-13286 midi: text-verbose: "Channel 10: note on (note = 49 'assuming Crash Cymbal 1', velocity = 84)"

diff --git a/decoder/test/midi/polyphonic_pressure.output b/decoder/test/midi/polyphonic_pressure.output
new file mode 100644 (file)
index 0000000..7adfebf
--- /dev/null
+++ b/decoder/test/midi/polyphonic_pressure.output
@@ -0,0 +1 @@
+7-106 midi: text-verbose: "Channel 1: polyphonic key pressure / aftertouch (note = 64 'E3', pressure = 65)"

diff --git a/decoder/test/midi/realtime_messages.output b/decoder/test/midi/realtime_messages.output
new file mode 100644 (file)
index 0000000..9c921fe
--- /dev/null
+++ b/decoder/test/midi/realtime_messages.output
@@ -0,0 +1,8 @@
+7-32 midi: text-verbose: "System realtime message: timing clock"
+44-69 midi: text-verbose: "System realtime message: undefined 0xf9"
+81-106 midi: text-verbose: "System realtime message: start"
+118-143 midi: text-verbose: "System realtime message: continue"
+155-180 midi: text-verbose: "System realtime message: stop"
+192-217 midi: text-verbose: "System realtime message: undefined 0xfd"
+229-254 midi: text-verbose: "System realtime message: active sensing"
+266-291 midi: text-verbose: "System realtime message: system reset"

diff --git a/decoder/test/midi/rockband_key1.output b/decoder/test/midi/rockband_key1.output
index 6d738258dd216c6353ba237ea00947c2e7fdb685..ee4ab48b8037ae10f0b312dc027f3941983484ab 100644 (file)
--- a/decoder/test/midi/rockband_key1.output
+++ b/decoder/test/midi/rockband_key1.output
@@ -1,21 +1,21 @@
 57692-57948 midi: text-verbose: "System realtime message: active sensing"
 214947-215203 midi: text-verbose: "System realtime message: active sensing"
-280884-281785 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 94)"
+280884-281785 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 94)"
 371276-371532 midi: text-verbose: "System realtime message: active sensing"
-394492-395393 midi: text-verbose: "Channel 1: note off (note = 48, velocity = 113)"
+394492-395393 midi: text-verbose: "Channel 1: note off (note = 48 'C2', velocity = 113)"
 527315-527571 midi: text-verbose: "System realtime message: active sensing"
-544189-545090 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 56)"
-675289-676189 midi: text-verbose: "Channel 1: note off (note = 48, velocity = 106)"
+544189-545090 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 56)"
+675289-676189 midi: text-verbose: "Channel 1: note off (note = 48 'C2', velocity = 106)"
 685689-685945 midi: text-verbose: "System realtime message: active sensing"
-803500-804400 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 64)"
+803500-804400 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 64)"
 842017-842273 midi: text-verbose: "System realtime message: active sensing"
-931699-932600 midi: text-verbose: "Channel 1: note off (note = 48, velocity = 111)"
+931699-932600 midi: text-verbose: "Channel 1: note off (note = 48 'C2', velocity = 111)"
 998268-998524 midi: text-verbose: "System realtime message: active sensing"
-1084825-1085725 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 76)"
+1084825-1085725 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 76)"
 1154055-1154311 midi: text-verbose: "System realtime message: active sensing"
-1233431-1234332 midi: text-verbose: "Channel 1: note off (note = 48, velocity = 107)"
+1233431-1234332 midi: text-verbose: "Channel 1: note off (note = 48 'C2', velocity = 107)"
 1310304-1310560 midi: text-verbose: "System realtime message: active sensing"
-1361608-1362508 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 78)"
+1361608-1362508 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 78)"
 1466643-1466899 midi: text-verbose: "System realtime message: active sensing"
 1625133-1625389 midi: text-verbose: "System realtime message: active sensing"
 1779341-1779597 midi: text-verbose: "System realtime message: active sensing"

diff --git a/decoder/test/midi/rockband_key2.output b/decoder/test/midi/rockband_key2.output
index bf35cd809b2d9af8efe6bf25a8d7e49831359d35..9869fdac8911c611bae9b637b581b27f6b5e2223 100644 (file)
--- a/decoder/test/midi/rockband_key2.output
+++ b/decoder/test/midi/rockband_key2.output
@@ -1,20 +1,20 @@
 3549-3805 midi: text-verbose: "System realtime message: active sensing"
 157715-157971 midi: text-verbose: "System realtime message: active sensing"
-230778-231678 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 76)"
+230778-231678 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 76)"
 313663-313919 midi: text-verbose: "System realtime message: active sensing"
-317137-318037 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 112)"
+317137-318037 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 112)"
 469757-470013 midi: text-verbose: "System realtime message: active sensing"
-486633-487533 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 66)"
-620844-621745 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 112)"
+486633-487533 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 66)"
+620844-621745 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 112)"
 630127-630383 midi: text-verbose: "System realtime message: active sensing"
-732440-733340 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 76)"
+732440-733340 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 76)"
 786380-786636 midi: text-verbose: "System realtime message: active sensing"
-868945-869846 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 112)"
+868945-869846 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 112)"
 940725-940981 midi: text-verbose: "System realtime message: active sensing"
-957600-958500 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 62)"
+957600-958500 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 62)"
 1098750-1099006 midi: text-verbose: "System realtime message: active sensing"
-1107317-1108218 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 116)"
-1157314-1158214 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 100)"
+1107317-1108218 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 116)"
+1157314-1158214 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 100)"
 1256015-1256271 midi: text-verbose: "System realtime message: active sensing"
 1411342-1411598 midi: text-verbose: "System realtime message: active sensing"
 1566743-1566999 midi: text-verbose: "System realtime message: active sensing"

diff --git a/decoder/test/midi/rockband_key3.output b/decoder/test/midi/rockband_key3.output
index ffe4b461813e4b96fc4a1360db179943e436962a..b11e0826e2d782b0592de02ed71156098ab53f96 100644 (file)
--- a/decoder/test/midi/rockband_key3.output
+++ b/decoder/test/midi/rockband_key3.output
@@ -1,21 +1,21 @@
 126598-126854 midi: text-verbose: "System realtime message: active sensing"
 280765-281021 midi: text-verbose: "System realtime message: active sensing"
-315389-316290 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 60)"
-428680-429580 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 108)"
+315389-316290 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 60)"
+428680-429580 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 108)"
 437818-438074 midi: text-verbose: "System realtime message: active sensing"
-578554-579454 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 60)"
+578554-579454 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 60)"
 593843-594099 midi: text-verbose: "System realtime message: active sensing"
-727380-728280 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 112)"
+727380-728280 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 112)"
 751302-751558 midi: text-verbose: "System realtime message: active sensing"
-874195-875095 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 84)"
+874195-875095 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 84)"
 909217-909473 midi: text-verbose: "System realtime message: active sensing"
-991788-992689 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 108)"
+991788-992689 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 108)"
 1063546-1063802 midi: text-verbose: "System realtime message: active sensing"
-1144905-1145805 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 88)"
+1144905-1145805 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 88)"
 1221554-1221810 midi: text-verbose: "System realtime message: active sensing"
 1374980-1375236 midi: text-verbose: "System realtime message: active sensing"
 1532307-1532563 midi: text-verbose: "System realtime message: active sensing"
 1686487-1686743 midi: text-verbose: "System realtime message: active sensing"
 1841884-1842140 midi: text-verbose: "System realtime message: active sensing"
-1856789-1857690 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 122)"
+1856789-1857690 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 122)"
 1999328-1999584 midi: text-verbose: "System realtime message: active sensing"

diff --git a/decoder/test/midi/rockband_key4.output b/decoder/test/midi/rockband_key4.output
index 7c8f7ffabee4589cc63a9e7716a338633e05e71f..6173d4901e87abf95e64ddf3b67933b20a3ddbfd 100644 (file)
--- a/decoder/test/midi/rockband_key4.output
+++ b/decoder/test/midi/rockband_key4.output
@@ -1,20 +1,20 @@
 31324-31580 midi: text-verbose: "System realtime message: active sensing"
 185493-185749 midi: text-verbose: "System realtime message: active sensing"
 342748-343004 midi: text-verbose: "System realtime message: active sensing"
-377472-378372 midi: text-verbose: "Channel 1: note on (note = 51, velocity = 70)"
+377472-378372 midi: text-verbose: "Channel 1: note on (note = 51 'D#2', velocity = 70)"
 499100-499356 midi: text-verbose: "System realtime message: active sensing"
-533743-534643 midi: text-verbose: "Channel 1: note off (note = 51, velocity = 117)"
+533743-534643 midi: text-verbose: "Channel 1: note off (note = 51 'D#2', velocity = 117)"
 656526-656782 midi: text-verbose: "System realtime message: active sensing"
-777421-778321 midi: text-verbose: "Channel 1: note on (note = 51, velocity = 80)"
+777421-778321 midi: text-verbose: "Channel 1: note on (note = 51 'D#2', velocity = 80)"
 811658-811914 midi: text-verbose: "System realtime message: active sensing"
-921966-922866 midi: text-verbose: "Channel 1: note off (note = 51, velocity = 112)"
+921966-922866 midi: text-verbose: "Channel 1: note off (note = 51 'D#2', velocity = 112)"
 967587-967843 midi: text-verbose: "System realtime message: active sensing"
 1122972-1123228 midi: text-verbose: "System realtime message: active sensing"
-1165938-1166838 midi: text-verbose: "Channel 1: note on (note = 51, velocity = 58)"
+1165938-1166838 midi: text-verbose: "Channel 1: note on (note = 51 'D#2', velocity = 58)"
 1279080-1279336 midi: text-verbose: "System realtime message: active sensing"
 1434483-1434739 midi: text-verbose: "System realtime message: active sensing"
 1591806-1592062 midi: text-verbose: "System realtime message: active sensing"
 1745206-1745462 midi: text-verbose: "System realtime message: active sensing"
-1877569-1878469 midi: text-verbose: "Channel 1: note off (note = 51, velocity = 119)"
+1877569-1878469 midi: text-verbose: "Channel 1: note off (note = 51 'D#2', velocity = 119)"
 1903461-1903717 midi: text-verbose: "System realtime message: active sensing"
-1969395-1970295 midi: text-verbose: "Channel 1: note on (note = 51, velocity = 96)"
+1969395-1970295 midi: text-verbose: "Channel 1: note on (note = 51 'D#2', velocity = 96)"

diff --git a/decoder/test/midi/rockband_multiple_keys.output b/decoder/test/midi/rockband_multiple_keys.output
index fb1738e84ba77534b016590c10beb50fec2d61ff..67a691d67443db9053634c1cd4041fd1d508142f 100644 (file)
--- a/decoder/test/midi/rockband_multiple_keys.output
+++ b/decoder/test/midi/rockband_multiple_keys.output
@@ -1,304 +1,304 @@
 144169-144425 midi: text-verbose: "System realtime message: active sensing"
-184008-184908 midi: text-verbose: "Channel 1: note on (note = 60, velocity = 100)"
-190071-190971 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 108)"
-194207-195108 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 112)"
-209579-210479 midi: text-verbose: "Channel 1: note on (note = 67, velocity = 100)"
-292489-293389 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 124)"
-296632-297532 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 116)"
-299561-300461 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 120)"
-302500-303400 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 120)"
+184008-184908 midi: text-verbose: "Channel 1: note on (note = 60 'C3', velocity = 100)"
+190071-190971 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 108)"
+194207-195108 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 112)"
+209579-210479 midi: text-verbose: "Channel 1: note on (note = 67 'G3', velocity = 100)"
+292489-293389 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 124)"
+296632-297532 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 116)"
+299561-300461 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 120)"
+302500-303400 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 120)"
 308497-308753 midi: text-verbose: "System realtime message: active sensing"
-359940-360840 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 114)"
-367224-368125 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 117)"
-370174-371075 midi: text-verbose: "Channel 1: note off (note = 67, velocity = 108)"
-379133-380033 midi: text-verbose: "Channel 1: note off (note = 60, velocity = 114)"
-392405-393305 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 117)"
-406460-407360 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 117)"
-410609-411510 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 120)"
-438792-439692 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 115)"
+359940-360840 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 114)"
+367224-368125 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 117)"
+370174-371075 midi: text-verbose: "Channel 1: note off (note = 67 'G3', velocity = 108)"
+379133-380033 midi: text-verbose: "Channel 1: note off (note = 60 'C3', velocity = 114)"
+392405-393305 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 117)"
+406460-407360 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 117)"
+410609-411510 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 120)"
+438792-439692 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 115)"
 472990-473246 midi: text-verbose: "System realtime message: active sensing"
-494990-495890 midi: text-verbose: "Channel 1: note on (note = 68, velocity = 112)"
-508571-509470 midi: text-verbose: "Channel 1: note on (note = 61, velocity = 110)"
-517712-518611 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 118)"
-521846-522747 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 118)"
-525908-526808 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 112)"
-530075-530975 midi: text-verbose: "Channel 1: note on (note = 56, velocity = 122)"
-534140-535040 midi: text-verbose: "Channel 1: note on (note = 60, velocity = 100)"
-541343-542244 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 118)"
-545478-546379 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 112)"
-549534-550434 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 100)"
-601768-602669 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 82)"
-622497-623397 midi: text-verbose: "Channel 1: note on (note = 57, velocity = 62)"
+494990-495890 midi: text-verbose: "Channel 1: note on (note = 68 'G#3', velocity = 112)"
+508571-509470 midi: text-verbose: "Channel 1: note on (note = 61 'C#3', velocity = 110)"
+517712-518611 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 118)"
+521846-522747 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 118)"
+525908-526808 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 112)"
+530075-530975 midi: text-verbose: "Channel 1: note on (note = 56 'G#2', velocity = 122)"
+534140-535040 midi: text-verbose: "Channel 1: note on (note = 60 'C3', velocity = 100)"
+541343-542244 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 118)"
+545478-546379 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 112)"
+549534-550434 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 100)"
+601768-602669 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 82)"
+622497-623397 midi: text-verbose: "Channel 1: note on (note = 57 'A2', velocity = 62)"
 639242-639498 midi: text-verbose: "System realtime message: active sensing"
-661332-662232 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 113)"
-671818-672718 midi: text-verbose: "Channel 1: note off (note = 57, velocity = 101)"
-677908-678808 midi: text-verbose: "Channel 1: note off (note = 61, velocity = 119)"
-682059-682959 midi: text-verbose: "Channel 1: note off (note = 60, velocity = 121)"
-686130-687029 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 119)"
-693311-694211 midi: text-verbose: "Channel 1: note off (note = 56, velocity = 116)"
-697448-698348 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 119)"
-700402-701303 midi: text-verbose: "Channel 1: note off (note = 68, velocity = 111)"
-716790-717690 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 121)"
-722921-723821 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 121)"
-805540-806440 midi: text-verbose: "Channel 1: note on (note = 56, velocity = 110)"
+661332-662232 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 113)"
+671818-672718 midi: text-verbose: "Channel 1: note off (note = 57 'A2', velocity = 101)"
+677908-678808 midi: text-verbose: "Channel 1: note off (note = 61 'C#3', velocity = 119)"
+682059-682959 midi: text-verbose: "Channel 1: note off (note = 60 'C3', velocity = 121)"
+686130-687029 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 119)"
+693311-694211 midi: text-verbose: "Channel 1: note off (note = 56 'G#2', velocity = 116)"
+697448-698348 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 119)"
+700402-701303 midi: text-verbose: "Channel 1: note off (note = 68 'G#3', velocity = 111)"
+716790-717690 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 121)"
+722921-723821 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 121)"
+805540-806440 midi: text-verbose: "Channel 1: note on (note = 56 'G#2', velocity = 110)"
 806515-806771 midi: text-verbose: "System realtime message: active sensing"
-809990-810890 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 118)"
-814022-814923 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 127)"
-821307-822206 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 112)"
-825463-826363 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 110)"
-837711-838611 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 118)"
-841870-842771 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 106)"
-845963-846864 midi: text-verbose: "Channel 1: note on (note = 68, velocity = 78)"
-850117-851017 midi: text-verbose: "Channel 1: note on (note = 71, velocity = 82)"
-853081-853981 midi: text-verbose: "Channel 1: note on (note = 57, velocity = 116)"
-861031-861932 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 62)"
-865175-866075 midi: text-verbose: "Channel 1: note on (note = 67, velocity = 72)"
-887152-888052 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 115)"
-893241-894140 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 120)"
-925544-926445 midi: text-verbose: "Channel 1: note off (note = 68, velocity = 105)"
-934684-935585 midi: text-verbose: "Channel 1: note off (note = 67, velocity = 110)"
-953535-954435 midi: text-verbose: "Channel 1: note off (note = 71, velocity = 48)"
-965901-966802 midi: text-verbose: "Channel 1: note off (note = 57, velocity = 121)"
-970074-970974 midi: text-verbose: "Channel 1: note off (note = 56, velocity = 123)"
-977336-978236 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 96)"
+809990-810890 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 118)"
+814022-814923 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 127)"
+821307-822206 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 112)"
+825463-826363 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 110)"
+837711-838611 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 118)"
+841870-842771 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 106)"
+845963-846864 midi: text-verbose: "Channel 1: note on (note = 68 'G#3', velocity = 78)"
+850117-851017 midi: text-verbose: "Channel 1: note on (note = 71 'B3', velocity = 82)"
+853081-853981 midi: text-verbose: "Channel 1: note on (note = 57 'A2', velocity = 116)"
+861031-861932 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 62)"
+865175-866075 midi: text-verbose: "Channel 1: note on (note = 67 'G3', velocity = 72)"
+887152-888052 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 115)"
+893241-894140 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 120)"
+925544-926445 midi: text-verbose: "Channel 1: note off (note = 68 'G#3', velocity = 105)"
+934684-935585 midi: text-verbose: "Channel 1: note off (note = 67 'G3', velocity = 110)"
+953535-954435 midi: text-verbose: "Channel 1: note off (note = 71 'B3', velocity = 48)"
+965901-966802 midi: text-verbose: "Channel 1: note off (note = 57 'A2', velocity = 121)"
+970074-970974 midi: text-verbose: "Channel 1: note off (note = 56 'G#2', velocity = 123)"
+977336-978236 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 96)"
 981333-981589 midi: text-verbose: "System realtime message: active sensing"
-989823-990723 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 113)"
-993964-994864 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 113)"
-998029-998930 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 122)"
-1005277-1006177 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 118)"
-1075852-1076752 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 114)"
-1085716-1086616 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 124)"
-1089864-1090764 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 122)"
-1093951-1094851 midi: text-verbose: "Channel 1: note on (note = 56, velocity = 124)"
-1098096-1098996 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 122)"
-1102168-1103068 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 124)"
-1109379-1110279 midi: text-verbose: "Channel 1: note on (note = 57, velocity = 102)"
-1113519-1114419 midi: text-verbose: "Channel 1: note on (note = 68, velocity = 118)"
-1120812-1121712 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 94)"
-1123752-1124653 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 92)"
-1147425-1148325 midi: text-verbose: "Channel 1: note on (note = 71, velocity = 80)"
+989823-990723 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 113)"
+993964-994864 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 113)"
+998029-998930 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 122)"
+1005277-1006177 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 118)"
+1075852-1076752 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 114)"
+1085716-1086616 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 124)"
+1089864-1090764 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 122)"
+1093951-1094851 midi: text-verbose: "Channel 1: note on (note = 56 'G#2', velocity = 124)"
+1098096-1098996 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 122)"
+1102168-1103068 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 124)"
+1109379-1110279 midi: text-verbose: "Channel 1: note on (note = 57 'A2', velocity = 102)"
+1113519-1114419 midi: text-verbose: "Channel 1: note on (note = 68 'G#3', velocity = 118)"
+1120812-1121712 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 94)"
+1123752-1124653 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 92)"
+1147425-1148325 midi: text-verbose: "Channel 1: note on (note = 71 'B3', velocity = 80)"
 1152275-1152531 midi: text-verbose: "System realtime message: active sensing"
-1157637-1158537 midi: text-verbose: "Channel 1: note on (note = 67, velocity = 62)"
-1224521-1225421 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 107)"
-1231817-1232718 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 111)"
-1234774-1235674 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 113)"
-1237734-1238634 midi: text-verbose: "Channel 1: note off (note = 68, velocity = 18)"
-1245654-1246555 midi: text-verbose: "Channel 1: note off (note = 67, velocity = 105)"
-1249807-1250707 midi: text-verbose: "Channel 1: note off (note = 56, velocity = 121)"
-1253878-1254778 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 118)"
-1258020-1258920 midi: text-verbose: "Channel 1: note off (note = 57, velocity = 123)"
-1262079-1262979 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 123)"
-1269267-1270168 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 118)"
-1273413-1274313 midi: text-verbose: "Channel 1: note off (note = 71, velocity = 111)"
-1280664-1281563 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 113)"
+1157637-1158537 midi: text-verbose: "Channel 1: note on (note = 67 'G3', velocity = 62)"
+1224521-1225421 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 107)"
+1231817-1232718 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 111)"
+1234774-1235674 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 113)"
+1237734-1238634 midi: text-verbose: "Channel 1: note off (note = 68 'G#3', velocity = 18)"
+1245654-1246555 midi: text-verbose: "Channel 1: note off (note = 67 'G3', velocity = 105)"
+1249807-1250707 midi: text-verbose: "Channel 1: note off (note = 56 'G#2', velocity = 121)"
+1253878-1254778 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 118)"
+1258020-1258920 midi: text-verbose: "Channel 1: note off (note = 57 'A2', velocity = 123)"
+1262079-1262979 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 123)"
+1269267-1270168 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 118)"
+1273413-1274313 midi: text-verbose: "Channel 1: note off (note = 71 'B3', velocity = 111)"
+1280664-1281563 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 113)"
 1321196-1321452 midi: text-verbose: "System realtime message: active sensing"
-1346378-1347278 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 108)"
-1355629-1356529 midi: text-verbose: "Channel 1: note on (note = 56, velocity = 126)"
-1365479-1366379 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 122)"
-1369619-1370519 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 120)"
-1373665-1374565 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 116)"
-1384162-1385062 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 120)"
-1387121-1388021 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 114)"
-1397046-1397945 midi: text-verbose: "Channel 1: note on (note = 59, velocity = 124)"
-1401245-1402145 midi: text-verbose: "Channel 1: note on (note = 60, velocity = 120)"
-1405284-1406184 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 118)"
-1409484-1410384 midi: text-verbose: "Channel 1: note on (note = 67, velocity = 94)"
-1413518-1414418 midi: text-verbose: "Channel 1: note on (note = 69, velocity = 78)"
-1448979-1449880 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 69)"
-1458258-1459158 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 69)"
+1346378-1347278 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 108)"
+1355629-1356529 midi: text-verbose: "Channel 1: note on (note = 56 'G#2', velocity = 126)"
+1365479-1366379 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 122)"
+1369619-1370519 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 120)"
+1373665-1374565 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 116)"
+1384162-1385062 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 120)"
+1387121-1388021 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 114)"
+1397046-1397945 midi: text-verbose: "Channel 1: note on (note = 59 'B2', velocity = 124)"
+1401245-1402145 midi: text-verbose: "Channel 1: note on (note = 60 'C3', velocity = 120)"
+1405284-1406184 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 118)"
+1409484-1410384 midi: text-verbose: "Channel 1: note on (note = 67 'G3', velocity = 94)"
+1413518-1414418 midi: text-verbose: "Channel 1: note on (note = 69 'A3', velocity = 78)"
+1448979-1449880 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 69)"
+1458258-1459158 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 69)"
 1490269-1490525 midi: text-verbose: "System realtime message: active sensing"
-1505253-1506153 midi: text-verbose: "Channel 1: note off (note = 60, velocity = 103)"
-1509326-1510226 midi: text-verbose: "Channel 1: note off (note = 67, velocity = 90)"
-1518612-1519513 midi: text-verbose: "Channel 1: note off (note = 69, velocity = 81)"
-1525825-1526726 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 119)"
-1529996-1530896 midi: text-verbose: "Channel 1: note off (note = 56, velocity = 120)"
-1534031-1534932 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 121)"
-1538207-1539107 midi: text-verbose: "Channel 1: note off (note = 59, velocity = 117)"
-1542230-1543130 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 123)"
-1551351-1552251 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 120)"
-1555507-1556407 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 115)"
-1656443-1657344 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 112)"
+1505253-1506153 midi: text-verbose: "Channel 1: note off (note = 60 'C3', velocity = 103)"
+1509326-1510226 midi: text-verbose: "Channel 1: note off (note = 67 'G3', velocity = 90)"
+1518612-1519513 midi: text-verbose: "Channel 1: note off (note = 69 'A3', velocity = 81)"
+1525825-1526726 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 119)"
+1529996-1530896 midi: text-verbose: "Channel 1: note off (note = 56 'G#2', velocity = 120)"
+1534031-1534932 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 121)"
+1538207-1539107 midi: text-verbose: "Channel 1: note off (note = 59 'B2', velocity = 117)"
+1542230-1543130 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 123)"
+1551351-1552251 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 120)"
+1555507-1556407 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 115)"
+1656443-1657344 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 112)"
 1657419-1657675 midi: text-verbose: "System realtime message: active sensing"
-1659708-1660608 midi: text-verbose: "Channel 1: note on (note = 51, velocity = 126)"
-1662653-1663553 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 112)"
-1668702-1669601 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 126)"
-1672877-1673776 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 118)"
-1676957-1677857 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 122)"
-1681106-1682005 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 126)"
-1685181-1686081 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 118)"
-1694355-1695255 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 120)"
-1698501-1699402 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 104)"
-1702564-1703464 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 84)"
-1706705-1707605 midi: text-verbose: "Channel 1: note on (note = 68, velocity = 124)"
-1710782-1711682 midi: text-verbose: "Channel 1: note on (note = 71, velocity = 86)"
-1717969-1718869 midi: text-verbose: "Channel 1: note off (note = 51, velocity = 126)"
-1761797-1762697 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 113)"
-1785716-1786617 midi: text-verbose: "Channel 1: note off (note = 48, velocity = 113)"
-1807637-1808537 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 123)"
-1810578-1811478 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 121)"
-1822354-1823254 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 115)"
-1826530-1827430 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 113)"
-1830559-1831459 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 121)"
+1659708-1660608 midi: text-verbose: "Channel 1: note on (note = 51 'D#2', velocity = 126)"
+1662653-1663553 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 112)"
+1668702-1669601 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 126)"
+1672877-1673776 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 118)"
+1676957-1677857 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 122)"
+1681106-1682005 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 126)"
+1685181-1686081 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 118)"
+1694355-1695255 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 120)"
+1698501-1699402 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 104)"
+1702564-1703464 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 84)"
+1706705-1707605 midi: text-verbose: "Channel 1: note on (note = 68 'G#3', velocity = 124)"
+1710782-1711682 midi: text-verbose: "Channel 1: note on (note = 71 'B3', velocity = 86)"
+1717969-1718869 midi: text-verbose: "Channel 1: note off (note = 51 'D#2', velocity = 126)"
+1761797-1762697 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 113)"
+1785716-1786617 midi: text-verbose: "Channel 1: note off (note = 48 'C2', velocity = 113)"
+1807637-1808537 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 123)"
+1810578-1811478 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 121)"
+1822354-1823254 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 115)"
+1826530-1827430 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 113)"
+1830559-1831459 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 121)"
 1831534-1831790 midi: text-verbose: "System realtime message: active sensing"
-1835066-1835966 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 117)"
-1839112-1840013 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 117)"
-1854362-1855262 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 121)"
-1858529-1859429 midi: text-verbose: "Channel 1: note off (note = 68, velocity = 123)"
-1862569-1863469 midi: text-verbose: "Channel 1: note off (note = 71, velocity = 117)"
-1911365-1912265 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 118)"
-1924923-1925824 midi: text-verbose: "Channel 1: note on (note = 66, velocity = 126)"
-1934076-1934976 midi: text-verbose: "Channel 1: note on (note = 56, velocity = 126)"
-1938226-1939125 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 116)"
-1942299-1943200 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 108)"
-1946439-1947339 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 116)"
-1950501-1951402 midi: text-verbose: "Channel 1: note on (note = 68, velocity = 122)"
-1957684-1958585 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 116)"
+1835066-1835966 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 117)"
+1839112-1840013 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 117)"
+1854362-1855262 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 121)"
+1858529-1859429 midi: text-verbose: "Channel 1: note off (note = 68 'G#3', velocity = 123)"
+1862569-1863469 midi: text-verbose: "Channel 1: note off (note = 71 'B3', velocity = 117)"
+1911365-1912265 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 118)"
+1924923-1925824 midi: text-verbose: "Channel 1: note on (note = 66 'F#3', velocity = 126)"
+1934076-1934976 midi: text-verbose: "Channel 1: note on (note = 56 'G#2', velocity = 126)"
+1938226-1939125 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 116)"
+1942299-1943200 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 108)"
+1946439-1947339 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 116)"
+1950501-1951402 midi: text-verbose: "Channel 1: note on (note = 68 'G#3', velocity = 122)"
+1957684-1958585 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 116)"
 2001621-2001877 midi: text-verbose: "System realtime message: active sensing"
-2008270-2009170 midi: text-verbose: "Channel 1: note on (note = 57, velocity = 74)"
-2011210-2012111 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 118)"
-2014157-2015057 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 93)"
-2025430-2026331 midi: text-verbose: "Channel 1: note off (note = 48, velocity = 73)"
-2051148-2052048 midi: text-verbose: "Channel 1: note off (note = 66, velocity = 111)"
-2066411-2067311 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 119)"
-2078809-2079709 midi: text-verbose: "Channel 1: note off (note = 57, velocity = 106)"
-2082993-2083894 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 118)"
-2087038-2087939 midi: text-verbose: "Channel 1: note off (note = 68, velocity = 118)"
-2094214-2095114 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 119)"
-2098380-2099280 midi: text-verbose: "Channel 1: note off (note = 56, velocity = 126)"
-2102415-2103315 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 124)"
+2008270-2009170 midi: text-verbose: "Channel 1: note on (note = 57 'A2', velocity = 74)"
+2011210-2012111 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 118)"
+2014157-2015057 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 93)"
+2025430-2026331 midi: text-verbose: "Channel 1: note off (note = 48 'C2', velocity = 73)"
+2051148-2052048 midi: text-verbose: "Channel 1: note off (note = 66 'F#3', velocity = 111)"
+2066411-2067311 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 119)"
+2078809-2079709 midi: text-verbose: "Channel 1: note off (note = 57 'A2', velocity = 106)"
+2082993-2083894 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 118)"
+2087038-2087939 midi: text-verbose: "Channel 1: note off (note = 68 'G#3', velocity = 118)"
+2094214-2095114 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 119)"
+2098380-2099280 midi: text-verbose: "Channel 1: note off (note = 56 'G#2', velocity = 126)"
+2102415-2103315 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 124)"
 2169055-2169311 midi: text-verbose: "System realtime message: active sensing"
-2194256-2195156 midi: text-verbose: "Channel 1: note on (note = 61, velocity = 127)"
-2203506-2204406 midi: text-verbose: "Channel 1: note on (note = 59, velocity = 124)"
-2215407-2216307 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 122)"
-2219572-2220472 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 118)"
-2223650-2224550 midi: text-verbose: "Channel 1: note on (note = 56, velocity = 124)"
-2227800-2228700 midi: text-verbose: "Channel 1: note on (note = 58, velocity = 124)"
-2231873-2232773 midi: text-verbose: "Channel 1: note on (note = 60, velocity = 120)"
-2245372-2246271 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 90)"
-2249520-2250420 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 124)"
-2253588-2254488 midi: text-verbose: "Channel 1: note on (note = 67, velocity = 78)"
-2257725-2258625 midi: text-verbose: "Channel 1: note on (note = 69, velocity = 74)"
-2304662-2305563 midi: text-verbose: "Channel 1: note off (note = 56, velocity = 115)"
-2336631-2337531 midi: text-verbose: "Channel 1: note off (note = 61, velocity = 112)"
+2194256-2195156 midi: text-verbose: "Channel 1: note on (note = 61 'C#3', velocity = 127)"
+2203506-2204406 midi: text-verbose: "Channel 1: note on (note = 59 'B2', velocity = 124)"
+2215407-2216307 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 122)"
+2219572-2220472 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 118)"
+2223650-2224550 midi: text-verbose: "Channel 1: note on (note = 56 'G#2', velocity = 124)"
+2227800-2228700 midi: text-verbose: "Channel 1: note on (note = 58 'A#2', velocity = 124)"
+2231873-2232773 midi: text-verbose: "Channel 1: note on (note = 60 'C3', velocity = 120)"
+2245372-2246271 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 90)"
+2249520-2250420 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 124)"
+2253588-2254488 midi: text-verbose: "Channel 1: note on (note = 67 'G3', velocity = 78)"
+2257725-2258625 midi: text-verbose: "Channel 1: note on (note = 69 'A3', velocity = 74)"
+2304662-2305563 midi: text-verbose: "Channel 1: note off (note = 56 'G#2', velocity = 115)"
+2336631-2337531 midi: text-verbose: "Channel 1: note off (note = 61 'C#3', velocity = 112)"
 2337605-2337861 midi: text-verbose: "System realtime message: active sensing"
-2346214-2347114 midi: text-verbose: "Channel 1: note off (note = 60, velocity = 115)"
-2350293-2351193 midi: text-verbose: "Channel 1: note off (note = 58, velocity = 119)"
-2354443-2355342 midi: text-verbose: "Channel 1: note off (note = 59, velocity = 119)"
-2358512-2359412 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 117)"
-2367647-2368548 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 121)"
-2372899-2373799 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 115)"
-2377040-2377940 midi: text-verbose: "Channel 1: note off (note = 67, velocity = 117)"
-2381110-2382011 midi: text-verbose: "Channel 1: note off (note = 69, velocity = 123)"
-2385236-2386136 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 113)"
-2467021-2467921 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 110)"
-2471072-2471972 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 120)"
-2481549-2482450 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 116)"
-2484484-2485384 midi: text-verbose: "Channel 1: note on (note = 66, velocity = 127)"
-2491445-2492346 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 120)"
-2503310-2504210 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 116)"
-2507457-2508358 midi: text-verbose: "Channel 1: note on (note = 69, velocity = 124)"
+2346214-2347114 midi: text-verbose: "Channel 1: note off (note = 60 'C3', velocity = 115)"
+2350293-2351193 midi: text-verbose: "Channel 1: note off (note = 58 'A#2', velocity = 119)"
+2354443-2355342 midi: text-verbose: "Channel 1: note off (note = 59 'B2', velocity = 119)"
+2358512-2359412 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 117)"
+2367647-2368548 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 121)"
+2372899-2373799 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 115)"
+2377040-2377940 midi: text-verbose: "Channel 1: note off (note = 67 'G3', velocity = 117)"
+2381110-2382011 midi: text-verbose: "Channel 1: note off (note = 69 'A3', velocity = 123)"
+2385236-2386136 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 113)"
+2467021-2467921 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 110)"
+2471072-2471972 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 120)"
+2481549-2482450 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 116)"
+2484484-2485384 midi: text-verbose: "Channel 1: note on (note = 66 'F#3', velocity = 127)"
+2491445-2492346 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 120)"
+2503310-2504210 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 116)"
+2507457-2508358 midi: text-verbose: "Channel 1: note on (note = 69 'A3', velocity = 124)"
 2508432-2508688 midi: text-verbose: "System realtime message: active sensing"
-2511811-2512711 midi: text-verbose: "Channel 1: note on (note = 48, velocity = 90)"
-2517083-2517983 midi: text-verbose: "Channel 1: note on (note = 72, velocity = 122)"
-2521234-2522134 midi: text-verbose: "Channel 1: note on (note = 67, velocity = 120)"
-2636846-2637746 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 118)"
-2639807-2640707 midi: text-verbose: "Channel 1: note off (note = 66, velocity = 105)"
-2642712-2643613 midi: text-verbose: "Channel 1: note off (note = 48, velocity = 119)"
-2646774-2647675 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 116)"
-2650903-2651803 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 124)"
-2663116-2664016 midi: text-verbose: "Channel 1: note off (note = 67, velocity = 120)"
-2667265-2668166 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 121)"
-2671328-2672228 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 115)"
-2675468-2676368 midi: text-verbose: "Channel 1: note off (note = 69, velocity = 121)"
+2511811-2512711 midi: text-verbose: "Channel 1: note on (note = 48 'C2', velocity = 90)"
+2517083-2517983 midi: text-verbose: "Channel 1: note on (note = 72 'C4', velocity = 122)"
+2521234-2522134 midi: text-verbose: "Channel 1: note on (note = 67 'G3', velocity = 120)"
+2636846-2637746 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 118)"
+2639807-2640707 midi: text-verbose: "Channel 1: note off (note = 66 'F#3', velocity = 105)"
+2642712-2643613 midi: text-verbose: "Channel 1: note off (note = 48 'C2', velocity = 119)"
+2646774-2647675 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 116)"
+2650903-2651803 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 124)"
+2663116-2664016 midi: text-verbose: "Channel 1: note off (note = 67 'G3', velocity = 120)"
+2667265-2668166 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 121)"
+2671328-2672228 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 115)"
+2675468-2676368 midi: text-verbose: "Channel 1: note off (note = 69 'A3', velocity = 121)"
 2676442-2676698 midi: text-verbose: "System realtime message: active sensing"
-2679836-2680737 midi: text-verbose: "Channel 1: note off (note = 72, velocity = 117)"
-2756681-2757581 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 112)"
-2766760-2767660 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 106)"
-2770878-2771778 midi: text-verbose: "Channel 1: note on (note = 51, velocity = 106)"
-2774935-2775835 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 122)"
-2782221-2783120 midi: text-verbose: "Channel 1: note on (note = 61, velocity = 124)"
-2791417-2792317 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 112)"
-2795567-2796466 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 106)"
-2799638-2800538 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 127)"
-2803775-2804675 midi: text-verbose: "Channel 1: note on (note = 66, velocity = 124)"
-2806718-2807618 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 124)"
+2679836-2680737 midi: text-verbose: "Channel 1: note off (note = 72 'C4', velocity = 117)"
+2756681-2757581 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 112)"
+2766760-2767660 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 106)"
+2770878-2771778 midi: text-verbose: "Channel 1: note on (note = 51 'D#2', velocity = 106)"
+2774935-2775835 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 122)"
+2782221-2783120 midi: text-verbose: "Channel 1: note on (note = 61 'C#3', velocity = 124)"
+2791417-2792317 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 112)"
+2795567-2796466 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 106)"
+2799638-2800538 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 127)"
+2803775-2804675 midi: text-verbose: "Channel 1: note on (note = 66 'F#3', velocity = 124)"
+2806718-2807618 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 124)"
 2842947-2843203 midi: text-verbose: "System realtime message: active sensing"
-2894384-2895284 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 112)"
-2913188-2914088 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 120)"
-2917248-2918148 midi: text-verbose: "Channel 1: note off (note = 61, velocity = 117)"
-2921383-2922283 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 115)"
-2936963-2937863 midi: text-verbose: "Channel 1: note off (note = 51, velocity = 121)"
-2942956-2943856 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 111)"
-2947096-2947996 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 121)"
-2951157-2952058 midi: text-verbose: "Channel 1: note off (note = 66, velocity = 120)"
-3001126-3002026 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 104)"
+2894384-2895284 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 112)"
+2913188-2914088 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 120)"
+2917248-2918148 midi: text-verbose: "Channel 1: note off (note = 61 'C#3', velocity = 117)"
+2921383-2922283 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 115)"
+2936963-2937863 midi: text-verbose: "Channel 1: note off (note = 51 'D#2', velocity = 121)"
+2942956-2943856 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 111)"
+2947096-2947996 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 121)"
+2951157-2952058 midi: text-verbose: "Channel 1: note off (note = 66 'F#3', velocity = 120)"
+3001126-3002026 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 104)"
 3007225-3007481 midi: text-verbose: "System realtime message: active sensing"
-3010698-3011598 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 116)"
-3022867-3023767 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 124)"
-3027009-3027909 midi: text-verbose: "Channel 1: note on (note = 56, velocity = 124)"
-3031067-3031966 midi: text-verbose: "Channel 1: note on (note = 61, velocity = 127)"
-3035192-3036091 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 127)"
-3039264-3040164 midi: text-verbose: "Channel 1: note on (note = 69, velocity = 122)"
-3046490-3047389 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 120)"
-3050631-3051531 midi: text-verbose: "Channel 1: note on (note = 60, velocity = 124)"
-3054689-3055589 midi: text-verbose: "Channel 1: note on (note = 65, velocity = 120)"
+3010698-3011598 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 116)"
+3022867-3023767 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 124)"
+3027009-3027909 midi: text-verbose: "Channel 1: note on (note = 56 'G#2', velocity = 124)"
+3031067-3031966 midi: text-verbose: "Channel 1: note on (note = 61 'C#3', velocity = 127)"
+3035192-3036091 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 127)"
+3039264-3040164 midi: text-verbose: "Channel 1: note on (note = 69 'A3', velocity = 122)"
+3046490-3047389 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 120)"
+3050631-3051531 midi: text-verbose: "Channel 1: note on (note = 60 'C3', velocity = 124)"
+3054689-3055589 midi: text-verbose: "Channel 1: note on (note = 65 'F3', velocity = 120)"
 3171500-3171756 midi: text-verbose: "System realtime message: active sensing"
-3211425-3212325 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 114)"
-3227025-3227925 midi: text-verbose: "Channel 1: note on (note = 50, velocity = 10)"
-3239188-3240088 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 117)"
+3211425-3212325 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 114)"
+3227025-3227925 midi: text-verbose: "Channel 1: note on (note = 50 'D2', velocity = 10)"
+3239188-3240088 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 117)"
 3330924-3331180 midi: text-verbose: "System realtime message: active sensing"
-3456401-3457300 midi: text-verbose: "Channel 1: note off (note = 61, velocity = 115)"
-3474012-3474912 midi: text-verbose: "Channel 1: note off (note = 60, velocity = 115)"
-3478086-3478987 midi: text-verbose: "Channel 1: note off (note = 56, velocity = 124)"
-3482229-3483129 midi: text-verbose: "Channel 1: note off (note = 50, velocity = 120)"
+3456401-3457300 midi: text-verbose: "Channel 1: note off (note = 61 'C#3', velocity = 115)"
+3474012-3474912 midi: text-verbose: "Channel 1: note off (note = 60 'C3', velocity = 115)"
+3478086-3478987 midi: text-verbose: "Channel 1: note off (note = 56 'G#2', velocity = 124)"
+3482229-3483129 midi: text-verbose: "Channel 1: note off (note = 50 'D2', velocity = 120)"
 3491310-3491566 midi: text-verbose: "System realtime message: active sensing"
-3494683-3495583 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 119)"
-3498814-3499714 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 120)"
-3502872-3503772 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 119)"
-3507006-3507907 midi: text-verbose: "Channel 1: note off (note = 65, velocity = 122)"
-3511072-3511973 midi: text-verbose: "Channel 1: note off (note = 69, velocity = 122)"
+3494683-3495583 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 119)"
+3498814-3499714 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 120)"
+3502872-3503772 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 119)"
+3507006-3507907 midi: text-verbose: "Channel 1: note off (note = 65 'F3', velocity = 122)"
+3511072-3511973 midi: text-verbose: "Channel 1: note off (note = 69 'A3', velocity = 122)"
 3652321-3652577 midi: text-verbose: "System realtime message: active sensing"
 3808795-3809051 midi: text-verbose: "System realtime message: active sensing"
 3962964-3963220 midi: text-verbose: "System realtime message: active sensing"
 4117129-4117385 midi: text-verbose: "System realtime message: active sensing"
 4273300-4273556 midi: text-verbose: "System realtime message: active sensing"
-4402509-4403410 midi: text-verbose: "Channel 1: note on (note = 49, velocity = 112)"
-4411766-4412666 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 120)"
-4427338-4428237 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 100)"
+4402509-4403410 midi: text-verbose: "Channel 1: note on (note = 49 'C#2', velocity = 112)"
+4411766-4412666 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 120)"
+4427338-4428237 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 100)"
 4431436-4431692 midi: text-verbose: "System realtime message: active sensing"
-4434919-4435819 midi: text-verbose: "Channel 1: note on (note = 61, velocity = 127)"
-4442136-4443036 midi: text-verbose: "Channel 1: note on (note = 60, velocity = 127)"
-4448144-4449044 midi: text-verbose: "Channel 1: note on (note = 59, velocity = 126)"
-4452276-4453177 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 124)"
-4459547-4460447 midi: text-verbose: "Channel 1: note on (note = 67, velocity = 122)"
-4506484-4507385 midi: text-verbose: "Channel 1: note off (note = 49, velocity = 124)"
-4530403-4531303 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 107)"
-4539594-4540494 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 121)"
-4555179-4556079 midi: text-verbose: "Channel 1: note off (note = 59, velocity = 121)"
-4562459-4563360 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 116)"
-4566527-4567427 midi: text-verbose: "Channel 1: note off (note = 60, velocity = 121)"
-4570666-4571566 midi: text-verbose: "Channel 1: note off (note = 61, velocity = 120)"
-4582826-4583727 midi: text-verbose: "Channel 1: note off (note = 67, velocity = 114)"
+4434919-4435819 midi: text-verbose: "Channel 1: note on (note = 61 'C#3', velocity = 127)"
+4442136-4443036 midi: text-verbose: "Channel 1: note on (note = 60 'C3', velocity = 127)"
+4448144-4449044 midi: text-verbose: "Channel 1: note on (note = 59 'B2', velocity = 126)"
+4452276-4453177 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 124)"
+4459547-4460447 midi: text-verbose: "Channel 1: note on (note = 67 'G3', velocity = 122)"
+4506484-4507385 midi: text-verbose: "Channel 1: note off (note = 49 'C#2', velocity = 124)"
+4530403-4531303 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 107)"
+4539594-4540494 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 121)"
+4555179-4556079 midi: text-verbose: "Channel 1: note off (note = 59 'B2', velocity = 121)"
+4562459-4563360 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 116)"
+4566527-4567427 midi: text-verbose: "Channel 1: note off (note = 60 'C3', velocity = 121)"
+4570666-4571566 midi: text-verbose: "Channel 1: note off (note = 61 'C#3', velocity = 120)"
+4582826-4583727 midi: text-verbose: "Channel 1: note off (note = 67 'G3', velocity = 114)"
 4600412-4600668 midi: text-verbose: "System realtime message: active sensing"
-4620470-4621370 midi: text-verbose: "Channel 1: note on (note = 55, velocity = 124)"
-4623426-4624325 midi: text-verbose: "Channel 1: note on (note = 54, velocity = 126)"
-4626359-4627259 midi: text-verbose: "Channel 1: note on (note = 57, velocity = 124)"
-4629306-4630207 midi: text-verbose: "Channel 1: note on (note = 52, velocity = 118)"
-4639182-4640082 midi: text-verbose: "Channel 1: note on (note = 53, velocity = 118)"
-4643386-4644286 midi: text-verbose: "Channel 1: note on (note = 62, velocity = 122)"
-4647424-4648323 midi: text-verbose: "Channel 1: note on (note = 63, velocity = 127)"
-4651604-4652505 midi: text-verbose: "Channel 1: note on (note = 66, velocity = 124)"
-4655647-4656548 midi: text-verbose: "Channel 1: note on (note = 64, velocity = 122)"
-4664791-4665692 midi: text-verbose: "Channel 1: note on (note = 69, velocity = 120)"
-4668969-4669869 midi: text-verbose: "Channel 1: note off (note = 63, velocity = 121)"
-4690929-4691829 midi: text-verbose: "Channel 1: note off (note = 53, velocity = 101)"
-4694964-4695864 midi: text-verbose: "Channel 1: note off (note = 57, velocity = 110)"
-4699136-4700036 midi: text-verbose: "Channel 1: note off (note = 54, velocity = 115)"
-4711259-4712160 midi: text-verbose: "Channel 1: note off (note = 52, velocity = 113)"
+4620470-4621370 midi: text-verbose: "Channel 1: note on (note = 55 'G2', velocity = 124)"
+4623426-4624325 midi: text-verbose: "Channel 1: note on (note = 54 'F#2', velocity = 126)"
+4626359-4627259 midi: text-verbose: "Channel 1: note on (note = 57 'A2', velocity = 124)"
+4629306-4630207 midi: text-verbose: "Channel 1: note on (note = 52 'E2', velocity = 118)"
+4639182-4640082 midi: text-verbose: "Channel 1: note on (note = 53 'F2', velocity = 118)"
+4643386-4644286 midi: text-verbose: "Channel 1: note on (note = 62 'D3', velocity = 122)"
+4647424-4648323 midi: text-verbose: "Channel 1: note on (note = 63 'D#3', velocity = 127)"
+4651604-4652505 midi: text-verbose: "Channel 1: note on (note = 66 'F#3', velocity = 124)"
+4655647-4656548 midi: text-verbose: "Channel 1: note on (note = 64 'E3', velocity = 122)"
+4664791-4665692 midi: text-verbose: "Channel 1: note on (note = 69 'A3', velocity = 120)"
+4668969-4669869 midi: text-verbose: "Channel 1: note off (note = 63 'D#3', velocity = 121)"
+4690929-4691829 midi: text-verbose: "Channel 1: note off (note = 53 'F2', velocity = 101)"
+4694964-4695864 midi: text-verbose: "Channel 1: note off (note = 57 'A2', velocity = 110)"
+4699136-4700036 midi: text-verbose: "Channel 1: note off (note = 54 'F#2', velocity = 115)"
+4711259-4712160 midi: text-verbose: "Channel 1: note off (note = 52 'E2', velocity = 113)"
 4771823-4772079 midi: text-verbose: "System realtime message: active sensing"
-4839921-4840822 midi: text-verbose: "Channel 1: note off (note = 69, velocity = 115)"
-4850397-4851297 midi: text-verbose: "Channel 1: note off (note = 55, velocity = 119)"
-4853337-4854237 midi: text-verbose: "Channel 1: note off (note = 62, velocity = 119)"
-4856288-4857189 midi: text-verbose: "Channel 1: note off (note = 64, velocity = 120)"
-4864218-4865118 midi: text-verbose: "Channel 1: note off (note = 66, velocity = 121)"
+4839921-4840822 midi: text-verbose: "Channel 1: note off (note = 69 'A3', velocity = 115)"
+4850397-4851297 midi: text-verbose: "Channel 1: note off (note = 55 'G2', velocity = 119)"
+4853337-4854237 midi: text-verbose: "Channel 1: note off (note = 62 'D3', velocity = 119)"
+4856288-4857189 midi: text-verbose: "Channel 1: note off (note = 64 'E3', velocity = 120)"
+4864218-4865118 midi: text-verbose: "Channel 1: note off (note = 66 'F#3', velocity = 121)"
 4930858-4931114 midi: text-verbose: "System realtime message: active sensing"

diff --git a/decoder/test/midi/sysex_vendor_specific.output b/decoder/test/midi/sysex_vendor_specific.output
new file mode 100644 (file)
index 0000000..3407fb2
--- /dev/null
+++ b/decoder/test/midi/sysex_vendor_specific.output
@@ -0,0 +1,6 @@
+7-69 midi: text-verbose: "SysEx: truncated manufacturer code (<1 bytes)"
+81-180 midi: text-verbose: "SysEx: truncated manufacturer code (<3 bytes)"
+192-365 midi: text-verbose: "SysEx: for 'Strand Lighting' with payload <empty>"
+377-476 midi: text-verbose: "SysEx: for 'undefined (0x7c)' with payload <empty>"
+488-661 midi: text-verbose: "SysEx: for 'undefined (0x00 0x3f 0x7f)' with payload <empty>"
+673-883 midi: text-verbose: "SysEx: for 'Fender' with payload 0x01 0x02 0x03 "

diff --git a/decoder/test/midi/system_common.output b/decoder/test/midi/system_common.output
new file mode 100644 (file)
index 0000000..10698ab
--- /dev/null
+++ b/decoder/test/midi/system_common.output
@@ -0,0 +1,16 @@
+7-106 midi: text-verbose: "System Common: song position pointer 0x39 0x60 (12345)"
+118-180 midi: text-verbose: "System Common: song select number 66"
+192-217 midi: text-verbose: "System Common: undefined 0xf4"
+229-254 midi: text-verbose: "System Common: undefined 0xf5"
+266-291 midi: text-verbose: "System Common: tune request"
+303-365 midi: text-verbose: "System Common: MIDI time code quarter frame of frame count LS nibble, value 0xd"
+377-439 midi: text-verbose: "System Common: MIDI time code quarter frame of frame count MS nibble, value 0x0"
+451-513 midi: text-verbose: "System Common: MIDI time code quarter frame of seconds count LS nibble, value 0x8"
+525-587 midi: text-verbose: "System Common: MIDI time code quarter frame of seconds count MS nibble, value 0x3"
+599-661 midi: text-verbose: "System Common: MIDI time code quarter frame of minutes count LS nibble, value 0x2"
+673-735 midi: text-verbose: "System Common: MIDI time code quarter frame of minutes count MS nibble, value 0x2"
+747-809 midi: text-verbose: "System Common: MIDI time code quarter frame of hours count LS nibble, value 0xc"
+821-883 midi: text-verbose: "System Common: MIDI time code quarter frame of hours count MS nibble and SMPTE type, value 0x0 for 24 frames/second"
+895-957 midi: text-verbose: "System Common: MIDI time code quarter frame of hours count MS nibble and SMPTE type, value 0x2 for 25 frames/second"
+969-1031 midi: text-verbose: "System Common: MIDI time code quarter frame of hours count MS nibble and SMPTE type, value 0x4 for 30 frames/second (drop-frame)"
+1043-1104 midi: text-verbose: "System Common: MIDI time code quarter frame of hours count MS nibble and SMPTE type, value 0x6 for 30 frames/second (non-drop)"

diff --git a/decoder/test/midi/test.conf b/decoder/test/midi/test.conf
index 5fadc9f2084a4c11af7228c40967a8990bd7c512..baf5d308a8112abe580e50470680d14374980b3f 100644 (file)
--- a/decoder/test/midi/test.conf
+++ b/decoder/test/midi/test.conf
@@ -39,3 +39,53 @@ test rockband_multiple_keys
        stack uart midi
        input uart/midi/rockband_wireless_keyboard_wii/midi_multiple_keys.sr
        output midi annotation match rockband_multiple_keys.output
+
+test falcosoft_channel_pressure_program_change_pitch_bend
+       protocol-decoder uart channel rx=0 option baudrate=31250
+       protocol-decoder midi
+       stack uart midi
+       input uart/midi/falcosoft_midi_player_3/initializes_for_dogos2_full.mid.sr
+       output midi annotation match falcosoft_channel_pressure_program_change_pitch_bend.output
+
+test realtime_messages
+       protocol-decoder uart channel rx=0 option baudrate=31250
+       protocol-decoder midi
+       stack uart midi
+       input uart/midi/artifically_generated/realtime_messages.sr
+       output midi annotation match realtime_messages.output
+
+test channel_modes
+       protocol-decoder uart channel rx=0 option baudrate=31250
+       protocol-decoder midi
+       stack uart midi
+       input uart/midi/artifically_generated/channel_modes.sr
+       output midi annotation match channel_modes.output
+
+test controller_misc
+       protocol-decoder uart channel rx=0 option baudrate=31250
+       protocol-decoder midi
+       stack uart midi
+       input uart/midi/artifically_generated/controller_misc.sr
+       output midi annotation match controller_misc.output
+
+test polyphonic_pressure
+       protocol-decoder uart channel rx=0 option baudrate=31250
+       protocol-decoder midi
+       stack uart midi
+       input uart/midi/artifically_generated/polyphonic_pressure.sr
+       output midi annotation match polyphonic_pressure.output
+
+test sysex_vendor_specific
+       protocol-decoder uart channel rx=0 option baudrate=31250
+       protocol-decoder midi
+       stack uart midi
+       input uart/midi/artifically_generated/sysex_vendor_specific.sr
+       output midi annotation match sysex_vendor_specific.output
+
+test system_common
+       protocol-decoder uart channel rx=0 option baudrate=31250
+       protocol-decoder midi
+       stack uart midi
+       input uart/midi/artifically_generated/system_common.sr
+       output midi annotation match system_common.output
+