From bf83f160cb89ddacb262b5d0e53cc1f62f600ceb Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 5 Dec 2021 16:47:42 +0000
Subject: [PATCH] Ildaeil: Setup juce in a shared class, debug discovery plugin
 count

Signed-off-by: falkTX <falktx@falktx.com>
---
 plugins/Cardinal/src/Ildaeil.cpp | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/plugins/Cardinal/src/Ildaeil.cpp b/plugins/Cardinal/src/Ildaeil.cpp
index a1c6c84..e6878b0 100644
--- a/plugins/Cardinal/src/Ildaeil.cpp
+++ b/plugins/Cardinal/src/Ildaeil.cpp
@@ -32,6 +32,7 @@
 # include "extra/FileBrowserDialog.hpp"
 # include "extra/ScopedPointer.hpp"
 # include "extra/Thread.hpp"
+# include "../../src/extra/SharedResourcePointer.hpp"
 #else
 # include "extra/Mutex.hpp"
 #endif
@@ -212,6 +213,13 @@ static void projectLoadedFromDSP(void* ui);
 
 static Mutex sPluginInfoLoadMutex;
 
+#ifndef HEADLESS
+struct JuceInitializer {
+    JuceInitializer() { carla_juce_init(); }
+    ~JuceInitializer() { carla_juce_cleanup(); }
+};
+#endif
+
 struct IldaeilModule : Module {
     enum ParamIds {
         NUM_PARAMS
@@ -236,6 +244,10 @@ struct IldaeilModule : Module {
         NUM_LIGHTS
     };
 
+#ifndef HEADLESS
+    SharedResourcePointer<JuceInitializer> juceInitializer;
+#endif
+
     CardinalPluginContext* const pcontext;
 
     const NativePluginDescriptor* fCarlaPluginDescriptor = nullptr;
@@ -936,7 +948,6 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
 
             if (! idleCallbackActive)
             {
-                carla_juce_init();
                 idleCallbackActive = pcontext->addIdleCallback(this);
             }
         }
@@ -955,7 +966,6 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
             {
                 idleCallbackActive = false;
                 pcontext->removeIdleCallback(this);
-                carla_juce_cleanup();
 
                 if (fileBrowserHandle != nullptr)
                 {
@@ -1097,15 +1107,19 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
 
         const MutexLocker cml(sPluginInfoLoadMutex);
 
-        if (const uint count = carla_get_cached_plugin_count(fPluginType, path))
+        d_stdout("Will scan plugins now...");
+        const uint count = carla_get_cached_plugin_count(fPluginType, path);
+        d_stdout("Scanning found %u plugins", count);
+
+        if (fDrawingState == kDrawingLoading)
         {
-            fPlugins = new PluginInfoCache[count];
+            fDrawingState = kDrawingPluginList;
+            fPluginSearchFirstShow = true;
+        }
 
-            if (fDrawingState == kDrawingLoading)
-            {
-                fDrawingState = kDrawingPluginList;
-                fPluginSearchFirstShow = true;
-            }
+        if (count != 0)
+        {
+            fPlugins = new PluginInfoCache[count];
 
             for (uint i=0, j; i < count && ! shouldThreadExit(); ++i)
             {