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

Cleanup

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-01-22 10:23:29 +00:00
parent 39addfc438
commit 7977e04e32
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
4 changed files with 10 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/build.yml vendored
View file

@ -25,8 +25,6 @@ jobs:
with:
path: |
~/PawPawBuilds
~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack
key: linux-arm64-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
@ -76,8 +74,6 @@ jobs:
with:
path: |
~/PawPawBuilds
~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack
key: linux-armhf-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
@ -127,8 +123,6 @@ jobs:
with:
path: |
~/PawPawBuilds
~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack
key: linux-i686-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
@ -174,8 +168,6 @@ jobs:
with:
path: |
~/PawPawBuilds
~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack
key: linux-x86_64-v${{ env.CACHE_VERSION }}
- name: Set up dependencies
run: |
@ -272,8 +264,6 @@ jobs:
with:
path: |
~/PawPawBuilds
~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack
key: macos-universal-v${{ env.CACHE_VERSION }}
- name: Fix up Xcode
run: |
@ -422,8 +412,6 @@ jobs:
with:
path: |
~/PawPawBuilds
~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack
key: win32-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |
@ -466,8 +454,6 @@ jobs:
with:
path: |
~/PawPawBuilds
~/work/Cardinal/Cardinal/build/plugins
~/work/Cardinal/Cardinal/build/rack
key: win64-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess
run: |

2
Makefile
View file

@ -29,10 +29,8 @@ ifneq ($(DEBUG),true)
CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
endif
# ifneq ($(MACOS),true)
CARLA_EXTRA_ARGS += USING_JUCE=false
CARLA_EXTRA_ARGS += USING_JUCE_GUI_EXTRA=false
# endif
# --------------------------------------------------------------
# Check for system-wide dependencies

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

@ -1181,11 +1181,15 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
fPluginCount = 0;
delete[] fPlugins;
const MutexLocker cml(sPluginInfoLoadMutex);
uint count;
d_stdout("Will scan plugins now...");
const uint count = carla_get_cached_plugin_count(fPluginType, path);
d_stdout("Scanning found %u plugins", count);
{
const MutexLocker cml(sPluginInfoLoadMutex);
d_stdout("Will scan plugins now...");
count = carla_get_cached_plugin_count(fPluginType, path);
d_stdout("Scanning found %u plugins", count);
}
if (fDrawingState == kDrawingLoading)
{
@ -1199,6 +1203,8 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
for (uint i=0, j; i < count && ! shouldThreadExit(); ++i)
{
const MutexLocker cml(sPluginInfoLoadMutex);
const CarlaCachedPluginInfo* const info = carla_get_cached_plugin_info(fPluginType, i);
DISTRHO_SAFE_ASSERT_CONTINUE(info != nullptr);

28
src/Makefile.cardinal.mk
View file

@ -33,14 +33,10 @@ CARLA_BUILD_TYPE = Release
endif
CARLA_EXTRA_LIBS = $(CARLA_BUILD_DIR)/plugin/$(CARLA_BUILD_TYPE)/carla-host-plugin.cpp.o
# ifneq ($(MACOS),true)
# CARLA_EXTRA_LIBS += -Wl,--start-group -Wl,--whole-archive
# endif
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_plugin.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_plugin.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/native-plugins.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/audio_decoder.a
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/dgl.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jackbridge.min.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/lilv.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/rtmempool.a
@ -48,30 +44,6 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/sfzero.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/water.a
CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resampler.a
# ifeq ($(MACOS),true)
# ifeq ($(USING_JUCE),true)
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_audio_basics.a
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_audio_processors.a
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_core.a
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_data_structures.a
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_events.a
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_graphics.a
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_gui_basics.a
# ifeq ($(USING_JUCE_GUI_EXTRA),true)
# CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_gui_extra.a
# endif
# endif
# endif
# ifneq ($(MACOS),true)
# CARLA_EXTRA_LIBS += -Wl,--no-whole-archive -Wl,--end-group
# endif
# FIXME patch fluidsynth package
ifeq ($(WINDOWS),true)
STATIC_CARLA_PLUGIN_LIBS += -ldsound -lwinmm
endif
endif # STATIC_BUILD
# --------------------------------------------------------------