Merge branch 'DISTRHO:main' into docb-modules

.github/workflows/build.yml

@@ -180,6 +180,7 @@ jobs:
           key: macos-universal-v${{ env.CACHE_VERSION }}
       - name: Setup dependencies
         run: |
+          brew uninstall --force --ignore-dependencies cmake
           ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-universal-10.15
       - name: Build extra dependencies
         run: |

Makefile

@@ -238,6 +238,9 @@ clap: carla deps dgl plugins resources
 lv2: carla deps dgl plugins resources
 	$(MAKE) lv2 -C src $(CARLA_EXTRA_ARGS)
 
+mapi: carla deps dgl plugins resources
+	$(MAKE) mapi -C src $(CARLA_EXTRA_ARGS)
+
 vst2: carla deps dgl plugins resources
 	$(MAKE) vst2 -C src $(CARLA_EXTRA_ARGS)
 

carla

@@ -1 +1 @@
-Subproject commit 034d0c4242ba834e0b5a8967a5eefedf9d97178c
+Subproject commit 12bc40fd6c9c5b36481c7df55086b27ba9ae8a80

dpf

@@ -1 +1 @@
-Subproject commit 79e5339bef455583a4b5762addfd6578d4230f05
+Subproject commit ab25198ea9f361145e3f8e694d90bd2a93ee830c

plugins/Sapphire

@@ -1 +1 @@
-Subproject commit e2bcefcaa7753f017cd131a28aae0e5e346aafec
+Subproject commit ef10da4e2578162b2db2f6534857d6504491daf4

plugins/plugins.cpp

@@ -3434,6 +3434,7 @@ static void initStatic__Sapphire()
         p->addModel(modelSapphireTout);
         p->addModel(modelSapphireTricorder);
         p->addModel(modelSapphireTubeUnit);
+        p->addModel(modelSapphireZoo);
     }
 }
 

src/CardinalCommon.cpp

@@ -626,47 +626,7 @@ Initializer::Initializer(const CardinalBasePlugin* const plugin, const CardinalB
 
     if (asset::userDir.empty())
     {
-       #if defined(DISTRHO_OS_WASM)
-        asset::userDir = "/userfiles";
-       #elif defined(ARCH_MAC)
-        asset::userDir = system::join(homeDir(), "Documents", "Cardinal");
-       #elif defined(ARCH_WIN)
-        asset::userDir = system::join(getSpecialPath(kSpecialPathMyDocuments), "Cardinal");
-       #else
-        std::string xdgConfigDir;
-        if (const char* const xdgEnv = getenv("XDG_CONFIG_HOME"))
-            xdgConfigDir = xdgEnv;
-        if (xdgConfigDir.empty())
-            xdgConfigDir = system::join(homeDir(), ".config");
-
-        const std::string xdgDirsConfigPath(system::join(xdgConfigDir, "user-dirs.dirs"));
-
-        if (system::exists(xdgDirsConfigPath))
-        {
-            std::ifstream xdgDirsConfigFile(xdgDirsConfigPath, std::ios::in|std::ios::ate);
-            std::string xdgDirsConfig(xdgDirsConfigFile.tellg(), 0);
-
-            xdgDirsConfigFile.seekg(0);
-            xdgDirsConfigFile.read(&xdgDirsConfig[0], xdgDirsConfig.size());
-
-            if (const char* const xdgDocsDir = std::strstr(xdgDirsConfig.c_str(), "XDG_DOCUMENTS_DIR=\""))
-            {
-                if (const char* const xdgDocsDirNL = std::strstr(xdgDocsDir, "\"\n"))
-                {
-                    asset::userDir = std::string(xdgDocsDir + 19, xdgDocsDirNL - xdgDocsDir - 19);
-
-                    if (string::startsWith(asset::userDir, "$HOME"))
-                        asset::userDir.replace(asset::userDir.begin(), asset::userDir.begin() + 5, homeDir());
-
-                    if (! system::exists(asset::userDir))
-                        asset::userDir.clear();
-                }
-            }
-        }
-
-        if (asset::userDir.empty())
-            asset::userDir = system::join(homeDir(), "Documents", "Cardinal");
-       #endif
+        asset::userDir = system::join(getSpecialDir(kSpecialDirDocuments), "Cardinal");
 
         if (isRealInstance)
         {
@@ -683,17 +643,10 @@ Initializer::Initializer(const CardinalBasePlugin* const plugin, const CardinalB
    #ifndef CARDINAL_COMMON_DSP_ONLY
     if (asset::configDir.empty())
     {
-       #if defined(ARCH_MAC) || defined(ARCH_WIN) || defined(DISTRHO_OS_WASM)
-        asset::configDir = asset::userDir;
-       #else
-        if (const char* const xdgEnv = getenv("XDG_CONFIG_HOME"))
-            asset::configDir = system::join(xdgEnv, "Cardinal");
-        else
-            asset::configDir = system::join(homeDir(), ".config", "Cardinal");
+        asset::configDir = system::join(getSpecialDir(kSpecialDirConfig), "Cardinal");
 
         if (isRealInstance)
             system::createDirectory(asset::configDir);
-       #endif
     }
    #endif
    
@@ -875,7 +828,8 @@ void Initializer::stopRemoteServer()
         lo_server_thread_stop(oscServerThread);
         lo_server_thread_del_method(oscServerThread, nullptr, nullptr);
         lo_server_thread_free(oscServerThread);
-        oscServerThread = oscServer = nullptr;
+        oscServerThread = nullptr;
+        oscServer = nullptr;
     }
    #else
     if (oscServer != nullptr)

src/Makefile

@@ -147,6 +147,9 @@ au: $(TARGETS)
 	$(MAKE) au -C CardinalFX $(CARDINAL_SYNTH_ARGS)
 	$(MAKE) au -C CardinalSynth $(CARDINAL_SYNTH_ARGS)
 
+mapi: $(TARGETS)
+	$(MAKE) mapi -C CardinalFX $(CARDINAL_FX_ARGS)
+
 lv2: $(TARGETS)
 	$(MAKE) lv2 -C Cardinal
 	$(MAKE) lv2 -C CardinalFX $(CARDINAL_FX_ARGS)

src/Makefile.cardinal.mk

@@ -409,6 +409,11 @@ endif
 
 BUILD_CXX_FLAGS += -DCARDINAL_PLUGIN_PREFIX='"$(PREFIX)"'
 
+# --------------------------------------------------------------
+# we know what we are doing, promise!
+
+BUILD_CXX_FLAGS += -DDISTRHO_NO_WARNINGS
+
 # --------------------------------------------------------------
 # Enable all possible plugin types and setup resources