Browse Source

Finish previous work about not using AU_PATH (now in backend)

tags/1.9.6
falkTX 9 years ago
parent
commit
f1b410916c
6 changed files with 4 additions and 41 deletions
  1. +0
    -1
      source/backend/CarlaEngine.hpp
  2. +0
    -11
      source/backend/CarlaStandalone.cpp
  3. +3
    -15
      source/backend/engine/CarlaEngine.cpp
  4. +0
    -7
      source/backend/engine/CarlaEngineData.cpp
  5. +0
    -5
      source/backend/plugin/CarlaPluginBridge.cpp
  6. +1
    -2
      source/carla_database.py

+ 0
- 1
source/backend/CarlaEngine.hpp View File

@@ -243,7 +243,6 @@ struct CARLA_API EngineOptions {
const char* pathLV2; const char* pathLV2;
const char* pathVST2; const char* pathVST2;
const char* pathVST3; const char* pathVST3;
const char* pathAU;
const char* pathGIG; const char* pathGIG;
const char* pathSF2; const char* pathSF2;
const char* pathSFZ; const char* pathSFZ;


+ 0
- 11
source/backend/CarlaStandalone.cpp View File

@@ -185,9 +185,6 @@ static void carla_engine_init_common()
if (const char* const pathVST3 = std::getenv("ENGINE_OPTION_PLUGIN_PATH_VST3")) if (const char* const pathVST3 = std::getenv("ENGINE_OPTION_PLUGIN_PATH_VST3"))
gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_VST3, pathVST3); 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")) if (const char* const pathGIG = std::getenv("ENGINE_OPTION_PLUGIN_PATH_GIG"))
gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_GIG, pathGIG); 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) if (gStandalone.engineOptions.pathVST3 != nullptr)
gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_VST3, gStandalone.engineOptions.pathVST3); 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) if (gStandalone.engineOptions.pathGIG != nullptr)
gStandalone.engine->setOption(CB::ENGINE_OPTION_PLUGIN_PATH, CB::PLUGIN_GIG, gStandalone.engineOptions.pathGIG); 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; delete[] gStandalone.engineOptions.pathVST3;
gStandalone.engineOptions.pathVST3 = carla_strdup_safe(valueStr); gStandalone.engineOptions.pathVST3 = carla_strdup_safe(valueStr);
break; 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: case CB::PLUGIN_GIG:
if (gStandalone.engineOptions.pathGIG != nullptr) if (gStandalone.engineOptions.pathGIG != nullptr)
delete[] gStandalone.engineOptions.pathGIG; delete[] gStandalone.engineOptions.pathGIG;


+ 3
- 15
source/backend/engine/CarlaEngine.cpp View File

@@ -1330,14 +1330,6 @@ void CarlaEngine::setOption(const EngineOption option, const int value, const ch
else else
pData->options.pathVST3 = nullptr; pData->options.pathVST3 = nullptr;
break; 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: case PLUGIN_GIG:
if (pData->options.pathGIG != nullptr) if (pData->options.pathGIG != nullptr)
delete[] pData->options.pathGIG; delete[] pData->options.pathGIG;
@@ -1362,6 +1354,9 @@ void CarlaEngine::setOption(const EngineOption option, const int value, const ch
else else
pData->options.pathSFZ = nullptr; pData->options.pathSFZ = nullptr;
break; break;
default:
return carla_stderr("CarlaEngine::setOption(%i:%s, %i, \"%s\") - Invalid plugin type", option, EngineOption2Str(option), value, valueStr);
break;
} }
break; break;


