This commit is contained in:
Francois Best 2014-02-13 21:44:38 +01:00
parent 8ee40445f4
commit ded1479994
1 changed files with 5 additions and 9 deletions

View File

@ -1117,8 +1117,8 @@ void MidiInterface<SerialPort>::thruFilter(Channel inChannel)
mMessage.data1, mMessage.data1,
mMessage.data2, mMessage.data2,
mMessage.channel); mMessage.channel);
return;
break; break;
case SameChannel: case SameChannel:
if (filter_condition) if (filter_condition)
{ {
@ -1126,9 +1126,9 @@ void MidiInterface<SerialPort>::thruFilter(Channel inChannel)
mMessage.data1, mMessage.data1,
mMessage.data2, mMessage.data2,
mMessage.channel); mMessage.channel);
return;
} }
break; break;
case DifferentChannel: case DifferentChannel:
if (!filter_condition) if (!filter_condition)
{ {
@ -1136,14 +1136,15 @@ void MidiInterface<SerialPort>::thruFilter(Channel inChannel)
mMessage.data1, mMessage.data1,
mMessage.data2, mMessage.data2,
mMessage.channel); mMessage.channel);
return;
} }
break; break;
case Off: case Off:
// Do nothing. // Do nothing.
// Technically it's impossible to get there because // Technically it's impossible to get there because
// the case was already tested earlier. // the case was already tested earlier.
break; break;
default: default:
break; break;
} }
@ -1162,28 +1163,23 @@ void MidiInterface<SerialPort>::thruFilter(Channel inChannel)
case SystemReset: case SystemReset:
case TuneRequest: case TuneRequest:
sendRealTime(mMessage.type); sendRealTime(mMessage.type);
return;
break; break;
case SystemExclusive: case SystemExclusive:
// Send SysEx (0xF0 and 0xF7 are included in the buffer) // Send SysEx (0xF0 and 0xF7 are included in the buffer)
sendSysEx(mMessage.data1,mMessage.sysexArray,true); sendSysEx(getSysExArrayLength(), getSysExArray(), true);
return;
break; break;
case SongSelect: case SongSelect:
sendSongSelect(mMessage.data1); sendSongSelect(mMessage.data1);
return;
break; break;
case SongPosition: case SongPosition:
sendSongPosition(mMessage.data1 | ((unsigned)mMessage.data2<<7)); sendSongPosition(mMessage.data1 | ((unsigned)mMessage.data2<<7));
return;
break; break;
case TimeCodeQuarterFrame: case TimeCodeQuarterFrame:
sendTimeCodeQuarterFrame(mMessage.data1,mMessage.data2); sendTimeCodeQuarterFrame(mMessage.data1,mMessage.data2);
return;
break; break;
default: default:
break; break;