Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#286 - fix hang when >1 Camomile LV2 plugin is loaded on Linux #295

Merged
merged 5 commits into from
May 19, 2023
Merged

#286 - fix hang when >1 Camomile LV2 plugin is loaded on Linux #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69102ee
makePresetsFile(): plugin parameters should be indexed by j, not i
hyperpenelope Jan 15, 2022
a551011
Improve the behaviour of cp commands in camomile plugin generation sc…
hyperpenelope May 17, 2022
d9d252b
Merge pull request #2 from hyperpenelope/bugfix/camomile-script-deref…
hyperpenelope May 17, 2022
72580fb
Merge pull request #1 from hyperpenelope/dev/lv2_file_generator-segfa…
hyperpenelope May 17, 2022
27a4a14
CMakeLists.txt: fix hang when >1 Camomile LV2 plugin is loaded (issue…
hyperpenelope Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ target_sources(CamomileFx PRIVATE ${CamomileSources} ${CamomilePdSources})

add_library(Camomile_LV2 SHARED ${CamomileLV2Sources})
target_link_libraries(Camomile_LV2 PRIVATE CamomileFx)
set_target_properties(Camomile_LV2 PROPERTIES PREFIX "")
set_target_properties(Camomile_LV2 PROPERTIES PREFIX "" CXX_STANDARD 20)

if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
target_compile_options(Camomile_LV2 PRIVATE "-fno-gnu-unique")
endif()

set(CAMOMILE_COMPILE_DEFINITIONS
JUCE_APP_CONFIG_HEADER="${SOURCES_DIRECTORY}/PluginConfig.h"
Expand Down
4 changes: 2 additions & 2 deletions LV2/juce_LV2_FileCreator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,9 @@ class JuceLV2FileCreator
preset += " [\n";
}

String const paramName = params[i]->getName(1000);
String const paramName = params[j]->getName(1000);
preset += " lv2:symbol \"" + nameToSymbol(paramName, j) + "\" ;\n";
preset += " pset:value " + String::formatted("%f", safeParamValue(params[i]->getValue())) + " ;\n";
preset += " pset:value " + String::formatted("%f", safeParamValue(params[j]->getValue())) + " ;\n";

if (j + 1 == params.size())
{
Expand Down
16 changes: 8 additions & 8 deletions Plugins/camomile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ generate_plugin_lv2_mac() {
mkdir "$plugin_output_dir/$plugin_name.lv2/Contents"
mkdir "$plugin_output_dir/$plugin_name.lv2/Contents/Resources"
cp -f "$ThisPath/$CamomileLV2.$AppleLV2Extension" "$plugin_output_dir/$plugin_name.lv2/$plugin_name.$AppleLV2Extension"
cp -rf "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.lv2/Contents/Resources"
cp -RfL "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.lv2/Contents/Resources"
for subfile in $(find "$plugin_output_dir/$plugin_name.lv2")
do
xattr -d com.apple.quarantine "$subfile"
Expand Down Expand Up @@ -181,8 +181,8 @@ generate_plugin_au_mac() {
rm -rf "$plugin_output_dir/$plugin_name.$AppleAuExtension"
fi

cp -rf "$ThisPath/$camo_name.$AppleAuExtension" $plugin_output_dir/$plugin_name.$AppleAuExtension
cp -rf "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.$AppleAuExtension/Contents/Resources"
cp -Rf "$ThisPath/$camo_name.$AppleAuExtension" $plugin_output_dir/$plugin_name.$AppleAuExtension
cp -RfL "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.$AppleAuExtension/Contents/Resources"
xattr -d com.apple.quarantine "$plugin_output_dir/$plugin_name.$AppleAuExtension"
for subfile in $(find "$plugin_output_dir/$plugin_name.$AppleAuExtension/Contents")
do
Expand Down Expand Up @@ -235,8 +235,8 @@ generate_plugin_vst3_mac() {
rm -rf "$plugin_output_dir/$plugin_name.$AppleVst3Extension"
fi

cp -rf "$ThisPath/$camo_name.$AppleVst3Extension" "$plugin_output_dir/$plugin_name.$AppleVst3Extension"
cp -rf "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.$AppleVst3Extension/Contents/Resources"
cp -Rf "$ThisPath/$camo_name.$AppleVst3Extension" "$plugin_output_dir/$plugin_name.$AppleVst3Extension"
cp -RfL "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.$AppleVst3Extension/Contents/Resources"
xattr -d com.apple.quarantine "$plugin_output_dir/$plugin_name.$AppleVst3Extension"
for subfile in $(find "$plugin_output_dir/$plugin_name.$AppleVst3Extension/Contents")
do
Expand Down Expand Up @@ -274,7 +274,7 @@ generate_plugin_lv2_linux() {

mkdir "$plugin_output_dir/$plugin_name.lv2"
cp -f "$ThisPath/$CamomileLV2.$LinuxLV2Extension" "$plugin_output_dir/$plugin_name.lv2/$plugin_name.$LinuxLV2Extension"
cp -rf "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.lv2"
cp -RfL "$plugin_input_dir"/* "$plugin_output_dir/$plugin_name.lv2"

LD_LIBRARY_PATH=$PWD "$ThisPath/lv2_file_generator" "$plugin_output_dir/$plugin_name.lv2/$plugin_name.$LinuxLV2Extension" $plugin_name
mv -f "$PWD/manifest.ttl" "$plugin_output_dir/$plugin_name.lv2/manifest.ttl"
Expand Down Expand Up @@ -324,8 +324,8 @@ generate_plugin_vst3_linux() {
rm -rf $plugin_bundle
fi

cp -rf "$ThisPath/$camo_name.$LinuxVst3Extension" $plugin_bundle
cp -rf "$plugin_input_dir"/* "$plugin_bundle/Contents/x86_64-linux"
cp -Rf "$ThisPath/$camo_name.$LinuxVst3Extension" $plugin_bundle
cp -RfL "$plugin_input_dir"/* "$plugin_bundle/Contents/x86_64-linux"
mv -f "$plugin_bundle/Contents/x86_64-linux/$camo_name.so" "$plugin_bundle/Contents/x86_64-linux/$plugin_name.so"
post_log "$plugin_output_dir/$plugin_name.$LinuxVst3Extension"
else
Expand Down