Fixed class name collision with Audio Unit

pongasoft · Dec 8, 2024 · ffa8946 · ffa8946
1 parent 5b67d20
commit ffa8946
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ Check the [Quickstart](https://jamba.dev/quickstart/) section to getting started
 Latest Release
 --------------
 
-7.1.3 | 2024-12-01 | VST SDK 3.7.12+
+7.1.4 | 2024-12-08 | VST SDK 3.7.12+
 
 [Release notes (local)](RELEASE.md)
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -3,6 +3,10 @@ Release Notes {#release-notes}
 
 Check the [Requirements](https://jamba.dev/requirements/) documentation for information about which VST3 SDK Jamba supports and how to get it.
 
+## [7.1.4 | 2024-12-08](https://github.com/pongasoft/jamba/tree/v7.1.4)
+
+* Fixed class name collision with Audio Unit
+
 ## [7.1.3 | 2024-12-01](https://github.com/pongasoft/jamba/tree/v7.1.3)
 
 * Use `FetchContent_Populate`/`FetchContent_MakeAvailable` with `SOURCE_SUBDIR` option (see [CMake discussion](https://discourse.cmake.org/t/prevent-fetchcontent-makeavailable-to-execute-cmakelists-txt))

diff --git a/audio-unit/auwrapper/CMakeLists.txt b/audio-unit/auwrapper/CMakeLists.txt
@@ -27,8 +27,11 @@ if (MAC)
         "-framework Cocoa"
         "-framework CoreAudio")
     target_include_directories(${target} PRIVATE "${SMTG_COREAUDIO_SDK_PATH}/**")
-    string(MD5 AU_NAMESPACE_SUFFIX "${JAMBA_VST3_PLUGIN_TARGET}")
-    file(WRITE "${CMAKE_BINARY_DIR}/generated/aucocoaclassprefix.h" "#define SMTG_AU_NAMESPACE SMTGAUCocoa${AU_NAMESPACE_SUFFIX}_\n")
+    string(MAKE_C_IDENTIFIER "SMTG_AUCocoaUIBase_${JAMBA_VST3_PLUGIN_TARGET}" SMTG_AUCocoaUIBase_CLASS_NAME)
+    target_compile_definitions(${target} PUBLIC
+        SMTG_AUCocoaUIBase_CLASS_NAME=$<IF:$<CONFIG:Debug>,${SMTG_AUCocoaUIBase_CLASS_NAME}_Debug,${SMTG_AUCocoaUIBase_CLASS_NAME}>
+        CA_USE_AUDIO_PLUGIN_ONLY=0
+    )
     target_include_directories(${target} PRIVATE "${CMAKE_BINARY_DIR}/generated")
   else ()
     message("* To enable building the AudioUnit wrapper, you need to use the Xcode generator")

diff --git a/jamba-test-plugin/audio-unit/audiounitconfig.h b/jamba-test-plugin/audio-unit/audiounitconfig.h
@@ -26,13 +26,13 @@
 /* A manufacturer code for the audio unit, such as Aaud. This value must be exactly 4 alphanumeric characters.
  * This value should be unique across audio units of the same manufacturer
  * Manufacturer OSType should have at least one non-lower case character */
-#define kAUPluginManufacturer 		Jtp1
+#define kAUPluginManufacturer 		Psft
 
 // Definitions for the resource file
 #define kAudioUnitName				      "pongasoft: JambaTestPlugin" // same as kAUPluginName
 #define kAudioUnitDescription	      "JambaTestPlugin" // same as kAUPluginDescription
 #define kAudioUnitType				      'aufx' // same as kAUPluginType
 #define kAudioUnitComponentSubType	'unkw' // same as kAUPluginSubType
-#define kAudioUnitComponentManuf    'Jtp1' // same as kAUPluginManufacturer
+#define kAudioUnitComponentManuf    'Psft' // same as kAUPluginManufacturer
 
 #define kAudioUnitCarbonView		1		// if 0 no Carbon view support will be added
diff --git a/jamba.cmake b/jamba.cmake
@@ -46,7 +46,7 @@ endif()
 #------------------------------------------------------------------------
 set(JAMBA_MAJOR_VERSION 7)
 set(JAMBA_MINOR_VERSION 1)
-set(JAMBA_PATCH_VERSION 3)
+set(JAMBA_PATCH_VERSION 4)
 execute_process(COMMAND git describe --long --dirty --abbrev=10 --tags
     RESULT_VARIABLE result
     OUTPUT_VARIABLE JAMBA_GIT_VERSION