brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to latest carla

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2024-05-23 14:30:18 +02:00
parent 540dadf0d4
commit 2910b8ee4e
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
carla

@ -1 +1 @@
Subproject commit 3c7d0e7b914d38a32b733cc5ced0b5696d2f9a03 Subproject commit 95ad25d81d1ba53a205f9c758aa51ff91d5dabaf

4
deps/Makefile vendored
View file

@ -266,9 +266,6 @@ ifeq ($(CPU_I386),true)
SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset
endif endif
# use custom JUCE from DISTRHO and Carla
SURGE_CXX_FLAGS += -I$(abspath ../carla/source/modules)
# possibly use fftw? # possibly use fftw?
# ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true) # ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true)
# SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1 # SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1
@ -298,7 +295,6 @@ $(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt
-DSURGE_SKIP_JUCE_FOR_RACK=TRUE \ -DSURGE_SKIP_JUCE_FOR_RACK=TRUE \
-DSURGE_SKIP_LUA=TRUE \ -DSURGE_SKIP_LUA=TRUE \
-DSURGE_SKIP_ODDSOUND_MTS=TRUE \ -DSURGE_SKIP_ODDSOUND_MTS=TRUE \
-DSURGE_JUCE_PATH=$(abspath ../carla/source) \
-DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \ -DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \
$(SURGE_SRC_PATH) $(SURGE_SRC_PATH)

2
dpf

@ -1 +1 @@
Subproject commit 01aca7649c1a3a5ee20a47c5ecd3cb2e29395f89 Subproject commit feaa5d35709e669c1212b8012078586b3b622567

1
plugins/Cardinal/src/AIDA-X.cpp
View file

@ -439,6 +439,7 @@ struct AidaPluginModule : Module {
model = newmodel.release(); model = newmodel.release();
// if processing, wait for process cycle to complete // if processing, wait for process cycle to complete
using DISTRHO_NAMESPACE::d_msleep;
while (oldmodel != nullptr && activeModel.load()) while (oldmodel != nullptr && activeModel.load())
d_msleep(1); d_msleep(1);

8
plugins/Cardinal/src/Ildaeil.cpp
View file

@ -629,11 +629,11 @@ struct IldaeilModule : Module {
CarlaEngine* const engine = carla_get_engine_from_handle(fCarlaHostHandle); CarlaEngine* const engine = carla_get_engine_from_handle(fCarlaHostHandle);
water::XmlDocument xml(projectState); water::XmlDocument xmlState{water::String(projectState)};
{ {
const MutexLocker cml(sPluginInfoLoadMutex); const MutexLocker cml(sPluginInfoLoadMutex);
engine->loadProjectInternal(xml, true); engine->loadProjectInternal(xmlState, true);
} }
projectLoadedFromDSP(fUI); projectLoadedFromDSP(fUI);
@ -1664,7 +1664,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
// save plugin info into cache // save plugin info into cache
if (sha1sum != nullptr) if (sha1sum != nullptr)
{ {
const water::String configDir(asset::config("Ildaeil")); const String configDir(asset::config("Ildaeil").c_str());
const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum); const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum);
if (cacheFile.create().ok()) if (cacheFile.create().ok())
@ -1755,7 +1755,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
if (sha1sum == nullptr) if (sha1sum == nullptr)
return false; return false;
const water::String configDir(asset::config("Ildaeil")); const String configDir(asset::config("Ildaeil").c_str());
const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum); const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum);
if (cacheFile.existsAsFile()) if (cacheFile.existsAsFile())