More message listener improvements

Author: timothyschoen

Libraries/plf_stack

@@ -305,6 +305,9 @@ void NVGSurface::invalidateArea(Rectangle<int> area)
 
 void NVGSurface::render()
 {
+    // Flush message queue before rendering, to make sure all GUIs are up-to-date
+    editor->pd->flushMessageQueue();
+
     if (renderThroughImage) {
         auto startTime = Time::getMillisecondCounter();
         if (startTime - lastRenderTime < 32) {

Source/NVGSurface.cpp

@@ -7,7 +7,7 @@
 
 #include "Instance.h"
 #include <readerwriterqueue.h>
-#include <plf_stack/plf_stack.h>
+#include "Utility/Stack.h"
 
 namespace pd {
 
@@ -32,7 +32,7 @@ class MessageDispatcher {
         PointerIntPair<t_symbol*, 2, uint8_t> symbolAndSize;
     };
 
-    static constexpr int StackSize = 1 << 21;
+    static constexpr int StackSize = 1 << 20;
     using MessageStack = plf::stack<Message>;
     using AtomStack = plf::stack<t_atom>;
 
@@ -47,13 +47,12 @@ class MessageDispatcher {
     {
         usedHashes.reserve(StackSize);
         nullListeners.reserve(StackSize);
-
-        buffers[0].messages.reserve(StackSize);
-        buffers[0].atoms.reserve(StackSize);
-        buffers[1].messages.reserve(StackSize);
-        buffers[1].atoms.reserve(StackSize);
-        buffers[2].messages.reserve(StackSize);
-        buffers[2].atoms.reserve(StackSize);
+        
+        for(auto& buffer : buffers)
+        {
+            buffer.messages.reserve(StackSize);
+            buffer.atoms.reserve(StackSize);
+        }
     }
 
     static void enqueueMessage(void* instance, void* target, t_symbol* symbol, int argc, t_atom* argv) noexcept
@@ -63,10 +62,10 @@ class MessageDispatcher {
         if (ProjectInfo::isStandalone || EXPECT_LIKELY(!dispatcher->block)) {
             auto size = std::min(argc, 15);
             auto& backBuffer = dispatcher->getBackBuffer();
+            backBuffer.messages.push({ PointerIntPair<void*, 2, uint8_t>(target, (size >> 2) & 0b11), PointerIntPair<t_symbol*, 2, uint8_t>(symbol, size & 0b11) });
+            
             for (int i = 0; i < size; i++)
                 backBuffer.atoms.push(argv[i]);
-
-            backBuffer.messages.push({ PointerIntPair<void*, 2, uint8_t>(target, (size >> 2) & 0b11), PointerIntPair<t_symbol*, 2, uint8_t>(symbol, size & 0b11) });
         }
     }
 
@@ -78,12 +77,11 @@ class MessageDispatcher {
         // If we're blocking messages from now on, also clear out the queue
         if (blockMessages) {
             sys_lock();
-            buffers[0].messages.clear();
-            buffers[0].atoms.clear();
-            buffers[1].messages.clear();
-            buffers[1].atoms.clear();
-            buffers[2].messages.clear();
-            buffers[2].atoms.clear();
+            for(auto& buffer : buffers)
+            {
+                buffer.messages.clear();
+                buffer.atoms.clear();
+            }
             sys_unlock();
         }
     }
@@ -186,21 +184,15 @@ class MessageDispatcher {
         // Make sure they don't grow excessively large
         if(frontBuffer.messages.capacity() > StackSize*2)
         {
-            frontBuffer.messages.shrink_to_fit();
-            frontBuffer.messages.reserve(StackSize);
-        }
-        if(frontBuffer.atoms.capacity() > StackSize*2)
-        {
-            frontBuffer.atoms.shrink_to_fit();
-            frontBuffer.atoms.reserve(StackSize);
+            frontBuffer.messages.trim();
+            frontBuffer.atoms.trim();
         }
     }
 
     MessageBuffer& getBackBuffer()
     {
         return buffers[currentBuffer.load()];
     }
-    
 
     MessageBuffer& getFrontBuffer()
     {

Source/Pd/MessageListener.h

@@ -250,7 +250,7 @@ PluginEditor::PluginEditor(PluginProcessor& p)
     addChildComponent(*palettes);
     addAndMakeVisible(*statusbar);
 
-    addAndMakeVisible(*sidebar);
+    addChildComponent(*sidebar);
     sidebar->toBehind(statusbar.get());
     addAndMakeVisible(tabComponent);
 
@@ -271,7 +271,7 @@ PluginEditor::PluginEditor(PluginProcessor& p)
              &pluginModeButton,
 #endif
          }) {
-        addAndMakeVisible(button);
+        addChildComponent(button);
     }
 
     // Show settings
@@ -285,18 +285,18 @@ PluginEditor::PluginEditor(PluginProcessor& p)
     //  Undo button
     undoButton.isUndo = true;
     undoButton.onClick = [this]() { getCurrentCanvas()->undo(); };
-    addAndMakeVisible(undoButton);
+    addChildComponent(undoButton);
 
     // Redo button
     redoButton.isRedo = true;
     redoButton.onClick = [this]() { getCurrentCanvas()->redo(); };
-    addAndMakeVisible(redoButton);
+    addChildComponent(redoButton);
 
     // New object button
     addObjectMenuButton.setButtonText(Icons::AddObject);
     addObjectMenuButton.setTooltip("Add object");
     addObjectMenuButton.onClick = [this]() { Dialogs::showObjectMenu(this, &addObjectMenuButton); };
-    addAndMakeVisible(addObjectMenuButton);
+    addChildComponent(addObjectMenuButton);
 
     recentlyOpenedPanelSelector.setClickingTogglesState(true);
     libraryPanelSelector.setClickingTogglesState(true);
@@ -334,7 +334,7 @@ PluginEditor::PluginEditor(PluginProcessor& p)
 
         button->setClickingTogglesState(true);
         button->setRadioGroupId(hash("edit_run_present"));
-        addAndMakeVisible(button);
+        addChildComponent(button);
     }
     editButton.setToggleState(true, sendNotification);
 
@@ -357,7 +357,12 @@ PluginEditor::PluginEditor(PluginProcessor& p)
 
     sidebar->setSize(250, pd->lastUIHeight - statusbar->getHeight());
 
-    setSize(pd->lastUIWidth, pd->lastUIHeight);
+    if(ProjectInfo::isStandalone) {
+        setSize(pd->lastUIWidth, pd->lastUIHeight);
+    }
+    else {
+        setSize(850, 650);
+    }
 
     sidebar->toFront(false);
 
@@ -586,6 +591,7 @@ void PluginEditor::showWelcomePanel(bool shouldShow)
     if(shouldShow)
     {
         welcomePanel->show();
+        sidebar->showSidebar(true);
     }
     else {
         welcomePanel->hide();

Source/PluginEditor.cpp

@@ -176,7 +176,7 @@ PluginProcessor::PluginProcessor()
     settingsFile->startChangeListener();
 
     sendMessagesFromQueue();
-    startTimerHz(60);
+    
 }
 
 PluginProcessor::~PluginProcessor()
@@ -187,18 +187,10 @@ PluginProcessor::~PluginProcessor()
     patchesLock.exit();
 }
 
-// Flushes Pd message listener messages from the queue
-void PluginProcessor::timerCallback()
+void PluginProcessor::flushMessageQueue()
 {
-    if(canDequeueMessages) {
-        canDequeueMessages = false;
-        setThis();
-        messageDispatcher->dequeueMessages();
-        startTimerHz(60);
-    }
-    else {
-        startTimerHz(120);
-    }
+    setThis();
+    messageDispatcher->dequeueMessages();
 }
 
 void PluginProcessor::initialiseFilesystem()
@@ -782,7 +774,6 @@ void PluginProcessor::processConstant(dsp::AudioBlock<float> buffer, MidiBuffer&
         // Process audio
         performDSP(audioVectorIn.data(), audioVectorOut.data());
 
-        canDequeueMessages = true;
         sendMessagesFromQueue();
 
         if (connectionListener && plugdata_debugging_enabled())
@@ -837,7 +828,6 @@ void PluginProcessor::processVariable(dsp::AudioBlock<float> buffer, MidiBuffer&
         // Process audio
         performDSP(audioVectorIn.data(), audioVectorOut.data());
 
-        canDequeueMessages = true;
         sendMessagesFromQueue();
 
         if (connectionListener && plugdata_debugging_enabled())

Source/PluginProcessor.cpp

@@ -33,9 +33,7 @@ class ConnectionMessageDisplay;
 class Object;
 class PluginProcessor final : public AudioProcessor
     , public pd::Instance
-    , public SettingsFileListener
-    , public Timer
-{
+    , public SettingsFileListener {
 public:
     PluginProcessor();
 
@@ -49,10 +47,10 @@ class PluginProcessor final : public AudioProcessor
     void prepareToPlay(double sampleRate, int samplesPerBlock) override;
     void numChannelsChanged() override;
     void releaseResources() override;
-        
+
     void updateAllEditorsLNF();
 
-    void timerCallback() override;
+    void flushMessageQueue();
 
 #ifndef JucePlugin_PreferredChannelConfigurations
     bool isBusesLayoutSupported(BusesLayout const& layouts) const override;
@@ -193,8 +191,7 @@ class PluginProcessor final : public AudioProcessor
     SmoothedValue<float, ValueSmoothingTypes::Linear> smoothedGain;
 
     AtomicValue<int> audioAdvancement = 0;
-    AtomicValue<bool> canDequeueMessages = false;
-    
+
     bool variableBlockSize = false;
     AudioBuffer<float> audioBufferIn;
     AudioBuffer<float> audioBufferOut;

Source/PluginProcessor.h

@@ -1458,6 +1458,7 @@ void Statusbar::setWelcomePanelShown(bool isShowing)
     audioSettingsButton.setVisible(!isShowing);
     sidebarExpandButton.setVisible(isShowing);
     helpButton.setVisible(isShowing);
+    if(!isShowing) sidebarExpandButton.setToggleState(false, dontSendNotification);
 }