From ae7a7a4b66538377f9ee1a6c79dc405c6ca5848b Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 27 Aug 2018 16:38:53 +0200 Subject: [PATCH] Cleanups, test random OSX things.. --- source/backend/CarlaBackend.doxygen | 4 ++-- source/backend/Makefile | 1 - source/backend/engine/CarlaEngine.cpp | 11 ++++++++++- source/backend/utils/CachedPlugins.cpp | 4 ++-- source/bridges-plugin/Makefile | 3 --- source/carla_backend.pro | 1 - source/discovery/Makefile | 5 ----- source/plugin/Makefile | 9 --------- source/plugin/carla-base.cpp | 16 +--------------- source/utils/CarlaPluginUI.cpp | 15 ++++++++++++++- 10 files changed, 29 insertions(+), 40 deletions(-) diff --git a/source/backend/CarlaBackend.doxygen b/source/backend/CarlaBackend.doxygen index 94dc467fc..f0f8c3bf2 100644 --- a/source/backend/CarlaBackend.doxygen +++ b/source/backend/CarlaBackend.doxygen @@ -243,8 +243,8 @@ INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = DOXYGEN \ BUILDING_CARLA REAL_BUILD \ - HAVE_DGL HAVE_LIBLO HAVE_LIBMAGIC HAVE_FLUIDSYNTH HAVE_LINUXSAMPLER HAVE_PROJECTM HAVE_X11 \ - HAVE_EXPERIMENTAL_PLUGINS HAVE_ZYN_DEPS HAVE_ZYN_UI_DEPS + HAVE_DGL HAVE_LIBLO HAVE_LIBMAGIC HAVE_FLUIDSYNTH HAVE_PROJECTM HAVE_X11 \ + HAVE_ZYN_DEPS HAVE_ZYN_UI_DEPS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- diff --git a/source/backend/Makefile b/source/backend/Makefile index c37bfc3c1..8e2d5a361 100644 --- a/source/backend/Makefile +++ b/source/backend/Makefile @@ -54,7 +54,6 @@ STANDALONE_LINK_FLAGS += $(RTMIDI_LIBS) STANDALONE_LINK_FLAGS += $(LIBLO_LIBS) STANDALONE_LINK_FLAGS += $(MAGIC_LIBS) STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) -STANDALONE_LINK_FLAGS += $(LINUXSAMPLER_LIBS) STANDALONE_LINK_FLAGS += $(X11_LIBS) # ---------------------------------------------------------------------------------------------------------------------------- diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp index c4e34c26a..7df7e2759 100644 --- a/source/backend/engine/CarlaEngine.cpp +++ b/source/backend/engine/CarlaEngine.cpp @@ -2052,7 +2052,16 @@ bool CarlaEngine::loadProjectInternal(water::XmlDocument& xmlDoc) } } - CARLA_SAFE_ASSERT_CONTINUE(option != -1); + if (option == -1) + { + // check old stuff, unhandled now + if (tag == "GIG_PATH") + continue; + + // hmm something is wrong.. + carla_stderr2("CarlaEngine::loadProjectInternal() - Unhandled option '%s'", tag.toRawUTF8()); + continue; + } setOption(static_cast(option), value, valueStr); } diff --git a/source/backend/utils/CachedPlugins.cpp b/source/backend/utils/CachedPlugins.cpp index e326a8c61..8c74b6d5c 100644 --- a/source/backend/utils/CachedPlugins.cpp +++ b/source/backend/utils/CachedPlugins.cpp @@ -83,11 +83,11 @@ void findSFZsIfNeeded(const char* const sfzPaths) const StringArray splitPaths(StringArray::fromTokens(sfzPaths, CARLA_OS_SPLIT_STR, "")); - for (String path : splitPaths) + for (String *it = splitPaths.begin(), *end = splitPaths.end(); it != end; ++it) { Array results; - if (File(path).findChildFiles(results, File::findFiles|File::ignoreHiddenFiles, true, "*.sfz") > 0) + if (File(*it).findChildFiles(results, File::findFiles|File::ignoreHiddenFiles, true, "*.sfz") > 0) gSFZs.addArray(results); } } diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile index 4a471c2fd..718b54222 100644 --- a/source/bridges-plugin/Makefile +++ b/source/bridges-plugin/Makefile @@ -73,9 +73,6 @@ NATIVE_BUILD_FLAGS = $(NATIVE_PLUGINS_FLAGS) $(LIBLO_FLAGS) NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS) NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) -NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLAGS) -NATIVE_LINK_FLAGS += $(LINUXSAMPLER_LIBS) - NATIVE_LINK_FLAGS += $(FFMPEG_LIBS) NATIVE_LINK_FLAGS += $(MAGIC_LIBS) NATIVE_LINK_FLAGS += $(SNDFILE_LIBS) diff --git a/source/carla_backend.pro b/source/carla_backend.pro index dc59f8c59..d274620aa 100644 --- a/source/carla_backend.pro +++ b/source/carla_backend.pro @@ -17,7 +17,6 @@ DEFINES += REAL_BUILD DEFINES += HAVE_LIBLO DEFINES += HAVE_LIBMAGIC DEFINES += HAVE_FLUIDSYNTH -DEFINES += HAVE_LINUXSAMPLER DEFINES += HAVE_ZYN_DEPS DEFINES += HAVE_ZYN_UI_DEPS diff --git a/source/discovery/Makefile b/source/discovery/Makefile index 35a58fd1e..990dd10ec 100644 --- a/source/discovery/Makefile +++ b/source/discovery/Makefile @@ -47,11 +47,6 @@ NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS) NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) endif -ifeq ($(HAVE_LINUXSAMPLER),true) -NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLAGS) -NATIVE_LINK_FLAGS += $(LINUXSAMPLER_LIBS) -endif - # ---------------------------------------------------------------------------------------------------------------------------- LIBS_native = $(MODULEDIR)/lilv.a diff --git a/source/plugin/Makefile b/source/plugin/Makefile index cdfb062fd..0f7b191a9 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -32,18 +32,10 @@ ifeq ($(HAVE_FLUIDSYNTH),true) BUILD_CXX_FLAGS += $(FLUIDSYNTH_FLAGS) endif -ifeq ($(HAVE_LINUXSAMPLER),true) -BUILD_CXX_FLAGS += $(LINUXSAMPLER_FLAGS) -endif - ifeq ($(HAVE_X11),true) BUILD_CXX_FLAGS += $(X11_FLAGS) endif -ifeq ($(CARLA_ZYN_COMPAT),true) -BUILD_CXX_FLAGS += -DCARLA_ZYN_LV2_EXPORTED -endif - # ---------------------------------------------------------------------------------------------------------------------------- # Libs @@ -78,7 +70,6 @@ LINK_FLAGS += $(NATIVE_PLUGINS_LIBS) LINK_FLAGS += $(FLUIDSYNTH_LIBS) LINK_FLAGS += $(LIBLO_LIBS) -LINK_FLAGS += $(LINUXSAMPLER_LIBS) LINK_FLAGS += $(MAGIC_LIBS) LINK_FLAGS += $(X11_LIBS) diff --git a/source/plugin/carla-base.cpp b/source/plugin/carla-base.cpp index 49d316745..5725a299c 100644 --- a/source/plugin/carla-base.cpp +++ b/source/plugin/carla-base.cpp @@ -76,21 +76,7 @@ struct PluginListManager { std::strcmp(desc->label, "carlapatchbay16" ) == 0 || std::strcmp(desc->label, "carlapatchbay32" ) == 0 || std::strcmp(desc->label, "bigmeter" ) == 0 || - std::strcmp(desc->label, "notes" ) == 0 || -#ifdef CARLA_ZYN_LV2_EXPORTED - std::strcmp(desc->label, "zynalienwah" ) == 0 || - std::strcmp(desc->label, "zynchorus" ) == 0 || - std::strcmp(desc->label, "zyndistortion" ) == 0 || - std::strcmp(desc->label, "zyndynamicfilter") == 0 || - std::strcmp(desc->label, "zynecho" ) == 0 || - std::strcmp(desc->label, "zynphaser" ) == 0 || - std::strcmp(desc->label, "zynreverb" ) == 0 || - std::strcmp(desc->label, "zynaddsubfx" ) == 0 || -#endif - std::strcmp(desc->label, "at1" ) == 0 || - std::strcmp(desc->label, "bls1" ) == 0 || - std::strcmp(desc->label, "rev1-ambisonic" ) == 0 || - std::strcmp(desc->label, "rev1-stereo" ) == 0) + std::strcmp(desc->label, "notes" ) == 0) { descs.append(desc); } diff --git a/source/utils/CarlaPluginUI.cpp b/source/utils/CarlaPluginUI.cpp index e2090d625..32fa7615e 100644 --- a/source/utils/CarlaPluginUI.cpp +++ b/source/utils/CarlaPluginUI.cpp @@ -382,7 +382,9 @@ private: backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag; - (void) setCallback:(CarlaPluginUI::Callback*)cb; +- (BOOL) acceptsFirstResponder; - (BOOL) canBecomeKeyWindow; +- (BOOL) canBecomeMainWindow; - (BOOL) windowShouldClose:(id)sender; - (NSSize) windowWillResize:(NSWindow*)sender toSize:(NSSize)frameSize; @end @@ -418,17 +420,27 @@ private: callback = cb; } +- (BOOL)acceptsFirstResponder +{ + return YES; +} + - (BOOL)canBecomeKeyWindow { return YES; } +- (BOOL)canBecomeMainWindow +{ + return NO; +} + - (BOOL)windowShouldClose:(id)sender { if (callback != nil) callback->handlePluginUIClosed(); - return NO; + return YES; // unused (void)sender; @@ -494,6 +506,7 @@ public: if (fView == nullptr) return; + [fView removeFromSuperview]; [fWindow close]; [fView release]; [fWindow release];