Add a separate MIDI channel for swell.

Author: Archie3d

Source/PluginEditor.cpp

@@ -53,6 +53,8 @@ AeolusAudioProcessorEditor::AeolusAudioProcessorEditor (AeolusAudioProcessor& p)
     , _cancelButton{"Cancel"}
     , _midiControlChannelLabel{{}, {"Control channel"}}
     , _midiControlChannelComboBox{}
+    , _midiSwellChannelLabel{{}, {"Swell channel"}}
+    , _midiSwellChannelComboBox{}
 {
     setLookAndFeel(&ui::CustomLookAndFeel::getInstance());
 
@@ -181,19 +183,31 @@ AeolusAudioProcessorEditor::AeolusAudioProcessorEditor (AeolusAudioProcessor& p)
     addAndMakeVisible(_midiKeyboard);
 
     _midiControlChannelLabel.setColour(Label::textColourId, Colour(0x99, 0x99, 0x99));
+    _midiSwellChannelLabel.setColour(Label::textColourId, Colour(0x99, 0x99, 0x99));
+
     addAndMakeVisible(_midiControlChannelLabel);
+    addAndMakeVisible(_midiSwellChannelLabel);
 
     _midiControlChannelComboBox.addItem("All", 1);
+    _midiSwellChannelComboBox.addItem("All", 1);
+
     for (int i = 1; i <= 16; ++i) {
         _midiControlChannelComboBox.addItem(String(i), i + 1);
+        _midiSwellChannelComboBox.addItem(String(i), i + 1);
     }
 
     _midiControlChannelComboBox.setSelectedId(1 + _audioProcessor.getEngine().getMIDIControlChannel(), juce::dontSendNotification);
     _midiControlChannelComboBox.onChange = [this]() {
         _audioProcessor.getEngine().setMIDIControlChannel(_midiControlChannelComboBox.getSelectedId() - 1);
     };
 
+    _midiSwellChannelComboBox.setSelectedId(1 + _audioProcessor.getEngine().getMIDISwellChannel(), juce::dontSendNotification);
+    _midiSwellChannelComboBox.onChange = [this]() {
+        _audioProcessor.getEngine().setMIDISwellChannel(_midiSwellChannelComboBox.getSelectedId() - 1);
+    };
+
     addAndMakeVisible(_midiControlChannelComboBox);
+    addAndMakeVisible(_midiSwellChannelComboBox);
 
     // Overlay and sequencer must go on the very top
 
@@ -287,9 +301,13 @@ void AeolusAudioProcessorEditor::resized()
     _cancelButton.setColour(TextButton::buttonColourId, Colour(0x33, 0x33, 0x33));
     _cancelButton.setBounds((_midiKeyboard.getX() - 120)/2, getHeight() - 60, 60, 35);
 
-    int x = _midiKeyboard.getRight() + (getWidth() - _midiKeyboard.getRight() - 100) / 2;
+    int x = _midiKeyboard.getRight() + (getWidth() - _midiKeyboard.getRight() - 200) / 2;
+
     _midiControlChannelLabel.setBounds(x, _midiKeyboard.getY(), 100, 20);
-    _midiControlChannelComboBox.setBounds(x, _midiControlChannelLabel.getBottom() + 5, 100, 20);
+    _midiControlChannelComboBox.setBounds(_midiControlChannelLabel.getRight() + 5, _midiControlChannelLabel.getY(), 100, 20);
+
+    _midiSwellChannelLabel.setBounds(x, _midiControlChannelLabel.getBottom() + 5, 100, 20);
+    _midiSwellChannelComboBox.setBounds(_midiSwellChannelLabel.getRight() + 5, _midiSwellChannelLabel.getY(), 100, 20);
 }
 
 void AeolusAudioProcessorEditor::timerCallback()

Source/PluginEditor.h

@@ -102,5 +102,9 @@ class AeolusAudioProcessorEditor  : public juce::AudioProcessorEditor,
     juce::Label _midiControlChannelLabel;
     juce::ComboBox _midiControlChannelComboBox;
 
+    /// MIDI swell channel selection
+    juce::Label _midiSwellChannelLabel;
+    juce::ComboBox _midiSwellChannelComboBox;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AeolusAudioProcessorEditor)
 };

Source/aeolus/division.cpp

@@ -400,21 +400,30 @@ void Division::allNotesOff()
 
 void Division::handleControlMessage(const juce::MidiMessage& msg)
 {
-    if (!isForMIDIChannel(msg.getChannel()))
+    const int cc{ msg.getControllerNumber() };
+
+    if (cc != aeolus::CC_MODULATION && cc != aeolus::CC_VOLUME)
         return;
 
-    int cc = msg.getControllerNumber();
+    const int swellCh{ _engine.getMIDISwellChannel() };
     const float value{ float(msg.getControllerValue()) / 127.0f };
 
+    if (swellCh == 0 || swellCh == msg.getChannel() || msg.getChannel() == 0) {
+        if (_hasSwell && cc == aeolus::CC_VOLUME) {
+            *_paramGain = value;
+        }
+
+    }
+
+    // Hange manual channel specific controls
+    if (!isForMIDIChannel(msg.getChannel()))
+        return;
+
     switch (cc) {
     case aeolus::CC_MODULATION:
         if (hasTremulant())
             setTremulantEnabled(value > 0.5f);
         break;
-    case aeolus::CC_VOLUME:
-        if (_hasSwell)
-            *_paramGain = value;
-        break;
     default:
         break;
     }

Source/aeolus/engine.cpp

@@ -349,6 +349,7 @@ Engine::Engine()
     , _midiKeyboardState{}
     , _volumeLevel{}
     , _midiControlChannel{0}
+    , _midiSwellChannel{0}
 {
     populateDivisions();
 
@@ -635,6 +636,7 @@ var Engine::getPersistentState() const
 
     // Save control channel
     obj->setProperty("midi_ctrl_channel", getMIDIControlChannel());
+    obj->setProperty("midi_swell_channel", getMIDISwellChannel());
 
     // Save the IR.
     int irNum = _selectedIR;
@@ -658,6 +660,7 @@ void Engine::setPersistentState(const var& state)
     if (const auto* obj = state.getDynamicObject()) {
         // Restore control channel
         setMIDIControlChannel(obj->getProperty("midi_ctrl_channel"));
+        setMIDISwellChannel(obj->getProperty("midi_swell_channel"));
 
         // Restore the IR
         int irNum = obj->getProperty("ir");

Source/aeolus/engine.h

@@ -228,6 +228,16 @@ class Engine
      */
     void setMIDIControlChannel(int c) noexcept { _midiControlChannel = c; }
 
+    /**
+    * Returns currently set MIDI control channel.
+    */
+    int getMIDISwellChannel() const noexcept { return _midiSwellChannel; }
+
+    /**
+    * Assign MIDI channel to be used to control the organ stops and sequencer.
+    */
+    void setMIDISwellChannel(int c) noexcept { _midiSwellChannel = c; }
+
     /**
      * Generate audio.
      */
@@ -333,6 +343,7 @@ class Engine
     Level _volumeLevel;
 
     std::atomic<int> _midiControlChannel;
+    std::atomic<int> _midiSwellChannel;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Engine)
 };