0.24.1

atkAudioUser · atkAudioUser · commit b110f548b9a0 · 2025-10-10T20:44:27.000-07:00
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -34,7 +34,6 @@
         "deprecated": true
       },
       "cacheVariables": {
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "12.0",
         "CMAKE_OSX_ARCHITECTURES": "arm64;x86_64",
         "CODESIGN_IDENTITY": "$penv{CODESIGN_IDENT}",
         "CODESIGN_TEAM": "$penv{CODESIGN_TEAM}"
@@ -50,7 +49,8 @@
       "generator": "Xcode",
       "cacheVariables": {
         "CMAKE_COMPILE_WARNING_AS_ERROR": false,
-        "ENABLE_CCACHE": true
+        "CMAKE_OSX_DEPLOYMENT_TARGET": "12.0",
+        "ENABLE_CCACHE": false
       }
     },
     {
diff --git a/lib/atkaudio/src/atkaudio/DeviceIo/DeviceIo.cpp b/lib/atkaudio/src/atkaudio/DeviceIo/DeviceIo.cpp
@@ -17,9 +17,10 @@ struct atk::DeviceIo::Impl : public juce::Timer
 
     ~Impl()
     {
+        // Follow the same clean pattern as regular PluginHost
         auto* window = this->mainWindow;
         auto* manager = this->deviceManager;
-        auto lambda = [window, manager]()
+        auto lambda = [window, manager]
         {
             delete window;
             delete manager;
@@ -43,12 +44,22 @@ struct atk::DeviceIo::Impl : public juce::Timer
 
     void setVisible(bool visible)
     {
-        if (!mainWindow->isOnDesktop())
-            mainWindow->addToDesktop();
+        auto doUi = [this, visible]
+        {
+            if (visible && !mainWindow->isOnDesktop())
+            {
+                mainWindow->addToDesktop();
+                mainWindow->toFront(true);
+            }
+            mainWindow->setVisible(visible);
+            if (visible && mainWindow->isMinimised())
+                mainWindow->setMinimised(false);
+        };
 
-        mainWindow->setVisible(visible);
-        if (visible && mainWindow->isMinimised())
-            mainWindow->setMinimised(false);
+        if (juce::MessageManager::getInstance()->isThisTheMessageThread())
+            doUi();
+        else
+            juce::MessageManager::callAsync(doUi);
     }
 
     void getState(std::string& s)
diff --git a/lib/atkaudio/src/atkaudio/DeviceIo/DeviceIoApp.h b/lib/atkaudio/src/atkaudio/DeviceIo/DeviceIoApp.h
@@ -126,6 +126,11 @@ class AudioAppMainWindow final : public DocumentWindow
         setVisible(false);
     }
 
+    ~AudioAppMainWindow() override
+    {
+        // Note: setVisible(false) is handled by atk::destroy() force-hide before this destructor runs
+    }
+
     void closeButtonPressed() override
     {
         setVisible(false);
diff --git a/lib/atkaudio/src/atkaudio/PluginHost/PluginHost.cpp b/lib/atkaudio/src/atkaudio/PluginHost/PluginHost.cpp
@@ -64,8 +64,11 @@ struct atk::PluginHost::Impl : public juce::Timer
 
     void process(float** buffer, int newNumChannels, int newNumSamples, double newSampleRate)
     {
-        if (!buffer || this->numChannels != newNumChannels || this->numSamples < newNumSamples
-            || this->sampleRate != newSampleRate || isFirstRun.load(std::memory_order_acquire))
+        if (!buffer
+            || this->numChannels != newNumChannels
+            || this->numSamples < newNumSamples
+            || this->sampleRate != newSampleRate
+            || isFirstRun.load(std::memory_order_acquire))
         {
             isFirstRun.store(false, std::memory_order_release);
             this->numChannels = newNumChannels;
@@ -93,12 +96,22 @@ struct atk::PluginHost::Impl : public juce::Timer
 
     void setVisible(bool visible)
     {
-        if (!mainWindow->isOnDesktop())
-            mainWindow->addToDesktop();
-
-        mainWindow->setVisible(visible);
-        if (visible && mainWindow->isMinimised())
-            mainWindow->setMinimised(false);
+        auto doUi = [this, visible]
+        {
+            if (visible && !mainWindow->isOnDesktop())
+            {
+                mainWindow->addToDesktop();
+                mainWindow->toFront(true);
+            }
+            mainWindow->setVisible(visible);
+            if (visible && mainWindow->isMinimised())
+                mainWindow->setMinimised(false);
+        };
+
+        if (juce::MessageManager::getInstance()->isThisTheMessageThread())
+            doUi();
+        else
+            juce::MessageManager::callAsync(doUi);
     }
 
     // some plugins dont export state if audio is not playing
diff --git a/lib/atkaudio/src/atkaudio/PluginHost/StandaloneFilterWindow.h b/lib/atkaudio/src/atkaudio/PluginHost/StandaloneFilterWindow.h
@@ -68,7 +68,8 @@ class StandalonePluginHolder2
 
         auto audioInputRequired = (inChannels > 0);
 
-        if (audioInputRequired && RuntimePermissions::isRequired(RuntimePermissions::recordAudio)
+        if (audioInputRequired
+            && RuntimePermissions::isRequired(RuntimePermissions::recordAudio)
             && !RuntimePermissions::isGranted(RuntimePermissions::recordAudio))
             RuntimePermissions::request(
                 RuntimePermissions::recordAudio,
@@ -185,7 +186,8 @@ class StandalonePluginHolder2
     {
         stateFileChooser =
             std::make_unique<FileChooser>(TRANS("Save current state"), getLastFile(), getFilePatterns(fileSuffix));
-        auto flags = FileBrowserComponent::saveMode | FileBrowserComponent::canSelectFiles
+        auto flags = FileBrowserComponent::saveMode
+                   | FileBrowserComponent::canSelectFiles
                    | FileBrowserComponent::warnAboutOverwriting;
 
         stateFileChooser->launchAsync(
@@ -650,6 +652,8 @@ class StandaloneFilterWindow
 
     ~StandaloneFilterWindow() override
     {
+        // Note: setVisible(false) is handled by atk::destroy() force-hide before this destructor runs
+
 #if (!JUCE_IOS) && (!JUCE_ANDROID)
         if (auto* props = pluginHolder->settings.get())
         {
diff --git a/lib/atkaudio/src/atkaudio/PluginHost2/ObsOutput.h b/lib/atkaudio/src/atkaudio/PluginHost2/ObsOutput.h
@@ -33,6 +33,7 @@ class ObsOutputAudioProcessor : public juce::AudioProcessor
 
             obs_source_set_audio_active(privateSource, true);
             obs_source_set_enabled(privateSource, true);
+            obs_source_release(sceneSource);
         }
     }
 
diff --git a/lib/atkaudio/src/atkaudio/PluginHost2/PluginHost2.cpp b/lib/atkaudio/src/atkaudio/PluginHost2/PluginHost2.cpp
@@ -13,6 +13,7 @@ struct atk::PluginHost2::Impl : public juce::Timer
 
     ~Impl()
     {
+        // Follow the same clean pattern as regular PluginHost
         auto* window = this->mainHostWindow.release();
         auto lambda = [window] { delete window; };
         juce::MessageManager::callAsync(lambda);
@@ -24,12 +25,20 @@ struct atk::PluginHost2::Impl : public juce::Timer
 
     void setVisible(bool visible)
     {
-        if (!mainHostWindow->isOnDesktop() && visible)
+        auto doUi = [this, visible]
         {
-            mainHostWindow->addToDesktop();
-            mainHostWindow->toFront(true);
-        }
-        mainHostWindow->setVisible(visible);
+            if (visible && !mainHostWindow->isOnDesktop())
+            {
+                mainHostWindow->addToDesktop();
+                mainHostWindow->toFront(true);
+            }
+            mainHostWindow->setVisible(visible);
+        };
+
+        if (juce::MessageManager::getInstance()->isThisTheMessageThread())
+            doUi();
+        else
+            juce::MessageManager::callAsync(doUi);
     }
 
     void getState(std::string& s)
@@ -111,7 +120,6 @@ struct atk::PluginHost2::Impl : public juce::Timer
 
 private:
     std::unique_ptr<MainHostWindow> mainHostWindow;
-    std::unique_ptr<juce::AudioDeviceManager> deviceManager;
 
     juce::AudioBuffer<float> outputData{MAX_AUDIO_CHANNELS, AUDIO_OUTPUT_FRAMES};
     uint64_t hostTimeNs;
diff --git a/lib/atkaudio/src/atkaudio/PluginHost2/Plugins/GainPlugin.h b/lib/atkaudio/src/atkaudio/PluginHost2/Plugins/GainPlugin.h
@@ -18,6 +18,7 @@ class GainPlugin final
         using namespace juce;
         apvts = std::make_unique<AudioProcessorValueTreeState>(*this, nullptr, "state", createParameterLayout());
         gainValue = apvts->getRawParameterValue("gain");
+        gain2Value = apvts->getRawParameterValue("gain2");
         midiEnabled = apvts->getRawParameterValue("midi");
         midiChannel = apvts->getRawParameterValue("ch");
         midiCc = apvts->getRawParameterValue("cc");
@@ -56,7 +57,8 @@ class GainPlugin final
     void prepareToPlay(double sampleRate, int samplesPerBlock) override
     {
         juce::ignoreUnused(sampleRate, samplesPerBlock);
-        gainValueSmoothed.reset(sampleRate, 0.05f); // Smooth the gain value with a time constant of 50ms
+        gainValueSmoothed.reset(sampleRate, 0.05f);  // Smooth the gain value with a time constant of 50ms
+        gain2ValueSmoothed.reset(sampleRate, 0.05f); // Smooth the gain2 value with a time constant of 50ms
     }
 
     void releaseResources() override
@@ -66,6 +68,8 @@ class GainPlugin final
     void processBlock(juce::AudioBuffer<float>& buffer, juce::MidiBuffer& midiBuffer) override
     {
         auto gain = gainValue->load(std::memory_order_acquire);
+        auto gain2Db = gain2Value->load(std::memory_order_acquire);
+        auto gain2Linear = juce::Decibels::decibelsToGain(gain2Db);
 
         if (midiEnabled->load(std::memory_order_acquire) > 0.5f)
         {
@@ -89,10 +93,15 @@ class GainPlugin final
         for (int channel = 0; channel < buffer.getNumChannels(); ++channel)
         {
             gainValueSmoothed.setTargetValue(gain);
+            gain2ValueSmoothed.setTargetValue(gain2Linear);
             auto* readPtr = buffer.getReadPointer(channel);
             auto* writePtr = buffer.getWritePointer(channel);
             for (int sample = 0; sample < buffer.getNumSamples(); ++sample)
-                writePtr[sample] = readPtr[sample] * gainValueSmoothed.getNextValue();
+            {
+                auto currentGain = gainValueSmoothed.getNextValue();
+                auto currentGain2 = gain2ValueSmoothed.getNextValue();
+                writePtr[sample] = readPtr[sample] * currentGain * currentGain2;
+            }
         }
 
         if (midiLearn->load(std::memory_order_acquire) > 0.5f)
@@ -218,17 +227,25 @@ class GainPlugin final
 
         params.push_back(std::make_unique<AudioParameterBool>(ParameterID{"learn", 1}, "Learn", false));
 
+        // Gain2 parameter with -30 to +30 dB range
+        auto gain2Range = NormalisableRange<float>(-30.0f, 30.0f, 0.1f, 1.0f);
+        params.push_back(
+            std::make_unique<AudioParameterFloat>(ParameterID{"gain2", 1}, "Gainsborough", gain2Range, 0.0f)
+        );
+
         return {params.begin(), params.end()};
     }
 
     std::unique_ptr<juce::AudioProcessorValueTreeState> apvts;
     std::atomic<float>* gainValue = nullptr;
+    std::atomic<float>* gain2Value = nullptr;
     std::atomic<float>* midiEnabled = nullptr;
     std::atomic<float>* midiChannel = nullptr;
     std::atomic<float>* midiCc = nullptr;
     std::atomic<float>* midiLearn = nullptr;
 
     juce::LinearSmoothedValue<float> gainValueSmoothed;
+    juce::LinearSmoothedValue<float> gain2ValueSmoothed;
 
     juce::RangedAudioParameter* gainParam = nullptr;
     juce::RangedAudioParameter* channelParam = nullptr;
diff --git a/lib/atkaudio/src/atkaudio/PluginHost2/Plugins/MidiGainPlugin.h b/lib/atkaudio/src/atkaudio/PluginHost2/Plugins/MidiGainPlugin.h
diff --git a/lib/atkaudio/src/atkaudio/PluginHost2/UI/MainHostWindow.cpp b/lib/atkaudio/src/atkaudio/PluginHost2/UI/MainHostWindow.cpp
@@ -334,7 +334,7 @@ MainHostWindow::MainHostWindow()
 
     restoreWindowStateFromString(getAppProperties().getUserSettings()->getValue("mainWindowPos"));
 
-    setVisible(false);
+    setVisible(true);
 
     InternalPluginFormat internalFormat;
     internalTypes = internalFormat.getAllTypes();
@@ -409,48 +409,15 @@ struct AsyncQuitRetrier final : private Timer
 
 void MainHostWindow::tryToQuitApplication()
 {
-    if (graphHolder->closeAnyOpenPluginWindows())
-    {
-        // Really important thing to note here: if the last call just deleted any plugin windows,
-        // we won't exit immediately - instead we'll use our AsyncQuitRetrier to let the message
-        // loop run for another brief moment, then try again. This will give any plugins a chance
-        // to flush any GUI events that may have been in transit before the app forces them to
-        // be unloaded
-        new AsyncQuitRetrier();
-        return;
-    }
-
-    if (ModalComponentManager::getInstance()->cancelAllModalComponents())
-    {
-        new AsyncQuitRetrier();
-        return;
-    }
-
+    // In plugin context, we don't quit the host application (OBS).
+    // Instead, attempt to close plugin windows and hide our window.
     if (graphHolder != nullptr)
-    {
-        auto releaseAndQuit = [this]
-        {
-            // Some plug-ins do not want [NSApp stop] to be called
-            // before the plug-ins are not deallocated.
-            graphHolder->releaseGraph();
-        };
-
-        SafePointer<MainHostWindow> parent{this};
-        graphHolder->graph->saveIfNeededAndUserAgreesAsync(
-            [parent, releaseAndQuit](FileBasedDocument::SaveResult r)
-            {
-                if (parent == nullptr)
-                    return;
+        (void)graphHolder->closeAnyOpenPluginWindows();
 
-                if (r == FileBasedDocument::savedOk)
-                    releaseAndQuit();
-            }
-        );
+    if (ModalComponentManager::getInstance() != nullptr)
+        (void)ModalComponentManager::getInstance()->cancelAllModalComponents();
 
-        return;
-    }
-
-    JUCEApplication::quit();
+    setVisible(false);
 }
 
 void MainHostWindow::changeListenerCallback(ChangeBroadcaster* changed)
diff --git a/lib/atkaudio/src/atkaudio/atkaudio.cpp b/lib/atkaudio/src/atkaudio/atkaudio.cpp
@@ -20,16 +20,50 @@ void atk::create()
 
 void atk::pump()
 {
-    juce::MessageManager::getInstance()->runDispatchLoopUntil(2);
+    juce::MessageManager::getInstance()->runDispatchLoopUntil(10);
 }
 
 void atk::destroy()
 {
+    // Explicitly delete UpdateCheck before shutting down JUCE
+    if (updateCheck != nullptr)
+    {
+        delete updateCheck;
+        updateCheck = nullptr;
+    }
+
     juce::MessageManager::getInstance()->setCurrentThreadAsMessageThread();
+
+    // Force hide all visible JUCE components before shutdown
+    auto& desktop = juce::Desktop::getInstance();
+    for (int i = 0; i < desktop.getNumComponents(); ++i)
+    {
+        if (auto* comp = desktop.getComponent(i))
+        {
+            if (comp->isVisible())
+                comp->setVisible(false);
+        }
+    }
+
+    // Process any pending messages after hiding components
+    for (int i = 0; i < 100; ++i)
+    {
+        juce::MessageManager::getInstance()->runDispatchLoopUntil(1);
+        if (juce::Desktop::getInstance().getNumComponents() == 0)
+            break;
+    }
+
     auto numComponents = juce::Desktop::getInstance().getNumComponents();
+    DBG("shutting down with " << numComponents << " remaining components");
+
     juce::shutdownJuce_GUI();
-    DBG("waiting components: " << numComponents);
-    std::this_thread::sleep_for(std::chrono::milliseconds(100 * numComponents > 1000 ? 1000 : 100 * numComponents));
+
+    // Brief wait only if components remain - they should be mostly cleaned up by now
+    if (numComponents > 0)
+    {
+        int waitMs = jmin(1000, 100 * numComponents); // Reduced from 200ms per component
+        std::this_thread::sleep_for(std::chrono::milliseconds(waitMs));
+    }
 }
 
 void atk::update()
diff --git a/src/plugin-main.cpp b/src/plugin-main.cpp

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,11 @@ class AudioAppMainWindow final : public DocumentWindow`
`126`	`126`	`setVisible(false);`
`127`	`127`	`}`
`128`	`128`
	`129`	`+ ~AudioAppMainWindow() override`
	`130`	`+ {`
	`131`	`+ // Note: setVisible(false) is handled by atk::destroy() force-hide before this destructor runs`
	`132`	`+ }`
	`133`	`+`
`129`	`134`	`void closeButtonPressed() override`
`130`	`135`	`{`
`131`	`136`	`setVisible(false);`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ class ObsOutputAudioProcessor : public juce::AudioProcessor`
`33`	`33`
`34`	`34`	`obs_source_set_audio_active(privateSource, true);`
`35`	`35`	`obs_source_set_enabled(privateSource, true);`
	`36`	`+ obs_source_release(sceneSource);`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`