diff --git a/source/backend/CarlaEngine.hpp b/source/backend/CarlaEngine.hpp index a5c0d964a..a4dcc7415 100644 --- a/source/backend/CarlaEngine.hpp +++ b/source/backend/CarlaEngine.hpp @@ -243,7 +243,6 @@ struct CARLA_API EngineOptions { const char* pathLV2; const char* pathVST2; const char* pathVST3; - const char* pathAU; const char* pathGIG; const char* pathSF2; const char* pathSFZ; diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp index d97dad073..16996ebdd 100644 --- a/source/backend/CarlaStandalone.cpp +++ b/source/backend/CarlaStandalone.cpp @@ -185,9 +185,6 @@ static void carla_engine_init_common() if (const char* const pathVST3 = std::getenv("ENGINE_OPTION_PLUGIN_PATH_VST3")) gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_VST3, pathVST3); - if (const char* const pathAU = std::getenv("ENGINE_OPTION_PLUGIN_PATH_AU")) - gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_AU, pathAU); - if (const char* const pathGIG = std::getenv("ENGINE_OPTION_PLUGIN_PATH_GIG")) gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_GIG, pathGIG); @@ -241,9 +238,6 @@ static void carla_engine_init_common() if (gStandalone.engineOptions.pathVST3 != nullptr) gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_VST3, gStandalone.engineOptions.pathVST3); - if (gStandalone.engineOptions.pathAU != nullptr) - gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_AU, gStandalone.engineOptions.pathAU); - if (gStandalone.engineOptions.pathGIG != nullptr) gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_GIG, gStandalone.engineOptions.pathGIG); @@ -552,11 +546,6 @@ void carla_set_engine_option(EngineOption option, int value, const char* valueSt delete[] gStandalone.engineOptions.pathVST3; gStandalone.engineOptions.pathVST3 = carla_strdup_safe(valueStr); break; - case CB::PLUGIN_AU: - if (gStandalone.engineOptions.pathAU != nullptr) - delete[] gStandalone.engineOptions.pathAU; - gStandalone.engineOptions.pathAU = carla_strdup_safe(valueStr); - break; case CB::PLUGIN_GIG: if (gStandalone.engineOptions.pathGIG != nullptr) delete[] gStandalone.engineOptions.pathGIG; diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp index cbb933b7a..fc806b09f 100644 --- a/source/backend/engine/CarlaEngine.cpp +++ b/source/backend/engine/CarlaEngine.cpp @@ -1330,14 +1330,6 @@ void CarlaEngine::setOption(const EngineOption option, const int value, const ch else pData->options.pathVST3 = nullptr; break; - case PLUGIN_AU: - if (pData->options.pathAU != nullptr) - delete[] pData->options.pathAU; - if (valueStr != nullptr) - pData->options.pathAU = carla_strdup_safe(valueStr); - else - pData->options.pathAU = nullptr; - break; case PLUGIN_GIG: if (pData->options.pathGIG != nullptr) delete[] pData->options.pathGIG; @@ -1362,6 +1354,9 @@ void CarlaEngine::setOption(const EngineOption option, const int value, const ch else pData->options.pathSFZ = nullptr; break; + default: + return carla_stderr("CarlaEngine::setOption(%i:%s, %i, \"%s\") - Invalid plugin type", option, EngineOption2Str(option), value, valueStr); + break; } break; @@ -1594,7 +1589,6 @@ void CarlaEngine::saveProjectInternal(juce::MemoryOutputStream& outStream) const outSettings << " " << xmlSafeString(options.pathLV2, true) << "\n"; outSettings << " " << xmlSafeString(options.pathVST2, true) << "\n"; outSettings << " " << xmlSafeString(options.pathVST3, true) << "\n"; - outSettings << " " << xmlSafeString(options.pathAU, true) << "\n"; outSettings << " " << xmlSafeString(options.pathGIG, true) << "\n"; outSettings << " " << xmlSafeString(options.pathSF2, true) << "\n"; outSettings << " " << xmlSafeString(options.pathSFZ, true) << "\n"; @@ -1786,12 +1780,6 @@ bool CarlaEngine::loadProjectInternal(juce::XmlDocument& xmlDoc) value = PLUGIN_VST3; valueStr = text.toRawUTF8(); } - else if (tag.equalsIgnoreCase("AU_PATH")) - { - option = ENGINE_OPTION_PLUGIN_PATH; - value = PLUGIN_AU; - valueStr = text.toRawUTF8(); - } else if (tag.equalsIgnoreCase("GIG_PATH")) { option = ENGINE_OPTION_PLUGIN_PATH; diff --git a/source/backend/engine/CarlaEngineData.cpp b/source/backend/engine/CarlaEngineData.cpp index 44462be47..481a87a35 100644 --- a/source/backend/engine/CarlaEngineData.cpp +++ b/source/backend/engine/CarlaEngineData.cpp @@ -205,7 +205,6 @@ EngineOptions::EngineOptions() noexcept pathLV2(nullptr), pathVST2(nullptr), pathVST3(nullptr), - pathAU(nullptr), pathGIG(nullptr), pathSF2(nullptr), pathSFZ(nullptr), @@ -252,12 +251,6 @@ EngineOptions::~EngineOptions() noexcept pathVST3 = nullptr; } - if (pathAU != nullptr) - { - delete[] pathAU; - pathAU = nullptr; - } - if (pathGIG != nullptr) { delete[] pathGIG; diff --git a/source/backend/plugin/CarlaPluginBridge.cpp b/source/backend/plugin/CarlaPluginBridge.cpp index b2d5a64da..6c965089f 100644 --- a/source/backend/plugin/CarlaPluginBridge.cpp +++ b/source/backend/plugin/CarlaPluginBridge.cpp @@ -622,11 +622,6 @@ protected: else carla_setenv("ENGINE_OPTION_PLUGIN_PATH_VST3", ""); - if (options.pathAU != nullptr) - carla_setenv("ENGINE_OPTION_PLUGIN_PATH_AU", options.pathAU); - else - carla_setenv("ENGINE_OPTION_PLUGIN_PATH_AU", ""); - if (options.pathGIG != nullptr) carla_setenv("ENGINE_OPTION_PLUGIN_PATH_GIG", options.pathGIG); else diff --git a/source/carla_database.py b/source/carla_database.py index a80c1a2af..0f839c9fa 100755 --- a/source/carla_database.py +++ b/source/carla_database.py @@ -1481,12 +1481,11 @@ class PluginDatabaseW(QDialog): if not self.host.isPlugin: settings = QSettings("falkTX", "Carla2") LV2_PATH = splitter.join(toList(settings.value(CARLA_KEY_PATHS_LV2, CARLA_DEFAULT_LV2_PATH))) - AU_PATH = splitter.join(toList(settings.value(CARLA_KEY_PATHS_AU, CARLA_DEFAULT_AU_PATH))) del settings internalCountNew = gCarla.utils.get_cached_plugin_count(PLUGIN_INTERNAL, "") lv2CountNew = gCarla.utils.get_cached_plugin_count(PLUGIN_LV2, LV2_PATH) - auCountNew = gCarla.utils.get_cached_plugin_count(PLUGIN_AU, AU_PATH) + auCountNew = gCarla.utils.get_cached_plugin_count(PLUGIN_AU, "") if internalCountNew != internalCount or (len(internalPlugins) > 0 and len(internalPlugins[0]) > 0 and