ardour/livetrax
13
0
Fork 0
Code

fix up boost signal return value so that the "edit" signal of MIDI::Parser works properly, and thus allows MIDI Clock etc.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6607 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-02-01 04:08:49 +00:00
parent 74c03b9fc0
commit ae1abc4ea6
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/midi++2/parser.cc
View File

@ -328,7 +328,7 @@ Parser::scanner (unsigned char inbyte)
bool statusbit;
// cerr << "parse: " << hex << (int) inbyte << dec << " state = " << state << " msgindex = " << msgindex << " runnable = " << runnable << endl;
/* Check active sensing early, so it doesn't interrupt sysex.
NOTE: active sense messages are not considered to fit under
@ -386,9 +386,11 @@ Parser::scanner (unsigned char inbyte)
}
if (rtmsg) {
if (edit (&inbyte, 1) >= 0 && !_offline) {
boost::optional<int> res = edit (&inbyte, 1);
if (res.get_value_or (1) >= 0 && !_offline) {
realtime_msg (inbyte);
}
}
return;
}
@ -419,17 +421,22 @@ Parser::scanner (unsigned char inbyte)
}
cerr << dec << endl;
#endif
if (msgindex > 0 && (edit.empty() || !(*edit (msgbuf, msgindex) >= 0))) {
if (!possible_mmc (msgbuf, msgindex) || _mmc_forward) {
if (!possible_mtc (msgbuf, msgindex) || _mtc_forward) {
if (!_offline) {
sysex (*this, msgbuf, msgindex);
if (msgindex > 0) {
boost::optional<int> res = edit (msgbuf, msgindex);
if (res.get_value_or (1) >= 0) {
if (!possible_mmc (msgbuf, msgindex) || _mmc_forward) {
if (!possible_mtc (msgbuf, msgindex) || _mtc_forward) {
if (!_offline) {
sysex (*this, msgbuf, msgindex);
}
}
}
if (!_offline) {
any (*this, msgbuf, msgindex);
}
}
if (!_offline) {
any (*this, msgbuf, msgindex);
}
}
}