From 4e036a73b542815612445cfdabc17b414284331d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 25 Jun 2021 20:28:45 +0200 Subject: [PATCH] VST3: log bundle-path --- libs/ardour/ardour/plugin_manager.h | 2 +- libs/ardour/ardour/vst3_scan.h | 2 +- libs/ardour/plugin_manager.cc | 4 ++-- libs/ardour/vst3_scan.cc | 4 ++-- libs/fst/vst3-scanner.cc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index a7d9f22ee7..cbdc99d836 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -304,7 +304,7 @@ private: int vst3_discover_from_path (std::string const& path, bool cache_only = false); int vst3_discover (std::string const& path, bool cache_only = false); #ifdef VST3_SUPPORT - void vst3_plugin (std::string const& module_path, VST3Info const&); + void vst3_plugin (std::string const&, std::string const&, VST3Info const&); bool run_vst3_scanner_app (std::string bundle_path) const; #endif diff --git a/libs/ardour/ardour/vst3_scan.h b/libs/ardour/ardour/vst3_scan.h index 1be928f8d4..bcd197d0f6 100644 --- a/libs/ardour/ardour/vst3_scan.h +++ b/libs/ardour/ardour/vst3_scan.h @@ -75,7 +75,7 @@ LIBARDOUR_API extern std::string vst3_valid_cache_file (std::string const& module_path, bool verbose = false, bool* is_new = NULL); LIBARDOUR_API extern bool -vst3_scan_and_cache (std::string const& module_path, std::string const& bundle_path, boost::function cb, bool verbose = false); +vst3_scan_and_cache (std::string const& module_path, std::string const& bundle_path, boost::function cb, bool verbose = false); } // namespace ARDOUR diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 0b566d56a1..4f55e39191 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -1600,7 +1600,7 @@ PluginManager::vst3_discover_from_path (string const& path, bool cache_only) } void -PluginManager::vst3_plugin (string const& module_path, VST3Info const& i) +PluginManager::vst3_plugin (string const& module_path, string const& bundle_path, VST3Info const& i) { PluginInfoPtr info (new VST3PluginInfo ()); @@ -1709,7 +1709,7 @@ PluginManager::vst3_discover (string const& path, bool cache_only) for (XMLNodeConstIterator i = tree.root()->children().begin(); i != tree.root()->children().end(); ++i) { try { VST3Info nfo (**i); - vst3_plugin (module_path, nfo); + vst3_plugin (module_path, path, nfo); } catch (...) { error << string_compose (_("Corrupt VST3 cache file '%1' for plugin '%2'"), cache_file, module_path) << endmsg; DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Cannot load VST3 at '%1'\n", path)); diff --git a/libs/ardour/vst3_scan.cc b/libs/ardour/vst3_scan.cc index 0f91b9c221..32fb120f60 100644 --- a/libs/ardour/vst3_scan.cc +++ b/libs/ardour/vst3_scan.cc @@ -441,7 +441,7 @@ vst3_save_cache_file (std::string const& module_path, XMLNode* root, bool verbos } bool -ARDOUR::vst3_scan_and_cache (std::string const& module_path, std::string const& bundle_path, boost::function cb, bool verbose) +ARDOUR::vst3_scan_and_cache (std::string const& module_path, std::string const& bundle_path, boost::function cb, bool verbose) { XMLNode* root = new XMLNode ("VST3Cache"); root->set_property ("version", 1); @@ -461,7 +461,7 @@ ARDOUR::vst3_scan_and_cache (std::string const& module_path, std::string const& return false; } for (std::vector::const_iterator i = nfo.begin(); i != nfo.end(); ++i) { - cb (module_path, *i); + cb (module_path, bundle_path, *i); root->add_child_nocopy (i->state ()); } diff --git a/libs/fst/vst3-scanner.cc b/libs/fst/vst3-scanner.cc index 09ecf40b47..8181b4a391 100644 --- a/libs/fst/vst3-scanner.cc +++ b/libs/fst/vst3-scanner.cc @@ -82,7 +82,7 @@ protected: LogReceiver log_receiver; -static void vst3_plugin (string const& module_path, VST3Info const& i) +static void vst3_plugin (string const&, string const&, VST3Info const& i) { info << "Found Plugin: " << i.name << endmsg; }