Seich
/
arduino_midi_library
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Avoid redundant call

This commit is contained in:
Francois Best 2018-10-11 10:33:07 +02:00
parent 04ae12d9ad
commit 42b98a78cf
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MIDI.hpp
View File

@ -676,8 +676,10 @@ template<class SerialPort, class Settings>
bool MidiInterface<SerialPort, Settings>::parse() bool MidiInterface<SerialPort, Settings>::parse()
{ {
if (mSerial.available() == 0) if (mSerial.available() == 0)
{
// No data available. // No data available.
return false; return false;
}
// Parsing algorithm: // Parsing algorithm:
// Get a byte from the serial buffer. // Get a byte from the serial buffer.
@ -726,7 +728,9 @@ bool MidiInterface<SerialPort, Settings>::parse()
// It will be updated upon completion of this message. // It will be updated upon completion of this message.
} }
switch (getTypeFromStatusByte(mPendingMessage[0])) const MidiType pendingType = getTypeFromStatusByte(mPendingMessage[0]);
switch (pendingType)
{ {
// 1 byte messages // 1 byte messages
case Start: case Start:
@ -737,7 +741,7 @@ bool MidiInterface<SerialPort, Settings>::parse()
case SystemReset: case SystemReset:
case TuneRequest: case TuneRequest:
// Handle the message type directly here. // Handle the message type directly here.
mMessage.type = getTypeFromStatusByte(mPendingMessage[0]); mMessage.type = pendingType;
mMessage.channel = 0; mMessage.channel = 0;
mMessage.data1 = 0; mMessage.data1 = 0;
mMessage.data2 = 0; mMessage.data2 = 0;
@ -788,7 +792,7 @@ bool MidiInterface<SerialPort, Settings>::parse()
if (mPendingMessageIndex >= (mPendingMessageExpectedLenght - 1)) if (mPendingMessageIndex >= (mPendingMessageExpectedLenght - 1))
{ {
// Reception complete // Reception complete
mMessage.type = getTypeFromStatusByte(mPendingMessage[0]); mMessage.type = pendingType;
mMessage.channel = getChannelFromStatusByte(mPendingMessage[0]); mMessage.channel = getChannelFromStatusByte(mPendingMessage[0]);
mMessage.data1 = mPendingMessage[1]; mMessage.data1 = mPendingMessage[1];
mMessage.data2 = 0; // Completed new message has 1 data byte mMessage.data2 = 0; // Completed new message has 1 data byte