ardour/livetrax
13
0
Fork 0
Code

PM: allow to disable VST3 for consistency, fix implicit VST2 scan

Browse Source
This commit is contained in:
Robin Gareus 2021-08-10 15:30:35 +02:00
parent fb8112eb7e
commit cbec27efd6
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/rc_configuration_vars.h
View File

@ -234,6 +234,8 @@ CONFIG_VARIABLE (bool, use_windows_vst, "use-windows-vst", true)
CONFIG_VARIABLE (bool, use_lxvst, "use-lxvst", true) CONFIG_VARIABLE (bool, use_lxvst, "use-lxvst", true)
CONFIG_VARIABLE (bool, use_macvst, "use-macvst", true) CONFIG_VARIABLE (bool, use_macvst, "use-macvst", true)
CONFIG_VARIABLE (bool, use_audio_units, "use-audio-units", true) CONFIG_VARIABLE (bool, use_audio_units, "use-audio-units", true)
CONFIG_VARIABLE (bool, use_vst3, "use-vst3", true)
CONFIG_VARIABLE (bool, discover_plugins_on_start, "discover-plugins-on-start", false)
CONFIG_VARIABLE (bool, discover_vst_on_start, "discover-vst-on-start", false) CONFIG_VARIABLE (bool, discover_vst_on_start, "discover-vst-on-start", false)
CONFIG_VARIABLE (bool, verbose_plugin_scan, "verbose-plugin-scan", false) CONFIG_VARIABLE (bool, verbose_plugin_scan, "verbose-plugin-scan", false)
CONFIG_VARIABLE (bool, conceal_lv1_if_lv2_exists, "conceal-lv1-if-lv2-exists", true) CONFIG_VARIABLE (bool, conceal_lv1_if_lv2_exists, "conceal-lv1-if-lv2-exists", true)

58
libs/ardour/plugin_manager.cc
View File

@ -437,7 +437,7 @@ PluginManager::detect_type_ambiguities (PluginInfoList& pil)
void void
PluginManager::conceal_duplicates (ARDOUR::PluginInfoList* old, ARDOUR::PluginInfoList* nu) PluginManager::conceal_duplicates (ARDOUR::PluginInfoList* old, ARDOUR::PluginInfoList* nu)
{ {
if (!old) { if (!old || !nu) {
return; return;
} }
for (PluginInfoList::const_iterator i = old->begin(); i != old->end(); ++i) { for (PluginInfoList::const_iterator i = old->begin(); i != old->end(); ++i) {
@ -528,12 +528,14 @@ PluginManager::refresh (bool cache_only)
#endif #endif
#ifdef VST3_SUPPORT #ifdef VST3_SUPPORT
if (cache_only) { if(Config->get_use_vst3 ()) {
BootMessage (_("Scanning VST3 Plugins")); if (cache_only) {
} else { BootMessage (_("Scanning VST3 Plugins"));
BootMessage (_("Discovering VST3 Plugins")); } else {
BootMessage (_("Discovering VST3 Plugins"));
}
vst3_refresh (cache_only);
} }
vst3_refresh (cache_only);
#ifndef NDEBUG #ifndef NDEBUG
if (!cache_only) { if (!cache_only) {
@ -555,12 +557,15 @@ PluginManager::refresh (bool cache_only)
#endif #endif
#ifdef AUDIOUNIT_SUPPORT #ifdef AUDIOUNIT_SUPPORT
if (cache_only) {
BootMessage (_("Scanning AU Plugins")); if (Config->get_use_audio_units ()) {
} else { if (cache_only) {
BootMessage (_("Discovering AU Plugins")); BootMessage (_("Scanning AU Plugins"));
} else {
BootMessage (_("Discovering AU Plugins"));
}
au_refresh (cache_only);
} }
au_refresh (cache_only);
#ifndef NDEBUG #ifndef NDEBUG
if (!cache_only) { if (!cache_only) {
@ -1370,14 +1375,12 @@ PluginManager::auv2_discover (AUv2DescStr const& d, bool cache_only)
void void
PluginManager::au_refresh (bool cache_only) PluginManager::au_refresh (bool cache_only)
{ {
assert (Config->get_use_audio_units ());
DEBUG_TRACE (DEBUG::PluginManager, "AU: refresh\n"); DEBUG_TRACE (DEBUG::PluginManager, "AU: refresh\n");
delete _au_plugin_info; delete _au_plugin_info;
_au_plugin_info = new ARDOUR::PluginInfoList(); _au_plugin_info = new ARDOUR::PluginInfoList();
if (!Config->get_use_audio_units ()) {
return;
}
ARDOUR::PluginScanMessage(_("AUv2"), _("Indexing"), false); ARDOUR::PluginScanMessage(_("AUv2"), _("Indexing"), false);
/* disable AU in case indexing crashes */ /* disable AU in case indexing crashes */
Config->set_use_audio_units (false); Config->set_use_audio_units (false);
@ -2946,40 +2949,37 @@ PluginManager::get_all_tags (TagFilter tag_filter) const
return ret; return ret;
} }
const ARDOUR::PluginInfoList& const ARDOUR::PluginInfoList&
PluginManager::windows_vst_plugin_info () PluginManager::windows_vst_plugin_info ()
{ {
#ifdef WINDOWS_VST_SUPPORT #ifdef WINDOWS_VST_SUPPORT
if (!_windows_vst_plugin_info) { if (_windows_vst_plugin_info) {
windows_vst_refresh (); return *_windows_vst_plugin_info;
} }
return *_windows_vst_plugin_info;
#else
return _empty_plugin_info;
#endif #endif
return _empty_plugin_info;
} }
const ARDOUR::PluginInfoList& const ARDOUR::PluginInfoList&
PluginManager::mac_vst_plugin_info () PluginManager::mac_vst_plugin_info ()
{ {
#ifdef MACVST_SUPPORT #ifdef MACVST_SUPPORT
assert(_mac_vst_plugin_info); if (_mac_vst_plugin_info) {
return *_mac_vst_plugin_info; return *_mac_vst_plugin_info;
#else }
return _empty_plugin_info;
#endif #endif
return _empty_plugin_info;
} }
const ARDOUR::PluginInfoList& const ARDOUR::PluginInfoList&
PluginManager::lxvst_plugin_info () PluginManager::lxvst_plugin_info ()
{ {
#ifdef LXVST_SUPPORT #ifdef LXVST_SUPPORT
assert(_lxvst_plugin_info); if(_lxvst_plugin_info) {
return *_lxvst_plugin_info; return *_lxvst_plugin_info;
#else }
return _empty_plugin_info;
#endif #endif
return _empty_plugin_info;
} }
const ARDOUR::PluginInfoList& const ARDOUR::PluginInfoList&