Cleanups, test random OSX things..

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
 #---------------------------------------------------------------------------

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)
 
 # ----------------------------------------------------------------------------------------------------------------------------

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<EngineOption>(option), value, valueStr);
         }

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<File> 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);
     }
 }

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)

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
 

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

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)
 

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);
             }

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];