Some auv2 changes for clap saw demo test case (#121)

* Some auv2 changes for clap saw demo test case 1. identifier _ vs - 2. plist created correctly I can now run the clap saw demo in the debugger with tracktion pluginval to see what fails, at least * With these changes the clap-saw-demo validates * sigh * Scan paths properly
free-audio · Sep 10, 2023 · d491c2f · d491c2f
1 parent 660641b
commit d491c2f
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 59 deletions.
diff --git a/cmake/enable_sdks.cmake b/cmake/enable_sdks.cmake
@@ -350,7 +350,8 @@ function(target_add_vst3_wrapper)
 
 	if (APPLE)
 		if ("${V3_BUNDLE_IDENTIFIER}" STREQUAL "")
-			set(V3_BUNDLE_IDENTIFIER "org.cleveraudio.wrapper.${outidentifier}.vst3")
+			string(REPLACE "_" "-" repout ${outidentifier})
+			set(V3_BUNDLE_IDENTIFIER "org.cleveraudio.wrapper.${repout}.vst3")
 		endif()
 
 		if ("${CLAP_WRAPPER_BUNDLE_VERSION}" STREQUAL "")
@@ -369,7 +370,7 @@ function(target_add_vst3_wrapper)
 				MACOSX_BUNDLE_INFO_PLIST ${CLAP_WRAPPER_CMAKE_CURRENT_SOURCE_DIR}/cmake/VST3_Info.plist.in
 				)
 		if (NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
-			add_custom_command(TARGET ${V3_TARGET} POST_BUILD
+			add_custom_command(TARGET ${V3_TARGET} PRE_BUILD
 					WORKING_DIRECTORY $<TARGET_PROPERTY:${V3_TARGET},LIBRARY_OUTPUT_DIRECTORY>
 					COMMAND SetFile -a B "$<TARGET_PROPERTY:${V3_TARGET},LIBRARY_OUTPUT_NAME>.$<TARGET_PROPERTY:${V3_TARGET},BUNDLE_EXTENSION>"
 					)
@@ -551,6 +552,13 @@ if (APPLE)
 						)
 			endif()
 
+			string(MAKE_C_IDENTIFIER ${AUV2_OUTPUT_NAME} outidentifier)
+
+			if ("${AUV2_BUNDLE_IDENTIFIER}" STREQUAL "")
+				string(REPLACE "_" "-" repout ${outidentifier})
+				set(AUV2_BUNDLE_IDENTIFIER "org.cleveraudio.wrapper.${repout}.auv2")
+			endif()
+
 			set(AUV2_MANUFACTURER_NAME ${AUV2_MANUFACTURER_NAME} PARENT_SCOPE)
 			set(AUV2_MANUFACTURER_CODE ${AUV2_MANUFACTURER_CODE} PARENT_SCOPE)
 			configure_file(${bhsc}/auv2_infoplist_top.in
@@ -561,15 +569,15 @@ if (APPLE)
 
 			message(STATUS "clap-wrapper: Adding AUV2 Wrapper to target ${AUV2_TARGET} generating '${AUV2_OUTPUT_NAME}.component'")
 
-			string(MAKE_C_IDENTIFIER ${AUV2_OUTPUT_NAME} outidentifier)
-
 			# This is a placeholder dummy until we actually write the AUv2
 			# Similarly the subordinate library being an interface below
 			# is a placeholder. When we write it we will follow a similar
 			# split trick as for the vst3, mostly (but AUV2 is a bit different
 			# with info.plist and entrypoint-per-instance stuff)
 			target_sources(${AUV2_TARGET} PRIVATE
 					${CLAP_WRAPPER_CMAKE_CURRENT_SOURCE_DIR}/src/wrapasauv2.cpp
+					${CLAP_WRAPPER_CMAKE_CURRENT_SOURCE_DIR}/src/detail/auv2/auv2_shared.h
+					${CLAP_WRAPPER_CMAKE_CURRENT_SOURCE_DIR}/src/detail/auv2/auv2_base_classes.h
 					${bhtgoutdir}/generated_entrypoints.hxx)
 
 
@@ -588,10 +596,6 @@ if (APPLE)
 			set_target_properties(${AUV2_TARGET} PROPERTIES LIBRARY_OUTPUT_NAME "${AUV2_OUTPUT_NAME}")
 			target_link_libraries(${AUV2_TARGET} PUBLIC ${AUV2_TARGET}-clap-wrapper-auv2-lib)
 
-			if ("${AUV2_BUNDLE_IDENTIFIER}" STREQUAL "")
-				set(AUV2_BUNDLE_IDENTIFIER "org.cleveraudio.wrapper.${outidentifier}.auv2")
-			endif()
-
 			if ("${CLAP_WRAPPER_BUNDLE_VERSION}" STREQUAL "")
 				set(CLAP_WRAPPER_BUNDLE_VERSION "1.0")
 			endif()

diff --git a/src/detail/auv2/auv2_shared.h b/src/detail/auv2/auv2_shared.h
@@ -2,63 +2,68 @@
 #pragma once
 
 #include "detail/clap/fsutil.h"
+#include <iostream>
 
-namespace free_audio::auv2_wrapper
-{
-struct ClapBridge
-{
-    std::string _clapname;
-    std::string _clapid;
-    int _idx;
+namespace free_audio::auv2_wrapper {
+struct ClapBridge {
+  std::string _clapname;
+  std::string _clapid;
+  int _idx;
 
-    Clap::Library _library;
+  Clap::Library _library;
 
-    const clap_plugin_descriptor_t *_desc{nullptr};
+  const clap_plugin_descriptor_t *_desc{nullptr};
 
-    ClapBridge(const std::string &clapname,
-               const std::string &clapid,
-               int idx) : _clapname(clapname), _clapid(clapid), _idx(idx)
-    {
-    }
-
-    void initialize()
-    {
-        if (!_library.hasEntryPoint())
-        {
-            if (!_library.load(_clapname.c_str()))
-            {
-                std::cout << "[ERROR] cannot load either by internal entry nor _clapname" << std::endl;
-                return;
-            }
-        }
+  ClapBridge(const std::string &clapname, const std::string &clapid, int idx)
+      : _clapname(clapname), _clapid(clapid), _idx(idx) {
+    std::cout << "[clap-wraper] auv2: creating clap bridge nm=" << clapname
+              << " id=" << clapid << " idx=" << idx << std::endl;
+  }
 
-        if (_clapid.empty())
-        {
-            if (_idx < 0 || _idx >= _library.plugins.size())
-            {
-                std::cout << "[ERROR] cannot load by index" << std::endl;
-                return;
-            }
-            _desc = _library.plugins[_idx];
-        }
-        else
-        {
-            for (auto *d : _library.plugins)
-            {
-                if (strcmp(d->id, _clapid.c_str()) == 0)
-                {
-                    _desc = d;
-                }
-            }
-        }
+  void initialize() {
+    if (!_library.hasEntryPoint()) {
+      if (_clapname.empty()) {
+        std::cout << "[ERROR] _clapname (" << _clapname
+                  << ") empty and no internal entry point" << std::endl;
+      }
+      bool loaded{false};
+      auto csp = Clap::getValidCLAPSearchPaths();
+      for (auto &cs : csp) {
+        if (fs::is_directory(cs / (_clapname + ".clap")))
+          if (_library.load(_clapname.c_str())) {
+            std::cout << "[clap-wrapper] auv2 loaded clap from "
+                      << cs.u8string() << std::endl;
+            loaded = true;
+            break;
+          }
+      }
+      if (!loaded) {
+        std::cout << "[ERROR] cannot load clap" << std::endl;
+        return;
+      }
+    }
 
-        if (!_desc)
-        {
-            std::cout << "[ERROR] cannot determine plugin description" << std::endl;
-            return;
+    if (_clapid.empty()) {
+      if (_idx < 0 || _idx >= _library.plugins.size()) {
+        std::cout << "[ERROR] cannot load by index" << std::endl;
+        return;
+      }
+      _desc = _library.plugins[_idx];
+    } else {
+      for (auto *d : _library.plugins) {
+        if (strcmp(d->id, _clapid.c_str()) == 0) {
+          _desc = d;
         }
+      }
+    }
 
-        std::cout << "[clap-wrapper] auv2: Initialized '" << _desc->id << "' / '" << _desc->name << "'" <<  std::endl;
+    if (!_desc) {
+      std::cout << "[ERROR] cannot determine plugin description" << std::endl;
+      return;
     }
+
+    std::cout << "[clap-wrapper] auv2: Initialized '" << _desc->id << "' / '"
+              << _desc->name << "'" << std::endl;
+  }
 };
-}
+} // namespace free_audio::auv2_wrapper
diff --git a/src/detail/auv2/build-helper/auv2_infoplist_top.in b/src/detail/auv2/build-helper/auv2_infoplist_top.in
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>${AUV2_OUTPUT_NAME}</string>
     <key>CFBundleIdentifier</key>
-    <string>${AUV2_BUNDLE_VERSION}</string>
+    <string>${AUV2_BUNDLE_IDENTIFIER}</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>