Midi display

modules/foleys_gui_magic/General/foleys_MagicJUCEFactories.cpp

@@ -40,6 +40,7 @@
 #include "../Widgets/foleys_MagicLevelMeter.h"
 #include "../Widgets/foleys_MagicPlotComponent.h"
 #include "../Widgets/foleys_MidiLearnComponent.h"
+#include "../Widgets/foleys_MidiDisplayComponent.h"
 #include "../Widgets/foleys_MidiDrumpadComponent.h"
 #include "../Helpers/foleys_PopupMenuHelper.h"
 
@@ -891,6 +892,34 @@ class MidiLearnItem : public GuiItem
 
 //==============================================================================
 
+class MidiDisplayItem : public GuiItem
+{
+public:
+    FOLEYS_DECLARE_GUI_FACTORY (MidiDisplayItem)
+
+    MidiDisplayItem (MagicGUIBuilder& builder, const juce::ValueTree& node) : GuiItem (builder, node)
+    {
+        if (auto* state = dynamic_cast<MagicProcessorState*>(&builder.getMagicState()))
+            midiDisplay.setMagicProcessorState (state);
+
+        addAndMakeVisible (midiDisplay);
+    }
+
+    void update() override {}
+
+    juce::Component* getWrappedComponent() override
+    {
+        return &midiDisplay;
+    }
+
+private:
+    MidiDisplayComponent midiDisplay;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MidiDisplayItem)
+};
+
+//==============================================================================
+
 class ListBoxItem : public GuiItem,
                     public juce::ChangeListener
 {
@@ -995,6 +1024,7 @@ void MagicGUIBuilder::registerJUCEFactories()
     registerFactory (IDs::drumpadComponent, &DrumpadItem::factory);
     registerFactory (IDs::meter, &LevelMeterItem::factory);
     registerFactory ("MidiLearn", &MidiLearnItem::factory);
+    registerFactory ("MidiDisplay", &MidiDisplayItem::factory);
     registerFactory (IDs::listBox, &ListBoxItem::factory);
 
 #if JUCE_MODULE_AVAILABLE_juce_gui_extra && JUCE_WEB_BROWSER

modules/foleys_gui_magic/State/foleys_MagicProcessorState.cpp

@@ -231,6 +231,21 @@ int MagicProcessorState::getLastController() const
     return midiMapper.getLastController();
 }
 
+int MagicProcessorState::getLastMidiChannel() const
+{
+    return midiMapper.getLastMidiChannel();
+}
+
+int MagicProcessorState::getLastMidiNote() const
+{
+    return midiMapper.getLastMidiNote();
+}
+
+int MagicProcessorState::getLastMidiVelocity() const
+{
+    return midiMapper.getLastMidiVelocity();
+}
+
 void MagicProcessorState::timerCallback()
 {
     getPropertyAsValue ("playhead:bpm").setValue (bpm.load());

modules/foleys_gui_magic/State/foleys_MagicProcessorState.h

@@ -132,6 +132,21 @@ class MagicProcessorState : public MagicGUIState,
      */
     int  getLastController() const;
 
+    /**
+     Returns the last MIDI Channel on which MIDI was received by MIDI Mapper
+     */
+     int getLastMidiChannel() const;
+
+    /**
+     Returns the last MIDI Note received by MIDI Mapper
+     */
+     int getLastMidiNote() const;
+
+    /**
+     Returns the last MIDI Velocity received by MIDI Mapper
+     */
+     int getLastMidiVelocity() const;
+
 private:
 
     void addParametersToMenu (const juce::AudioProcessorParameterGroup& group, juce::PopupMenu& menu, int& index) const;

modules/foleys_gui_magic/State/foleys_MidiParameterMapper.cpp

@@ -59,10 +59,11 @@ void MidiParameterMapper::processMidiBuffer (juce::MidiBuffer& buffer)
 
     for (auto m : buffer)
     {
-        if (m.getMessage().isController())
+        juce::MidiMessage mm = m.getMessage();
+        if (mm.isController())
         {
-            auto number = m.getMessage().getControllerNumber();
-            auto value  = m.getMessage().getControllerValue() / 127.0f;
+            auto number = mm.getControllerNumber();
+            auto value  = mm.getControllerValue() / 127.0f;
             lastController.store (number);
 
             if (isLocked)
@@ -78,6 +79,11 @@ void MidiParameterMapper::processMidiBuffer (juce::MidiBuffer& buffer)
                     p->endChangeGesture();
                 }
             }
+        } else if (mm.isNoteOn())
+        {
+            lastMidiChannel.store(mm.getChannel());
+            lastMidiNote.store(mm.getNoteNumber());
+            lastMidiVelocity.store(mm.getVelocity());
         }
     }
 
