From 21a4ad23dfa1f3d6c673418de910bdfcf06cfca3 Mon Sep 17 00:00:00 2001 From: Francois Best Date: Sat, 8 Oct 2022 14:50:54 +0200 Subject: [PATCH] chore: Fix build (things got lost in merge) --- src/MIDI.h | 1 + src/MIDI.hpp | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/MIDI.h b/src/MIDI.h index 67d316a..5bc2bc5 100644 --- a/src/MIDI.h +++ b/src/MIDI.h @@ -294,6 +294,7 @@ private: MidiMessage mMessage; unsigned long mLastMessageSentTime; unsigned long mLastMessageReceivedTime; + unsigned long mSenderActiveSensingPeriodicity; bool mReceiverActiveSensingActive; int8_t mLastError; diff --git a/src/MIDI.hpp b/src/MIDI.hpp index 4cd78d5..2562f24 100644 --- a/src/MIDI.hpp +++ b/src/MIDI.hpp @@ -42,9 +42,9 @@ inline MidiInterface::MidiInterface(Transport& in , mCurrentNrpnNumber(0xffff) , mLastMessageSentTime(0) , mLastMessageReceivedTime(0) + , mSenderActiveSensingPeriodicity(Settings::SenderActiveSensingPeriodicity) , mReceiverActiveSensingActive(false) , mLastError(0) - , mSenderActiveSensingPeriodicity(Settings::SenderActiveSensingPeriodicity) { static_assert(!(Settings::UseSenderActiveSensing && Settings::UseReceiverActiveSensing), "UseSenderActiveSensing and UseReceiverActiveSensing can't be both set to true."); } @@ -82,7 +82,7 @@ MidiInterface& MidiInterface::read(Channel inChannel sendActiveSensing(); } - // Once an Active Sensing message is received, the unit will begin monitoring - // the intervalbetween all subsequent messages. If there is an interval of 420 ms - // or longer betweenmessages while monitoring is active, the same processing - // as when All Sound Off, All Notes Off,and Reset All Controllers messages are + // Once an Active Sensing message is received, the unit will begin monitoring + // the intervalbetween all subsequent messages. If there is an interval of 420 ms + // or longer betweenmessages while monitoring is active, the same processing + // as when All Sound Off, All Notes Off,and Reset All Controllers messages are // received will be carried out. The unit will then stopmonitoring the message interval. if (Settings::UseReceiverActiveSensing && mReceiverActiveSensingActive) { @@ -1396,7 +1396,7 @@ void MidiInterface::launchCallback() */ template -inline void MidiInterface::turnThruOn(ThruFilterCallback fptr) +inline MidiInterface& MidiInterface::turnThruOn(ThruFilterCallback fptr) { mThruFilterCallback = fptr; return *this;