Skip to content

Commit 21a4ad2

Browse files
committed
chore: Fix build (things got lost in merge)
1 parent 12f0586 commit 21a4ad2

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/MIDI.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ class MidiInterface
294294
MidiMessage mMessage;
295295
unsigned long mLastMessageSentTime;
296296
unsigned long mLastMessageReceivedTime;
297+
unsigned long mSenderActiveSensingPeriodicity;
297298
bool mReceiverActiveSensingActive;
298299
int8_t mLastError;
299300

src/MIDI.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ inline MidiInterface<Transport, Settings, Platform>::MidiInterface(Transport& in
4242
, mCurrentNrpnNumber(0xffff)
4343
, mLastMessageSentTime(0)
4444
, mLastMessageReceivedTime(0)
45+
, mSenderActiveSensingPeriodicity(Settings::SenderActiveSensingPeriodicity)
4546
, mReceiverActiveSensingActive(false)
4647
, mLastError(0)
47-
, mSenderActiveSensingPeriodicity(Settings::SenderActiveSensingPeriodicity)
4848
{
4949
static_assert(!(Settings::UseSenderActiveSensing && Settings::UseReceiverActiveSensing), "UseSenderActiveSensing and UseReceiverActiveSensing can't be both set to true.");
5050
}
@@ -82,7 +82,7 @@ MidiInterface<Transport, Settings, Platform>& MidiInterface<Transport, Settings,
8282
mCurrentRpnNumber = 0xffff;
8383
mCurrentNrpnNumber = 0xffff;
8484

85-
mLastMessageSentTime =
85+
mLastMessageSentTime =
8686
mLastMessageReceivedTime = Platform::now();
8787

8888
mMessage.valid = false;
@@ -769,10 +769,10 @@ inline bool MidiInterface<Transport, Settings, Platform>::read(Channel inChannel
769769
sendActiveSensing();
770770
}
771771

772-
// Once an Active Sensing message is received, the unit will begin monitoring
773-
// the intervalbetween all subsequent messages. If there is an interval of 420 ms
774-
// or longer betweenmessages while monitoring is active, the same processing
775-
// as when All Sound Off, All Notes Off,and Reset All Controllers messages are
772+
// Once an Active Sensing message is received, the unit will begin monitoring
773+
// the intervalbetween all subsequent messages. If there is an interval of 420 ms
774+
// or longer betweenmessages while monitoring is active, the same processing
775+
// as when All Sound Off, All Notes Off,and Reset All Controllers messages are
776776
// received will be carried out. The unit will then stopmonitoring the message interval.
777777
if (Settings::UseReceiverActiveSensing && mReceiverActiveSensingActive)
778778
{
@@ -1396,7 +1396,7 @@ void MidiInterface<Transport, Settings, Platform>::launchCallback()
13961396
*/
13971397

13981398
template<class Transport, class Settings, class Platform>
1399-
inline void MidiInterface<Transport, Settings, Platform>::turnThruOn(ThruFilterCallback fptr)
1399+
inline MidiInterface<Transport, Settings, Platform>& MidiInterface<Transport, Settings, Platform>::turnThruOn(ThruFilterCallback fptr)
14001400
{
14011401
mThruFilterCallback = fptr;
14021402
return *this;

0 commit comments

Comments
 (0)