Preset discovery and processor factory optimization

CMakeLists.txt

@@ -113,6 +113,7 @@ if(BYOD_BUILD_CLAP)
         CLAP_FEATURES audio-effect distortion
         CLAP_PROCESS_EVENTS_RESOLUTION_SAMPLES 64
         CLAP_USE_JUCE_PARAMETER_RANGES DISCRETE
+        CLAP_SUPPORTS_CUSTOM_FACTORY 1
     )
 endif()
 

src/BYOD.cpp

@@ -121,3 +121,27 @@ AudioProcessor* JUCE_CALLTYPE createPluginFilter()
 {
     return new BYOD();
 }
+
+#if HAS_CLAP_JUCE_EXTENSIONS
+#include "state/presets/PresetDiscovery.h"
+
+bool BYOD::presetLoadFromLocation (uint32_t location_kind, const char* location, const char* load_key) noexcept
+{
+    return preset_discovery::presetLoadFromLocation (*presetManager, location_kind, location, load_key);
+}
+
+static const clap_preset_discovery_factory byod_preset_discovery_factory {
+    .count = preset_discovery::count,
+    .get_descriptor = preset_discovery::get_descriptor,
+    .create = preset_discovery::create,
+};
+
+const void* JUCE_CALLTYPE clapJuceExtensionCustomFactory (const char* factory_id)
+{
+    if (strcmp (factory_id, CLAP_PRESET_DISCOVERY_FACTORY_ID) == 0)
+    {
+        return &byod_preset_discovery_factory;
+    }
+    return nullptr;
+}
+#endif

src/BYOD.h

@@ -35,6 +35,14 @@ class BYOD : public chowdsp::PluginBase<BYOD>
     auto& getUndoManager() { return undoManager; }
     auto& getStateManager() { return *stateManager; }
 
+#if HAS_CLAP_JUCE_EXTENSIONS
+    bool supportsPresetLoad() const noexcept override
+    {
+        return true;
+    }
+    bool presetLoadFromLocation (uint32_t location_kind, const char* location, const char* load_key) noexcept override;
+#endif
+
 private:
     void processBypassDelay (AudioBuffer<float>& buffer);
     void updateSampleLatency (int latencySamples);

src/CMakeLists.txt

