CLAP preset discovery updates (#35)

* Setting up CLAP preset discovery * Update modules
Chowdhury-DSP · Jan 29, 2024 · a5e9545 · a5e9545
1 parent f5dccd1
commit a5e9545
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/modules/chowdsp_utils b/modules/chowdsp_utils
diff --git a/modules/clap-juce-extensions b/modules/clap-juce-extensions
diff --git a/src/ChowMultiTool.cpp b/src/ChowMultiTool.cpp
@@ -16,6 +16,16 @@ ChowMultiTool::ChowMultiTool() : chowdsp::PluginBase<State> (&undoManager, creat
 
     presetManager = std::make_unique<state::presets::PresetManager> (*this);
     programAdaptor = std::make_unique<chowdsp::presets::frontend::PresetsProgramAdapter> (presetManager);
+
+#if HAS_CLAP_JUCE_EXTENSIONS
+    presetManager->clapPresetLoadedBroadcaster.connect (
+        [this] (uint32_t location_kind,
+                const char* location,
+                const char* load_key)
+        {
+            reportPresetLoaded (location_kind, location, load_key);
+        });
+#endif
 }
 
 juce::AudioProcessor::BusesProperties ChowMultiTool::createBusLayout()
@@ -100,7 +110,8 @@ static const clap_preset_discovery_factory chowmultitool_preset_discovery_factor
 
 const void* JUCE_CALLTYPE clapJuceExtensionCustomFactory (const char* factory_id)
 {
-    if (strcmp (factory_id, CLAP_PRESET_DISCOVERY_FACTORY_ID) == 0)
+    if (strcmp (factory_id, CLAP_PRESET_DISCOVERY_FACTORY_ID) == 0
+        || strcmp (factory_id, CLAP_PRESET_DISCOVERY_FACTORY_ID_COMPAT) == 0)
     {
         return &chowmultitool_preset_discovery_factory;
     }

diff --git a/src/state/presets/PresetDiscovery.cpp b/src/state/presets/PresetDiscovery.cpp
@@ -5,7 +5,7 @@
 
 namespace state::presets::discovery
 {
-static constexpr clap_plugin_id plugin_id {
+static constexpr clap_universal_plugin_id plugin_id {
     .abi = "clap",
     .id = CHOWMULTITOOL_CLAP_ID,
 };
@@ -35,7 +35,7 @@ struct FactoryPresetsProvider : chowdsp::presets::discovery::EmbeddedPresetsProv
 
     static constexpr clap_preset_discovery_location factoryPresetsLocation {
         .flags = CLAP_PRESET_DISCOVERY_IS_FACTORY_CONTENT,
-        .name = "ChowMultiTool Factory Presets Location",
+        .name = "ChowMultiTool Factory Presets",
         .kind = CLAP_PRESET_DISCOVERY_LOCATION_PLUGIN,
         .location = nullptr,
     };
@@ -57,7 +57,7 @@ struct UserPresetsProvider : chowdsp::presets::discovery::FilePresetsProvider
     static constexpr clap_preset_discovery_provider_descriptor descriptor {
         .clap_version = CLAP_VERSION_INIT,
         .id = "org.chowdsp.ChowMultiTool.user-presets",
-        .name = "ChowMultiTool User Presets Provider",
+        .name = "ChowMultiTool User Presets",
         .vendor = "User"
     };