@@ -1594,7 +1589,6 @@ void CarlaEngine::saveProjectInternal(juce::MemoryOutputStream& outStream) const
outSettings << " <LV2_PATH>" << xmlSafeString(options.pathLV2, true) << "</LV2_PATH>\n"; outSettings << " <LV2_PATH>" << xmlSafeString(options.pathLV2, true) << "</LV2_PATH>\n";
outSettings << " <VST2_PATH>" << xmlSafeString(options.pathVST2, true) << "</VST2_PATH>\n"; outSettings << " <VST2_PATH>" << xmlSafeString(options.pathVST2, true) << "</VST2_PATH>\n";
outSettings << " <VST3_PATH>" << xmlSafeString(options.pathVST3, true) << "</VST3_PATH>\n"; outSettings << " <VST3_PATH>" << xmlSafeString(options.pathVST3, true) << "</VST3_PATH>\n";
outSettings << " <AU_PATH>" << xmlSafeString(options.pathAU, true) << "</AU_PATH>\n";
outSettings << " <GIG_PATH>" << xmlSafeString(options.pathGIG, true) << "</GIG_PATH>\n"; outSettings << " <GIG_PATH>" << xmlSafeString(options.pathGIG, true) << "</GIG_PATH>\n";
outSettings << " <SF2_PATH>" << xmlSafeString(options.pathSF2, true) << "</SF2_PATH>\n"; outSettings << " <SF2_PATH>" << xmlSafeString(options.pathSF2, true) << "</SF2_PATH>\n";
outSettings << " <SFZ_PATH>" << xmlSafeString(options.pathSFZ, true) << "</SFZ_PATH>\n"; outSettings << " <SFZ_PATH>" << xmlSafeString(options.pathSFZ, true) << "</SFZ_PATH>\n";
@@ -1786,12 +1780,6 @@ bool CarlaEngine::loadProjectInternal(juce::XmlDocument& xmlDoc)
value = PLUGIN_VST3; value = PLUGIN_VST3;
valueStr = text.toRawUTF8(); 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")) else if (tag.equalsIgnoreCase("GIG_PATH"))
{ {
option = ENGINE_OPTION_PLUGIN_PATH; option = ENGINE_OPTION_PLUGIN_PATH;


+ 0
- 7
source/backend/engine/CarlaEngineData.cpp View File

@@ -205,7 +205,6 @@ EngineOptions::EngineOptions() noexcept
pathLV2(nullptr), pathLV2(nullptr),
pathVST2(nullptr), pathVST2(nullptr),
pathVST3(nullptr), pathVST3(nullptr),
pathAU(nullptr),
pathGIG(nullptr), pathGIG(nullptr),
pathSF2(nullptr), pathSF2(nullptr),
pathSFZ(nullptr), pathSFZ(nullptr),
@@ -252,12 +251,6 @@ EngineOptions::~EngineOptions() noexcept
pathVST3 = nullptr; pathVST3 = nullptr;
} }


if (pathAU != nullptr)
{
delete[] pathAU;
pathAU = nullptr;
}

if (pathGIG != nullptr) if (pathGIG != nullptr)
{ {
delete[] pathGIG; delete[] pathGIG;


+ 0
- 5
source/backend/plugin/CarlaPluginBridge.cpp View File

@@ -622,11 +622,6 @@ protected:
else else
carla_setenv("ENGINE_OPTION_PLUGIN_PATH_VST3", ""); 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) if (options.pathGIG != nullptr)
carla_setenv("ENGINE_OPTION_PLUGIN_PATH_GIG", options.pathGIG); carla_setenv("ENGINE_OPTION_PLUGIN_PATH_GIG", options.pathGIG);
else else


+ 1
- 2
source/carla_database.py View File

@@ -1481,12 +1481,11 @@ class PluginDatabaseW(QDialog):
if not self.host.isPlugin: if not self.host.isPlugin:
settings = QSettings("falkTX", "Carla2") settings = QSettings("falkTX", "Carla2")
LV2_PATH = splitter.join(toList(settings.value(CARLA_KEY_PATHS_LV2, CARLA_DEFAULT_LV2_PATH))) 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 del settings


internalCountNew = gCarla.utils.get_cached_plugin_count(PLUGIN_INTERNAL, "") internalCountNew = gCarla.utils.get_cached_plugin_count(PLUGIN_INTERNAL, "")
lv2CountNew = gCarla.utils.get_cached_plugin_count(PLUGIN_LV2, LV2_PATH) 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 if internalCountNew != internalCount or (len(internalPlugins) > 0 and
len(internalPlugins[0]) > 0 and len(internalPlugins[0]) > 0 and


Loading…
Cancel
Save