From f59785606c04ab5595d3e842420449029f5865d2 Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Tue, 1 Dec 2020 18:04:01 +0000
Subject: [PATCH] MPEInstrument:  Reset last received values when setting a new
 MPE zone layout

---
 .../mpe/juce_MPEInstrument.cpp                | 38 +++++++++++++++----
 .../mpe/juce_MPEInstrument.h                  |  2 +
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp
index aa155bcfc6..84df6f4693 100644
--- a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp
+++ b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp
@@ -27,30 +27,33 @@ namespace
 {
     const uint8 noLSBValueReceived = 0xff;
     const Range<int> allChannels { 1, 17 };
+
+    template <typename Range, typename Value>
+    void mpeInstrumentFill (Range& range, const Value& value)
+    {
+        std::fill (std::begin (range), std::end (range), value);
+    }
 }
 
 //==============================================================================
 MPEInstrument::MPEInstrument() noexcept
 {
-    std::fill_n (lastPressureLowerBitReceivedOnChannel, 16, noLSBValueReceived);
-    std::fill_n (lastTimbreLowerBitReceivedOnChannel, 16, noLSBValueReceived);
-    std::fill_n (isMemberChannelSustained, 16, false);
+    mpeInstrumentFill (lastPressureLowerBitReceivedOnChannel, noLSBValueReceived);
+    mpeInstrumentFill (lastTimbreLowerBitReceivedOnChannel, noLSBValueReceived);
+    mpeInstrumentFill (isMemberChannelSustained, false);
 
     pitchbendDimension.value = &MPENote::pitchbend;
     pressureDimension.value = &MPENote::pressure;
     timbreDimension.value = &MPENote::timbre;
 
-    // the default value for pressure is 0, for all other dimension it is centre (= default MPEValue)
-    std::fill_n (pressureDimension.lastValueReceivedOnChannel, 16, MPEValue::minValue());
+    resetLastReceivedValues();
 
     legacyMode.isEnabled = false;
     legacyMode.pitchbendRange = 2;
     legacyMode.channelRange = allChannels;
 }
 
-MPEInstrument::~MPEInstrument()
-{
-}
+MPEInstrument::~MPEInstrument() = default;
 
 //==============================================================================
 MPEZoneLayout MPEInstrument::getZoneLayout() const noexcept
@@ -58,6 +61,23 @@ MPEZoneLayout MPEInstrument::getZoneLayout() const noexcept
     return zoneLayout;
 }
 
+void MPEInstrument::resetLastReceivedValues()
+{
+    struct Defaults
+    {
+        MPEDimension& dimension;
+        MPEValue defaultValue;
+    };
+
+    // The default value for pressure is 0, for all other dimensions it is centre
+    for (const auto& pair : { Defaults { pressureDimension,  MPEValue::minValue() },
+                              Defaults { pitchbendDimension, MPEValue::centreValue() },
+                              Defaults { timbreDimension,    MPEValue::centreValue() } })
+    {
+        mpeInstrumentFill (pair.dimension.lastValueReceivedOnChannel, pair.defaultValue);
+    }
+}
+
 void MPEInstrument::setZoneLayout (MPEZoneLayout newLayout)
 {
     releaseAllNotes();
@@ -65,6 +85,8 @@ void MPEInstrument::setZoneLayout (MPEZoneLayout newLayout)
     const ScopedLock sl (lock);
     legacyMode.isEnabled = false;
     zoneLayout = newLayout;
+
+    resetLastReceivedValues();
 }
 
 //==============================================================================
diff --git a/modules/juce_audio_basics/mpe/juce_MPEInstrument.h b/modules/juce_audio_basics/mpe/juce_MPEInstrument.h
index 2653702543..3db823f5f5 100644
--- a/modules/juce_audio_basics/mpe/juce_MPEInstrument.h
+++ b/modules/juce_audio_basics/mpe/juce_MPEInstrument.h
@@ -376,6 +376,8 @@ private:
     LegacyMode legacyMode;
     MPEDimension pitchbendDimension, pressureDimension, timbreDimension;
 
+    void resetLastReceivedValues();
+
     void updateDimension (int midiChannel, MPEDimension&, MPEValue);
     void updateDimensionMaster (bool, MPEDimension&, MPEValue);
     void updateDimensionForNote (MPENote&, MPEDimension&, MPEValue);