From 699bbd43da5bada35ad701793445f91a6d7a1beb Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 21 Feb 2018 12:01:56 +0000 Subject: [PATCH] MPE: Check if channel is in use as a member channel before checking if it is a master channel in MPEInstrument::updateDimension() to ensure that messages are routed correctly --- modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp index 2897310e40..b730f4218a 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp @@ -379,11 +379,7 @@ void MPEInstrument::updateDimension (int midiChannel, MPEDimension& dimension, M if (notes.isEmpty()) return; - if (isMasterChannel (midiChannel)) - { - updateDimensionMaster (midiChannel == 1, dimension, value); - } - else if (isMemberChannel (midiChannel)) + if (isMemberChannel (midiChannel)) { if (dimension.trackingMode == allNotesOnChannel) { @@ -401,6 +397,10 @@ void MPEInstrument::updateDimension (int midiChannel, MPEDimension& dimension, M updateDimensionForNote (*note, dimension, value); } } + else if (isMasterChannel (midiChannel)) + { + updateDimensionMaster (midiChannel == 1, dimension, value); + } } //==============================================================================