MIDI fixes

Author: timothyschoen

Source/Components/WelcomePanel.h

@@ -236,8 +236,8 @@ class WelcomePanel : public Component
 
     public:
         WelcomePanelTile(WelcomePanel& welcomePanel, ValueTree subTree, String svgImage, Colour iconColour, float scale, bool favourited, Image const& thumbImage = Image())
-            : parent(welcomePanel)
-            , isFavourited(favourited)
+            : isFavourited(favourited)
+            , parent(welcomePanel)
             , snapshotScale(scale)
             , thumbnailImageData(thumbImage)
         {
@@ -474,7 +474,7 @@ class WelcomePanel : public Component
 
         Rectangle<int> getHeartIconBounds()
         {
-            return Rectangle<int>(20, getHeight() - 80, 16, 16);
+            return Rectangle<int>(26, getHeight() - 84, 16, 16);
         }
 
         bool hitTest(int x, int y) override

Source/Dialogs/MidiSettingsPanel.h

@@ -17,7 +17,6 @@ class MidiSettingsComboBox : public PropertiesPanel::ComboComponent
     {
         comboBox.getSelectedIdAsValue().referTo(comboValue);
         comboValue = processor->getMidiDeviceManager().getMidiDevicePort(isInput, deviceInfo) + 2;
-        std::cout << midiDeviceInfo.name << ", read port: " << getValue<int>(comboValue) << std::endl;
         comboValue.addListener(this);
     }
 
@@ -39,7 +38,6 @@ class MidiSettingsComboBox : public PropertiesPanel::ComboComponent
         repaint();
         auto port = getValue<int>(comboValue);
         processor->getMidiDeviceManager().setMidiDevicePort(isInput, deviceInfo.name, deviceInfo.identifier, port - 2);
-        std::cout << deviceInfo.name << ", write port: " << port - 2 << std::endl;
     }
 
     bool isInput;

Source/PluginProcessor.cpp

@@ -685,8 +685,8 @@ void PluginProcessor::processBlock(AudioBuffer<float>& buffer, MidiBuffer& midiB
     smoothedGain.setTargetValue(mappedTargetGain);
     smoothedGain.applyGain(buffer, buffer.getNumSamples());
 
-    midiDeviceManager.getLastMidiOutputEvents(midiOutputHistory, buffer.getNumSamples());
-
+    midiDeviceManager.sendAndCollectMidiOutput(midiOutputHistory);
+    
     statusbarSource->process(midiInputHistory, midiOutputHistory, totalNumOutputChannels);
     statusbarSource->setCPUUsage(cpuLoadMeasurer.getLoadAsPercentage());
     statusbarSource->peakBuffer.write(buffer);

Source/Utility/MidiDeviceManager.h

@@ -12,7 +12,6 @@
 class MidiDeviceManager : public ChangeListener
     , public AsyncUpdater
     , public MidiInputCallback
-    , public Timer
 {
 
 public:
@@ -31,7 +30,7 @@ class MidiDeviceManager : public ChangeListener
 
         updateMidiDevices();
         midiBufferIn.ensureSize(2048);
-        startTimer(2);
+        midiBufferOut.ensureSize(2048);
     }
 
     ~MidiDeviceManager()
@@ -252,29 +251,59 @@ class MidiDeviceManager : public ChangeListener
         auto& outputPort = outputPorts[port + 1];
         if(outputPort.enabled)
         {
-            outputPort.queue.addEvent(message, samplePosition);
+            outputPort.queue.enqueue({message, samplePosition});
         }
     }
 
     // Read output buffer for a port. Used to pass back into the DAW or into the internal GM synth
     void dequeueMidiOutput(int port, MidiBuffer& buffer, int numSamples)
     {
-        if (outputPorts[port + 1].enabled) {
-            buffer.addEvents(outputPorts[port].queue, 0, numSamples, 0);
+        auto& outputPort = outputPorts[port + 1];
+        if (outputPort.enabled) {
+            std::pair<MidiMessage, int> message;
+            while(outputPort.queue.try_dequeue(message))
+            {
+                auto& [midiMessage, samplePosition] = message;
+                outputPort.buffer.addEvent(midiMessage, samplePosition);
+            }
+            buffer.addEvents(buffer, 0, numSamples, 0);
         }
     }
 
-    void sendMidiOutput()
+    // Sends pending MIDI output messages, and return a block with all messages
+    void sendAndCollectMidiOutput(MidiBuffer& allOutputBuffer)
     {
-        for (auto& port : outputPorts) {
-            if(!port.enabled || port.queue.isEmpty()) continue;
-            for (auto* device : port.devices) {
-                device->sendBlockOfMessages(port.queue, Time::getMillisecondCounterHiRes(), currentSampleRate);
+        for (auto& outputPort : outputPorts) {
+            if(outputPort.enabled)
+            {
+                std::pair<MidiMessage, int> message;
+                while(outputPort.queue.try_dequeue(message))
+                {
+                    auto& [midiMessage, samplePosition] = message;
+                    outputPort.buffer.addEvent(midiMessage, samplePosition);
+                    allOutputBuffer.addEvent(midiMessage, samplePosition);
+                }
+                
+                if(!outputPort.buffer.isEmpty()) {
+                    for (auto* device : outputPort.devices) {
+                        device->sendBlockOfMessages(outputPort.buffer, Time::getMillisecondCounterHiRes(), currentSampleRate);
+                    }
+                    outputPort.buffer.clear();
+                }
             }
-            port.queue.clear();
         }
     }
-
+    
+    void clearMidiOutputBuffers()
+    {
+        for (auto& outputPort : outputPorts) {
+            if(outputPort.enabled && !outputPort.buffer.isEmpty())
+            {
+                outputPort.buffer.clear();
+            }
+        }
+    }
+    
     // Load last MIDI settings from our settings file
     void loadMidiSettings()
     {
@@ -343,17 +372,12 @@ class MidiDeviceManager : public ChangeListener
     {
         for (auto& port : outputPorts) {
             if (!port.enabled) continue;
-            buffer.addEvents(port.queue, 0, numSamples, 0);
+            buffer.addEvents(port.buffer, 0, numSamples, 0);
         }
     }
 
 private:
 
-    void timerCallback() override
-    {
-        sendMidiOutput();
-    }
-    
     void handleIncomingMidiMessage(MidiInput* input, MidiMessage const& message) override
     {
         auto port = [this, input]() -> int {
@@ -396,10 +420,12 @@ class MidiDeviceManager : public ChangeListener
     {
         std::atomic<bool> enabled = false;
         OwnedArray<MidiOutput> devices;
-        MidiBuffer queue;
+        moodycamel::ConcurrentQueue<std::pair<MidiMessage, int>> queue;
+        MidiBuffer buffer;
     };
 
     MidiBuffer midiBufferIn;
+    MidiBuffer midiBufferOut;
 
     MidiInput* toPlugdata = nullptr;
     MidiOutput* fromPlugdata = nullptr;