smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

more corrections for libmidi++ (N)RPN API

Browse source
This commit is contained in:
Paul Davis 2015-11-23 12:25:59 -05:00
parent 9d46da4e6f
commit 3095cbc4f9
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/midi++2/channel.cc
View file

@ -174,12 +174,12 @@ Channel::maybe_process_rpns (Parser& parser, EventTwoBytes *tb)
case 0x60: case 0x60:
/* data increment */ /* data increment */
_nrpn_state = RPNState (_nrpn_state|HaveValue); _nrpn_state = RPNState (_nrpn_state|HaveValue);
parser.channel_nrpn_increment[_channel_number] (parser, rpn_id, 1); /* EMIT SIGNAL */ parser.channel_nrpn_change[_channel_number] (parser, rpn_id, 1); /* EMIT SIGNAL */
return true; return true;
case 0x61: case 0x61:
/* data decrement */ /* data decrement */
_nrpn_state = RPNState (_nrpn_state|HaveValue); _nrpn_state = RPNState (_nrpn_state|HaveValue);
parser.channel_nrpn_decrement[_channel_number] (parser, rpn_id, -1); /* EMIT SIGNAL */ parser.channel_nrpn_change[_channel_number] (parser, rpn_id, -1); /* EMIT SIGNAL */
return true; return true;
case 0x06: case 0x06:
/* data entry MSB */ /* data entry MSB */
@ -214,12 +214,12 @@ Channel::maybe_process_rpns (Parser& parser, EventTwoBytes *tb)
case 0x60: case 0x60:
/* data increment */ /* data increment */
_rpn_state = RPNState (_rpn_state|HaveValue); _rpn_state = RPNState (_rpn_state|HaveValue);
parser.channel_rpn_increment[_channel_number] (parser, rpn_id, 1); /* EMIT SIGNAL */ parser.channel_rpn_change[_channel_number] (parser, rpn_id, 1); /* EMIT SIGNAL */
return true; return true;
case 0x61: case 0x61:
/* data decrement */ /* data decrement */
_rpn_state = RPNState (_rpn_state|HaveValue); _rpn_state = RPNState (_rpn_state|HaveValue);
parser.channel_rpn_decrement[_channel_number] (parser, rpn_id, -1); /* EMIT SIGNAL */ parser.channel_rpn_change[_channel_number] (parser, rpn_id, -1); /* EMIT SIGNAL */
return true; return true;
case 0x06: case 0x06:
/* data entry MSB */ /* data entry MSB */

10
libs/midi++2/midi++/parser.h
View file

@ -77,12 +77,10 @@ class LIBMIDIPP_API Parser {
TwoByteSignal channel_controller[16]; TwoByteSignal channel_controller[16];
ZeroByteSignal channel_active_preparse[16]; ZeroByteSignal channel_active_preparse[16];
ZeroByteSignal channel_active_postparse[16]; ZeroByteSignal channel_active_postparse[16];
RPNSignal channel_rpn[16]; RPNValueSignal channel_rpn[16];
RPNSignal channel_nrpn[16]; RPNValueSignal channel_nrpn[16];
RPNValueSignal channel_rpn_increment[16]; RPNSignal channel_rpn_change[16];
RPNValueSignal channel_rpn_decrement[16]; RPNSignal channel_nrpn_change[16];
RPNValueSignal channel_nrpn_increment[16];
RPNValueSignal channel_nrpn_decrement[16];
OneByteSignal mtc_quarter_frame; /* see below for more useful signals */ OneByteSignal mtc_quarter_frame; /* see below for more useful signals */
Signal mtc; Signal mtc;