Merge branch 'develop' of https://github.com/plugdata-team/plugdata into develop

Author: timothyschoen

Source/Objects/ImplementationBase.cpp

@@ -153,7 +153,7 @@ void ObjectImplementationManager::handleAsyncUpdate()
     for (auto it = objectImplementations.cbegin(); it != objectImplementations.cend();) {
         auto& [ptr, implementation] = *it;
 
-        if (allObjects.contains(ptr)) {
+        if (!allObjects.contains(ptr)) {
             it = objectImplementations.erase(it); // Erase and move iterator forward.
         } else {
             ++it;

Source/PluginMode.h

@@ -48,6 +48,17 @@ class PluginMode final : public Component
             editor->getTopLevelComponent()->sendLookAndFeelChange();
         }
 
+        auto metaFile = patchPtr.get()->getPatchFile().getSiblingFile("meta.json");
+        if (metaFile.existsAsFile()) {
+            auto json = juce::JSON::parse(metaFile.loadFileAsString());
+            if (json.isObject()) {
+                auto jsonObject = json.getDynamicObject();
+                if (jsonObject != nullptr && jsonObject->hasProperty("Scale")) {
+                    scaleDPIMult = jsonObject->getProperty("Scale");
+                }
+            }
+        }
+
         desktopWindow = editor->getPeer();
 
         editor->nvgSurface.invalidateAll();
@@ -135,8 +146,9 @@ class PluginMode final : public Component
         setWidthAndHeight(previousScale * 0.01f);
     }
 
-    void setWidthAndHeight(float const scale)
+    void setWidthAndHeight(float scale)
     {
+        scale *= scaleDPIMult;
         auto newWidth = static_cast<int>(width * scale);
         auto newHeight = static_cast<int>(height * scale) + titlebarHeight + nativeTitleBarHeight;
 
@@ -322,7 +334,7 @@ class PluginMode final : public Component
             cnv->setTransform(cnv->getTransform().scale(scale));
             cnv->setBounds(-b.getX() + x / scale, -b.getY() + y / scale, b.getWidth() + b.getX(), b.getHeight() + b.getY());
         } else {
-            float scale = getWidth() / width;
+            float scale = (getWidth() / width);
             pluginModeScale = scale;
             scaleComboBox.setVisible(true);
             editorButton->setVisible(true);
@@ -474,6 +486,7 @@ class PluginMode final : public Component
     float const height = static_cast<float>(cnv->patchHeight.getValue()) + 1.0f;
 
     float pluginModeScale = 1.0f;
+    float scaleDPIMult = 1.0f;
 
     String lastTheme;
 

Source/PluginProcessor.cpp

@@ -689,6 +689,11 @@ void PluginProcessor::setEnableLimiter(bool const enabled)
     enableLimiter = enabled;
 }
 
+bool PluginProcessor::getEnableLimiter()
+{
+    return enableLimiter;
+}
+
 void PluginProcessor::numChannelsChanged()
 {
     auto const blockSize = AudioProcessor::getBlockSize();
@@ -1767,8 +1772,8 @@ void PluginProcessor::receiveSysMessage(SmallString const& selector, SmallArray<
     }
     case hash("limit"): {
         bool limit = list[0].getFloat();
+        setEnableLimiter(limit);
         for (auto* editor : getEditors()) {
-            editor->pd->setEnableLimiter(limit);
             editor->statusbar->showLimiterState(limit);
         }
         break;

Source/PluginProcessor.h

@@ -49,6 +49,8 @@ class PluginProcessor final : public AudioProcessor
     void setOversampling(int amount);
     void setLimiterThreshold(int amount);
     void setEnableLimiter(bool enabled);
+    bool getEnableLimiter();
+
     void prepareToPlay(double sampleRate, int samplesPerBlock) override;
     void numChannelsChanged() override;
     void releaseResources() override {};

Source/Statusbar.cpp

@@ -1357,7 +1357,7 @@ Statusbar::Statusbar(PluginProcessor* processor, PluginEditor* e)
 
     limiterButton = std::make_unique<StatusbarTextButton>();
     limiterButton->setButtonText("Limit");
-    limiterButton->setToggleState(SettingsFile::getInstance()->getProperty<bool>("protected"), dontSendNotification);
+    limiterButton->setToggleState(pd->getEnableLimiter(), dontSendNotification);
     limiterButton->setClickingTogglesState(true);
 
     limiterButton->onStateChange = [this] {