brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ildaeil: make use of new carla APIs, list windows plugins on linux

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-09-07 10:24:43 +02:00
parent c6a7117dcf
commit 1f5019a377
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
1 changed files with 175 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

198
plugins/Cardinal/src/Ildaeil.cpp
View file

@ -201,6 +201,25 @@ static const char* getPathForVST2()
path += getSpecialPath(kSpecialPathCommonProgramFiles) + "\\VST2"; path += getSpecialPath(kSpecialPathCommonProgramFiles) + "\\VST2";
#else #else
path = homeDir() + "/.vst:/usr/lib/vst:/usr/local/lib/vst"; path = homeDir() + "/.vst:/usr/lib/vst:/usr/local/lib/vst";
std::string winePrefix;
if (const char* const envWINEPREFIX = std::getenv("WINEPREFIX"))
winePrefix = envWINEPREFIX;
if (winePrefix.empty())
winePrefix = homeDir() + "/.wine";
if (system::exists(winePrefix))
{
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/VST2";
path += ":" + winePrefix + "/drive_c/Program Files/VstPlugins";
path += ":" + winePrefix + "/drive_c/Program Files/Steinberg/VstPlugins";
#ifdef CARLA_OS_64BIT
path += ":" + winePrefix + "/drive_c/Program Files (x86)/Common Files/VST2";
path += ":" + winePrefix + "/drive_c/Program Files (x86)/VstPlugins";
path += ":" + winePrefix + "/drive_c/Program Files (x86)/Steinberg/VstPlugins";
#endif
}
#endif #endif
} }
@ -224,6 +243,21 @@ static const char* getPathForVST3()
path += getSpecialPath(kSpecialPathCommonProgramFiles) + "\\VST3"; path += getSpecialPath(kSpecialPathCommonProgramFiles) + "\\VST3";
#else #else
path = homeDir() + "/.vst3:/usr/lib/vst3:/usr/local/lib/vst3"; path = homeDir() + "/.vst3:/usr/lib/vst3:/usr/local/lib/vst3";
std::string winePrefix;
if (const char* const envWINEPREFIX = std::getenv("WINEPREFIX"))
winePrefix = envWINEPREFIX;
if (winePrefix.empty())
winePrefix = homeDir() + "/.wine";
if (system::exists(winePrefix))
{
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/VST3";
#ifdef CARLA_OS_64BIT
path += ":" + winePrefix + "/drive_c/Program Files (x86)/Common Files/VST3";
#endif
}
#endif #endif
} }
@ -247,6 +281,21 @@ static const char* getPathForCLAP()
path += getSpecialPath(kSpecialPathCommonProgramFiles) + "\\CLAP"; path += getSpecialPath(kSpecialPathCommonProgramFiles) + "\\CLAP";
#else #else
path = homeDir() + "/.clap:/usr/lib/clap:/usr/local/lib/clap"; path = homeDir() + "/.clap:/usr/lib/clap:/usr/local/lib/clap";
std::string winePrefix;
if (const char* const envWINEPREFIX = std::getenv("WINEPREFIX"))
winePrefix = envWINEPREFIX;
if (winePrefix.empty())
winePrefix = homeDir() + "/.wine";
if (system::exists(winePrefix))
{
path += ":" + winePrefix + "/drive_c/Program Files/Common Files/CLAP";
#ifdef CARLA_OS_64BIT
path += ":" + winePrefix + "/drive_c/Program Files (x86)/Common Files/CLAP";
#endif
}
#endif #endif
} }
@ -361,7 +410,7 @@ struct IldaeilModule : Module {
NativeTimeInfo fCarlaTimeInfo; NativeTimeInfo fCarlaTimeInfo;
CarlaString fDiscoveryTool; String fBinaryPath;
void* fUI = nullptr; void* fUI = nullptr;
bool canUseBridges = true; bool canUseBridges = true;
@ -431,7 +480,7 @@ struct IldaeilModule : Module {
if (system::exists(winBinaryDir)) if (system::exists(winBinaryDir))
{ {
const std::string winResourceDir = system::join(winBinaryDir, "resources"); const std::string winResourceDir = system::join(winBinaryDir, "resources");
fDiscoveryTool = winBinaryDir.c_str(); fBinaryPath = winBinaryDir.c_str();
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, winBinaryDir.c_str()); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, winBinaryDir.c_str());
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, winResourceDir.c_str()); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, winResourceDir.c_str());
} }
@ -439,13 +488,13 @@ struct IldaeilModule : Module {
#if defined(CARLA_OS_MAC) #if defined(CARLA_OS_MAC)
if (system::exists("~/Applications/Carla.app")) if (system::exists("~/Applications/Carla.app"))
{ {
fDiscoveryTool = "~/Applications/Carla.app/Contents/MacOS"; fBinaryPath = "~/Applications/Carla.app/Contents/MacOS";
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "~/Applications/Carla.app/Contents/MacOS"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "~/Applications/Carla.app/Contents/MacOS");
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "~/Applications/Carla.app/Contents/MacOS/resources"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "~/Applications/Carla.app/Contents/MacOS/resources");
} }
else if (system::exists("/Applications/Carla.app")) else if (system::exists("/Applications/Carla.app"))
{ {
fDiscoveryTool = "/Applications/Carla.app/Contents/MacOS"; fBinaryPath = "/Applications/Carla.app/Contents/MacOS";
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/Applications/Carla.app/Contents/MacOS"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/Applications/Carla.app/Contents/MacOS");
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/Applications/Carla.app/Contents/MacOS/resources"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/Applications/Carla.app/Contents/MacOS/resources");
} }
@ -456,13 +505,13 @@ struct IldaeilModule : Module {
#endif #endif
else if (system::exists("/usr/local/lib/carla")) else if (system::exists("/usr/local/lib/carla"))
{ {
fDiscoveryTool = "/usr/local/lib/carla"; fBinaryPath = "/usr/local/lib/carla";
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/usr/local/lib/carla"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/usr/local/lib/carla");
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/usr/local/share/carla/resources"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/usr/local/share/carla/resources");
} }
else if (system::exists("/usr/lib/carla")) else if (system::exists("/usr/lib/carla"))
{ {
fDiscoveryTool = "/usr/lib/carla"; fBinaryPath = "/usr/lib/carla";
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/usr/lib/carla"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/usr/lib/carla");
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/usr/share/carla/resources"); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/usr/share/carla/resources");
} }
@ -479,14 +528,8 @@ struct IldaeilModule : Module {
} }
} }
if (fDiscoveryTool.isNotEmpty()) if (fBinaryPath.isNotEmpty())
{ carla_stdout("Using binary path for discovery tools: %s", fBinaryPath.buffer());
fDiscoveryTool += DISTRHO_OS_SEP_STR "carla-discovery-native";
#ifdef CARLA_OS_WIN
fDiscoveryTool += ".exe";
#endif
carla_stdout("Using discovery tool: %s", fDiscoveryTool.buffer());
}
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PLUGIN_PATH, PLUGIN_LADSPA, getPluginPath(PLUGIN_LADSPA)); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PLUGIN_PATH, PLUGIN_LADSPA, getPluginPath(PLUGIN_LADSPA));
carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PLUGIN_PATH, PLUGIN_DSSI, getPluginPath(PLUGIN_DSSI)); carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PLUGIN_PATH, PLUGIN_DSSI, getPluginPath(PLUGIN_DSSI));
@ -900,6 +943,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
} }
} fRunnerData; } fRunnerData;
BinaryType fBinaryType = BINARY_NATIVE;
#ifdef CARLA_OS_WASM #ifdef CARLA_OS_WASM
PluginType fPluginType = PLUGIN_JSFX; PluginType fPluginType = PLUGIN_JSFX;
#else #else
@ -922,7 +966,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
bool fPluginSearchFirstShow = false; bool fPluginSearchFirstShow = false;
char fPluginSearchString[0xff] = {}; char fPluginSearchString[0xff] = {};
String fPopupError, fPluginFilename; String fPopupError, fPluginFilename, fDiscoveryTool;
bool idleCallbackActive = false; bool idleCallbackActive = false;
IldaeilModule* const module; IldaeilModule* const module;
@ -1470,12 +1514,28 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
} }
d_stdout("Will scan plugins now..."); d_stdout("Will scan plugins now...");
fRunnerData.handle = carla_plugin_discovery_start(module->fDiscoveryTool,
fPluginType, const String& binaryPath(module->fBinaryPath);
getPluginPath(fPluginType),
_binaryPluginSearchCallback, if (binaryPath.isNotEmpty())
_binaryPluginCheckCacheCallback, {
this); fBinaryType = BINARY_NATIVE;
fDiscoveryTool = binaryPath;
fDiscoveryTool += DISTRHO_OS_SEP_STR "carla-discovery-native";
#ifdef CARLA_OS_WIN
fDiscoveryTool += ".exe";
#endif
fRunnerData.handle = carla_plugin_discovery_start(fDiscoveryTool,
fBinaryType,
fPluginType,
getPluginPath(fPluginType),
_binaryPluginSearchCallback,
_binaryPluginCheckCacheCallback,
this);
}
if (fDrawingState == kDrawingLoading) if (fDrawingState == kDrawingLoading)
{ {
@ -1483,7 +1543,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
fPluginSearchFirstShow = true; fPluginSearchFirstShow = true;
} }
if (fRunnerData.handle == nullptr) if (binaryPath.isEmpty() || (fRunnerData.handle == nullptr && !startNextDiscovery()))
{ {
d_stdout("Nothing found!"); d_stdout("Nothing found!");
return false; return false;
@ -1496,13 +1556,105 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
return true; return true;
// stop here // stop here
d_stdout("Found %lu plugins!", (ulong)fPlugins.size());
carla_plugin_discovery_stop(fRunnerData.handle); carla_plugin_discovery_stop(fRunnerData.handle);
fRunnerData.handle = nullptr; fRunnerData.handle = nullptr;
if (startNextDiscovery())
return true;
d_stdout("Found %lu plugins!", (ulong)fPlugins.size());
return false; return false;
} }
bool startNextDiscovery()
{
if (! setNextDiscoveryTool())
return false;
fRunnerData.handle = carla_plugin_discovery_start(fDiscoveryTool,
fBinaryType,
fPluginType,
getPluginPath(fPluginType),
_binaryPluginSearchCallback,
_binaryPluginCheckCacheCallback,
this);
if (fRunnerData.handle == nullptr)
return startNextDiscovery();
return true;
}
bool setNextDiscoveryTool()
{
switch (fPluginType)
{
case PLUGIN_VST2:
case PLUGIN_VST3:
case PLUGIN_CLAP:
break;
default:
return false;
}
#ifdef CARLA_OS_WIN
#ifdef CARLA_OS_WIN64
// look for win32 plugins on win64
if (fBinaryType == BINARY_NATIVE)
{
fBinaryType = BINARY_WIN32;
fDiscoveryTool = module->fBinaryPath;
fDiscoveryTool += CARLA_OS_SEP_STR "carla-discovery-win32.exe";
if (system::exists(fDiscoveryTool.buffer()))
return true;
}
#endif
// no other types to try
return false;
#else // CARLA_OS_WIN
#ifndef CARLA_OS_MAC
// try 32bit plugins on 64bit systems, skipping macOS where 32bit is no longer supported
if (fBinaryType == BINARY_NATIVE)
{
fBinaryType = BINARY_POSIX32;
fDiscoveryTool = module->fBinaryPath;
fDiscoveryTool += CARLA_OS_SEP_STR "carla-discovery-posix32";
if (system::exists(fDiscoveryTool.buffer()))
return true;
}
#endif
// try wine bridges
#ifdef CARLA_OS_64BIT
if (fBinaryType == BINARY_NATIVE || fBinaryType == BINARY_POSIX32)
{
fBinaryType = BINARY_WIN64;
fDiscoveryTool = module->fBinaryPath;
fDiscoveryTool += CARLA_OS_SEP_STR "carla-discovery-win64.exe";
if (system::exists(fDiscoveryTool.buffer()))
return true;
}
#endif
if (fBinaryType != BINARY_WIN32)
{
fBinaryType = BINARY_WIN32;
fDiscoveryTool = module->fBinaryPath;
fDiscoveryTool += CARLA_OS_SEP_STR "carla-discovery-win32.exe";
if (system::exists(fDiscoveryTool.buffer()))
return true;
}
return false;
#endif // CARLA_OS_WIN
}
void binaryPluginSearchCallback(const CarlaPluginDiscoveryInfo* const info, const char* const sha1sum) void binaryPluginSearchCallback(const CarlaPluginDiscoveryInfo* const info, const char* const sha1sum)
{ {
// save plugin info into cache // save plugin info into cache