@@ -44,6 +44,7 @@ target_sources(BYOD PRIVATE
     state/ParamForwardManager.cpp
     state/presets/PresetInfoHelpers.cpp
     state/presets/PresetManager.cpp
+    state/presets/PresetDiscovery.cpp
     state/presets/PresetsServerSyncManager.cpp
     state/presets/PresetsServerUserManager.cpp
     state/presets/PresetsServerCommunication.cpp

src/headless/CMakeLists.txt

@@ -22,6 +22,7 @@ target_sources(BYOD_headless PRIVATE
     tests/PreBufferTest.cpp
     tests/PresetsTest.cpp
     tests/PresetSearchTest.cpp
+    tests/ProcessorStoreInfoTest.cpp
     tests/RAMUsageTest.cpp
     tests/SilenceTest.cpp
     tests/StereoTest.cpp

src/headless/GuitarMLFilterDesigner.cpp

@@ -21,7 +21,7 @@ void GuitarMLFilterDesigner::generateFiles ([[maybe_unused]] const ArgumentList&
     noiseGenerator.setSeed (123);
     noiseGenerator.setNoiseType (chowdsp::Noise<float>::NoiseType::Normal);
 
-    const auto factory = ProcessorStore::getStoreMap().at ("GuitarML");
+    const auto factory = ProcessorStore::getStoreMap().at ("GuitarML").factory;
     const auto processFile = [&factory,
                               &saveLoadHelper,
                               &noiseGenerator] (const juce::String& filePath, double sampleRate)

src/headless/PresetSaveLoadTime.cpp

@@ -29,7 +29,7 @@ void setUpInitialProcChain (ProcessorChain& procChain, ProcessorChainActionHelpe
         int storeIndex = rand.nextInt ((int) storeMap.size());
         std::advance (storeIter, storeIndex);
 
-        actionHelper.addProcessor (storeIter->second (um));
+        actionHelper.addProcessor (storeIter->second.factory (um));
         auto* newProc = procChain.getProcessors().getLast();
         actionHelper.addConnection ({ prevProc, 0, newProc, 0 });
 

src/headless/tests/BadModulationTest.cpp

@@ -10,9 +10,9 @@ class BadModulationTest : public UnitTest
     void runTest() override
     {
         StringArray processorsWithNoModulation {};
-        for (auto [name, factory] : ProcessorStore::getStoreMap())
+        for (auto [name, storeEntry] : ProcessorStore::getStoreMap())
         {
-            const auto proc = factory (nullptr);
+            const auto proc = storeEntry.factory (nullptr);
 
             bool hasModulationInputs = false;
             for (int i = 0; i < proc->getNumInputs(); ++i)

src/headless/tests/ProcessorStoreInfoTest.cpp

@@ -0,0 +1,25 @@
+#include "processors/ProcessorStore.h"
+
+class ProcessorStoreInfoTest : public UnitTest
+{
+public:
+    ProcessorStoreInfoTest()
+        : UnitTest ("Processor Store Info Test")
+    {
+    }
+
+    void runTest() override
+    {
+        for (const auto& [name, storeEntry] : ProcessorStore::getStoreMap())
+        {
+            const auto proc = storeEntry.factory (nullptr);
+            beginTest ("Checking processor info for: " + name);
+            expectEquals (proc->getName(), name, "Processor name is incorrect!");
+            expectEquals (proc->getProcessorType(), storeEntry.info.type, "Processor type is incorrect!");
+            expectEquals (proc->getNumInputs(), storeEntry.info.numInputs, "Processor # inputs is incorrect!");
+            expectEquals (proc->getNumOutputs(), storeEntry.info.numOutputs, "Processor # outputs is incorrect!");
+        }
+    }
+};
+
+static ProcessorStoreInfoTest processorStoreInfoTest;

src/headless/tests/StereoTest.cpp

@@ -23,8 +23,8 @@ class StereoTest : public UnitTest
 
         plugin.prepareToPlay (sampleRate, blockSize);
 
-        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter");
-        auto& mergerFactory = ProcessorStore::getStoreMap().at ("Stereo Merger");
+        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter").factory;
+        auto& mergerFactory = ProcessorStore::getStoreMap().at ("Stereo Merger").factory;
 
         actionHelper.addProcessor (splitterFactory (undoManager));
         actionHelper.addProcessor (mergerFactory (undoManager));
@@ -69,8 +69,8 @@ class StereoTest : public UnitTest
 
         plugin.prepareToPlay (sampleRate, blockSize);
 
-        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter");
-        auto& mergerFactory = ProcessorStore::getStoreMap().at ("Stereo Merger");
+        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter").factory;
+        auto& mergerFactory = ProcessorStore::getStoreMap().at ("Stereo Merger").factory;
 
         actionHelper.addProcessor (splitterFactory (undoManager));
         actionHelper.addProcessor (mergerFactory (undoManager));
@@ -125,7 +125,7 @@ class StereoTest : public UnitTest
 
         plugin.prepareToPlay (sampleRate, blockSize);
 
-        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter");
+        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter").factory;
         actionHelper.addProcessor (splitterFactory (undoManager));
 
         auto* input = &chain.getInputProcessor();
@@ -165,7 +165,7 @@ class StereoTest : public UnitTest
 
         plugin.prepareToPlay (sampleRate, blockSize);
 
-        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter");
+        auto& splitterFactory = ProcessorStore::getStoreMap().at ("Stereo Splitter").factory;
         actionHelper.addProcessor (splitterFactory (undoManager));
 
         auto* input = &chain.getInputProcessor();

src/headless/tests/UndoRedoTest.cpp

@@ -17,7 +17,7 @@ class UndoRedoTest : public UnitTest
         std::advance (storeIter, storeIndex);
 
         auto& actionHelper = chain.getActionHelper();
-        actionHelper.addProcessor (storeIter->second (um));
+        actionHelper.addProcessor (storeIter->second.factory (um));
 
         return true;
     }

src/headless/tests/UnitTests.h

@@ -2,15 +2,15 @@
 
 static inline void runTestForAllProcessors (UnitTest* ut, const std::function<void (BaseProcessor*)>& testFunc, const StringArray& procsToSkip = {})
 {
-    for (auto [name, factory] : ProcessorStore::getStoreMap())
+    for (auto [name, storeEntry] : ProcessorStore::getStoreMap())
     {
         if (procsToSkip.contains (name))
         {
             std::cout << "Skipping " << ut->getName() << " for processor: " << name << std::endl;
             continue;
         }
 
-        auto proc = factory (nullptr);
+        auto proc = storeEntry.factory (nullptr);
         ut->beginTest (proc->getName() + " Test");
         testFunc (proc.get());
         proc->freeInternalMemory();