@@ -90,6 +96,20 @@ void MidiParameterMapper::mapMidiController (int cc, const juce::String& paramet
     auto mappings = getMappingSettings();
 
     juce::ValueTree node { IDs::mapping, {{IDs::cc, cc}, {IDs::parameter, parameterID}} };
+
+    // If mapping already there, remove it:
+    if (mappings.isValid()) {
+      int index = 0;
+      while (index < mappings.getNumChildren()) {
+        const auto& child = mappings.getChild (index);
+        if (int (child.getProperty (IDs::cc, -1)) == cc && child.getProperty (IDs::parameter, juce::String()).toString() == parameterID) {
+          mappings.removeChild (child, nullptr);
+          return;
+        } else
+          ++index;
+      }
+    }
+    // Otherwise add it:
     mappings.appendChild (node, nullptr);
 }
 
@@ -132,6 +152,21 @@ int MidiParameterMapper::getLastController() const
     return lastController.load();
 }
 
+int MidiParameterMapper::getLastMidiChannel() const
+{
+    return lastMidiChannel.load();
+}
+
+int MidiParameterMapper::getLastMidiNote() const
+{
+    return lastMidiNote.load();
+}
+
+int MidiParameterMapper::getLastMidiVelocity() const
+{
+    return lastMidiVelocity.load();
+}
+
 juce::ValueTree MidiParameterMapper::getMappingSettings()
 {
     return settings->settings.getOrCreateChildWithName (IDs::mappings, nullptr);

modules/foleys_gui_magic/State/foleys_MidiParameterMapper.h

@@ -76,6 +76,21 @@ class MidiParameterMapper  : private juce::ValueTree::Listener
      */
     int  getLastController() const;
 
+    /*!
+     * @return the last MIDI Channel on which MIDI was received by MIDI Mapper
+     */
+    int  getLastMidiChannel() const;
+
+    /*!
+     * @return the last MIDI Note received by MIDI Mapper
+     */
+    int  getLastMidiNote() const;
+
+    /*!
+     * @return the last MIDI Velocity received by MIDI Mapper
+     */
+    int  getLastMidiVelocity() const;
+
     /*!
      * Grant access to the ValueTree to save or restore the mappings manually
      * @return the ValueTree containing the mappings
@@ -98,6 +113,9 @@ class MidiParameterMapper  : private juce::ValueTree::Listener
 
     MagicProcessorState&        state;
     std::atomic<int>            lastController { -1 };
+    std::atomic<int>            lastMidiChannel { -1 };
+    std::atomic<int>            lastMidiNote { -1 };
+    std::atomic<int>            lastMidiVelocity { -1 };
     MidiMapping                 midiMapper;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MidiParameterMapper)

modules/foleys_gui_magic/Widgets/foleys_MidiDisplayComponent.cpp

@@ -0,0 +1,86 @@
+/*
+ ==============================================================================
+    Copyright (c) 2023 Julius Smith and Foleys Finest Audio - Daniel Walz
+    All rights reserved.
+
+    **BSD 3-Clause License**
+
+    Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+    3. Neither the name of the copyright holder nor the names of its contributors
+       may be used to endorse or promote products derived from this software without
+       specific prior written permission.
+
+ ==============================================================================
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+    OF THE POSSIBILITY OF SUCH DAMAGE.
+ ==============================================================================
+ */
+
+#include "foleys_MidiDisplayComponent.h"
+
+namespace foleys
+{
+
+void MidiDisplayComponent::setMagicProcessorState (MagicProcessorState* state)
+{
+    processorState = state;
+    startTimerHz (4);
+}
+
+void MidiDisplayComponent::paint (juce::Graphics& g)
+{
+    if (processorState)
+    {
+      auto channel = processorState->getLastMidiChannel();
+      auto text = juce::String("Channel: " + (channel > 0 ? juce::String (channel) : "unknown"));
+
+      auto note = processorState->getLastMidiNote();
+      text += ("\nNote: " + (note > 0 ? juce::String (note) : "unknown"));
+
+      auto velocity = processorState->getLastMidiVelocity();
+      text += ("\nVelocity: " + (velocity > 0 ? juce::String (velocity) : "unknown"));
+
+      auto cc = processorState->getLastController();
+      text += ("\nCC: " + (cc > 0 ? juce::String (cc) : "unknown"));
+
+      g.setColour (juce::Colours::silver);
+      g.drawFittedText (text, getLocalBounds(), juce::Justification::centred, 1);
+    }
+}
+
+void MidiDisplayComponent::mouseDrag (const juce::MouseEvent& event)
+{
+    if (processorState && event.mouseWasDraggedSinceMouseDown())
+    {
+        auto cc = processorState->getLastController();
+        if (cc < 1)
+            return;
+
+        if (auto* container = juce::DragAndDropContainer::findParentDragContainerFor (this))
+        {
+            container->startDragging (IDs::dragCC + juce::String (cc), this);
+        }
+    }
+}
+
+void MidiDisplayComponent::timerCallback()
+{
+    repaint();
+}
+
+}

modules/foleys_gui_magic/Widgets/foleys_MidiDisplayComponent.h

@@ -0,0 +1,68 @@
+/*
+ ==============================================================================
+    Copyright (c) 2023 Julius Smith and Foleys Finest Audio - Daniel Walz
+    All rights reserved.
+
+    **BSD 3-Clause License**
+
+    Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+    3. Neither the name of the copyright holder nor the names of its contributors
+       may be used to endorse or promote products derived from this software without
+       specific prior written permission.
+
+ ==============================================================================
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+    IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+    OF THE POSSIBILITY OF SUCH DAMAGE.
+ ==============================================================================
+ */
+
+#pragma once
+
+#include <juce_gui_basics/juce_gui_basics.h>
+
+namespace foleys
+{
+
+class MagicProcessorState;
+
+/**
+ The MidiDisplayComponent displays the last moved CC controller and allows via dragging
+ onto a knob to connect to its parameter
+ */
+class MidiDisplayComponent  : public juce::Component,
+                              public juce::SettableTooltipClient,
+                              private juce::Timer
+{
+public:
+    MidiDisplayComponent() = default;
+
+    void setMagicProcessorState (MagicProcessorState* state);
+
+    void paint (juce::Graphics& g) override;
+    void mouseDrag (const juce::MouseEvent& event) override;
+
+private:
+
+    void timerCallback() override;
+
+    MagicProcessorState* processorState = nullptr;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MidiDisplayComponent)
+};
+
+}

modules/foleys_gui_magic/foleys_gui_magic.cpp

@@ -72,6 +72,7 @@
 #include "Widgets/foleys_XYDragComponent.cpp"
 #include "Widgets/foleys_FileBrowserDialog.cpp"
 #include "Widgets/foleys_MidiLearnComponent.cpp"
+#include "Widgets/foleys_MidiDisplayComponent.cpp"
 #include "Widgets/foleys_MidiDrumpadComponent.cpp"
 
 #include "LookAndFeels/foleys_JuceLookAndFeels.cpp"

modules/foleys_gui_magic/foleys_gui_magic.h

@@ -129,6 +129,7 @@
 #include "Widgets/foleys_XYDragComponent.h"
 #include "Widgets/foleys_FileBrowserDialog.h"
 #include "Widgets/foleys_MidiLearnComponent.h"
+#include "Widgets/foleys_MidiDisplayComponent.h"
 #include "Widgets/foleys_MidiDrumpadComponent.h"
 
 #include "State/foleys_RadioButtonManager.h"