Removed unreacheable code, inlined stuff.

This commit is contained in:
Francois Best 2016-10-29 16:09:04 +02:00
parent 2df247489a
commit 4ab8728c67
1 changed files with 9 additions and 14 deletions

View File

@ -882,7 +882,7 @@ bool MidiInterface<SerialPort, Settings>::parse()
} }
default: default:
break; break; // LCOV_EXCL_LINE - Coverage blind spot
} }
} }
@ -983,9 +983,6 @@ inline bool MidiInterface<SerialPort, Settings>::inputFilter(Channel inChannel)
// This method handles recognition of channel // This method handles recognition of channel
// (to know if the message is destinated to the Arduino) // (to know if the message is destinated to the Arduino)
if (mMessage.type == InvalidType)
return false;
// First, check if the received message is Channel // First, check if the received message is Channel
if (mMessage.type >= NoteOff && mMessage.type <= PitchBend) if (mMessage.type >= NoteOff && mMessage.type <= PitchBend)
{ {
@ -1265,36 +1262,33 @@ void MidiInterface<SerialPort, Settings>::launchCallback()
@see Thru::Mode @see Thru::Mode
*/ */
template<class SerialPort, class Settings> template<class SerialPort, class Settings>
void MidiInterface<SerialPort, Settings>::setThruFilterMode(Thru::Mode inThruFilterMode) inline void MidiInterface<SerialPort, Settings>::setThruFilterMode(Thru::Mode inThruFilterMode)
{ {
mThruFilterMode = inThruFilterMode; mThruFilterMode = inThruFilterMode;
if (mThruFilterMode != Thru::Off) mThruActivated = mThruFilterMode != Thru::Off;
mThruActivated = true;
else
mThruActivated = false;
} }
template<class SerialPort, class Settings> template<class SerialPort, class Settings>
Thru::Mode MidiInterface<SerialPort, Settings>::getFilterMode() const inline Thru::Mode MidiInterface<SerialPort, Settings>::getFilterMode() const
{ {
return mThruFilterMode; return mThruFilterMode;
} }
template<class SerialPort, class Settings> template<class SerialPort, class Settings>
bool MidiInterface<SerialPort, Settings>::getThruState() const inline bool MidiInterface<SerialPort, Settings>::getThruState() const
{ {
return mThruActivated; return mThruActivated;
} }
template<class SerialPort, class Settings> template<class SerialPort, class Settings>
void MidiInterface<SerialPort, Settings>::turnThruOn(Thru::Mode inThruFilterMode) inline void MidiInterface<SerialPort, Settings>::turnThruOn(Thru::Mode inThruFilterMode)
{ {
mThruActivated = true; mThruActivated = true;
mThruFilterMode = inThruFilterMode; mThruFilterMode = inThruFilterMode;
} }
template<class SerialPort, class Settings> template<class SerialPort, class Settings>
void MidiInterface<SerialPort, Settings>::turnThruOff() inline void MidiInterface<SerialPort, Settings>::turnThruOff()
{ {
mThruActivated = false; mThruActivated = false;
mThruFilterMode = Thru::Off; mThruFilterMode = Thru::Off;
@ -1387,8 +1381,9 @@ void MidiInterface<SerialPort, Settings>::thruFilter(Channel inChannel)
case TimeCodeQuarterFrame: case TimeCodeQuarterFrame:
sendTimeCodeQuarterFrame(mMessage.data1,mMessage.data2); sendTimeCodeQuarterFrame(mMessage.data1,mMessage.data2);
break; break;
default: default:
break; break; // LCOV_EXCL_LINE - Unreacheable code, but prevents unhandled case warning.
} }
} }
} }