#30 Cleanup MIDI channels matching.

Author: Archie3d

Source/PluginProcessor.cpp

@@ -19,6 +19,7 @@
 
 #include <chrono>
 
+#include "aeolus/globals.h"
 #include "PluginProcessor.h"
 #include "PluginEditor.h"
 
@@ -224,9 +225,9 @@ void AeolusAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, juce::
     // when they first compile a plugin, but obviously you don't need to keep
     // this code if your algorithm always overwrites all the output channels.
     for (auto i = totalNumInputChannels; i < totalNumOutputChannels; ++i)
-        buffer.clear (i, 0, buffer.getNumSamples());
+        buffer.clear(i, 0, buffer.getNumSamples());
 
-    processMidi (midiMessages);
+    processMidi(midiMessages);
 
 #if AEOLUS_MULTIBUS_OUTPUT
 
@@ -274,9 +275,7 @@ void AeolusAudioProcessor::processMidi(juce::MidiBuffer& midiMessages)
 
         const int mask{ _engine.getMIDIControlChannelsMask() };
 
-        if ((ch == 0 || (mask & (ch - 1)) != 0)
-            && msg.isController()) {
-
+        if (aeolus::midi::matchChannelToMask(mask, ch) && msg.isController()) {
             int cc = msg.getControllerNumber();
             const float value = float(msg.getControllerValue()) / 127.0f;
 

Source/aeolus/division.cpp

@@ -17,6 +17,7 @@
 //
 // ----------------------------------------------------------------------------
 
+#include "globals.h"
 #include "division.h"
 #include "engine.h"
 
@@ -317,10 +318,8 @@ void Division::getAvailableRange(int& minNote, int& maxNote) const noexcept
 
 bool Division::isForMIDIChannel(int channel) const noexcept
 {
-    const int mask{_midiChannelsMask.load() };
-
-    return channel == 0 // broadcast message
-        || (mask & (1 << (channel - 1))) != 0;
+    const int mask{ _midiChannelsMask.load() };
+    return midi::matchChannelToMask(mask, channel);
 }
 
 void Division::setTremulantEnabled(bool ena) noexcept

Source/aeolus/engine.cpp

@@ -535,10 +535,8 @@ void Engine::process(AudioBuffer<float>& out, bool isNonRealtime)
 
 void Engine::processMIDIMessage(const MidiMessage& message)
 {
-    const int mask = getMIDIControlChannelsMask();
-
     // Process global CCs
-    if (message.getChannel() == 0 || (mask & (message.getChannel() - 1)) != 0) {
+    if (midi::matchChannelToMask(getMIDIControlChannelsMask(), message.getChannel())) {
         processControlMIDIMessage(message);
     }
 
@@ -557,15 +555,13 @@ void Engine::noteOn(int note, int midiChannel)
 {
     clearDivisionsTriggerFlag();
 
-    const int mask{ getMIDIControlChannelsMask() };
-
     bool handled{ false };
 
     // Handle key switches
     // @note If a key switch falls within the playable range we need to make
     //       sure we don't process corresponding note-on event, otherwise
     //       navigating the sequencer will create a spurious sounds.
-    if (midiChannel == 0 || (mask & (midiChannel - 1)) != 0) {
+    if (midi::matchChannelToMask(getMIDIControlChannelsMask(), midiChannel)) {
         if (isKeySwitchBackward(note)) {
             _sequencer->stepBackward();
             handled = true;

Source/aeolus/globals.cpp

@@ -53,4 +53,24 @@ float exp2ap(float x)
 
 } // namespace math
 
+//==============================================================================
+
+namespace midi {
+
+int channelToMask(int channel)
+{
+    // Zero means any MIDI channel.
+    if (channel <= 0)
+        return (1 << 16) - 1;
+
+    return 1 << (channel - 1);
+}
+
+bool matchChannelToMask(int mask, int channel)
+{
+    return (mask & channelToMask(channel)) != 0;
+}
+
+} // namespace midi
+
 AEOLUS_NAMESPACE_END

Source/aeolus/globals.h

@@ -204,15 +204,21 @@ struct Cos<B, A, double>
     constexpr static double value = SinCosSeries<1, 33, B, A>::value;
 };
 
-//----------------------------------------------------------
-
 template <typename T>
 constexpr bool isPowerOfTwo(T v)
 {
     return (v & (v - 1)) == 0;
 }
 
-
 } // namespace math
 
+//----------------------------------------------------------
+
+namespace midi {
+
+    int channelToMask(int channel);
+    bool matchChannelToMask(int mask, int channel);
+
+} // namespace midi
+
 AEOLUS_NAMESPACE_END