Browse Source

Update to latest carla

Signed-off-by: falkTX <falktx@falktx.com>
tags/24.05
falkTX 1 year ago
parent
commit
2910b8ee4e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 7 additions and 10 deletions
  1. +1
    -1
      carla
  2. +0
    -4
      deps/Makefile
  3. +1
    -1
      dpf
  4. +1
    -0
      plugins/Cardinal/src/AIDA-X.cpp
  5. +4
    -4
      plugins/Cardinal/src/Ildaeil.cpp

+ 1
- 1
carla

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

+ 0
- 4
deps/Makefile View File

@@ -266,9 +266,6 @@ ifeq ($(CPU_I386),true)
SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset
endif

# use custom JUCE from DISTRHO and Carla
SURGE_CXX_FLAGS += -I$(abspath ../carla/source/modules)

# possibly use fftw?
# ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true)
# 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_LUA=TRUE \
-DSURGE_SKIP_ODDSOUND_MTS=TRUE \
-DSURGE_JUCE_PATH=$(abspath ../carla/source) \
-DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \
$(SURGE_SRC_PATH)



+ 1
- 1
dpf

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

+ 1
- 0
plugins/Cardinal/src/AIDA-X.cpp View File

@@ -439,6 +439,7 @@ struct AidaPluginModule : Module {
model = newmodel.release();

// if processing, wait for process cycle to complete
using DISTRHO_NAMESPACE::d_msleep;
while (oldmodel != nullptr && activeModel.load())
d_msleep(1);



+ 4
- 4
plugins/Cardinal/src/Ildaeil.cpp View File

@@ -629,11 +629,11 @@ struct IldaeilModule : Module {

CarlaEngine* const engine = carla_get_engine_from_handle(fCarlaHostHandle);

water::XmlDocument xml(projectState);
water::XmlDocument xmlState{water::String(projectState)};

{
const MutexLocker cml(sPluginInfoLoadMutex);
engine->loadProjectInternal(xml, true);
engine->loadProjectInternal(xmlState, true);
}

projectLoadedFromDSP(fUI);
@@ -1664,7 +1664,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
// save plugin info into cache
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);

if (cacheFile.create().ok())
@@ -1755,7 +1755,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
if (sha1sum == nullptr)
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);

if (cacheFile.existsAsFile())


Loading…
Cancel
Save