ardour/livetrax
13
0
Fork 0
Code

Force rescan of VST3 plugins

Browse Source
This commit is contained in:
Robin Gareus 2023-01-06 00:52:28 +01:00
parent f221a5e47f
commit e5e9b477d0
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/plugin_manager.cc
View File

@ -5,7 +5,7 @@
* Copyright (C) 2009-2012 Carl Hetherington <carl@carlh.net> * Copyright (C) 2009-2012 Carl Hetherington <carl@carlh.net>
* Copyright (C) 2012-2015 Tim Mayberry <mojofunk@gmail.com> * Copyright (C) 2012-2015 Tim Mayberry <mojofunk@gmail.com>
* Copyright (C) 2014-2018 John Emmas <john@creativepost.co.uk> * Copyright (C) 2014-2018 John Emmas <john@creativepost.co.uk>
* Copyright (C) 2014-2019 Robin Gareus <robin@gareus.org> * Copyright (C) 2014-2023 Robin Gareus <robin@gareus.org>
* Copyright (C) 2018 Ben Loftis <ben@harrisonconsoles.com> * Copyright (C) 2018 Ben Loftis <ben@harrisonconsoles.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -2149,15 +2149,7 @@ PluginManager::vst3_discover (string const& path, bool cache_only)
XMLTree tree; XMLTree tree;
if (cache_file.empty ()) { if (cache_file.empty ()) {
run_scan = true; run_scan = true;
} else if (tree.read (cache_file)) { } else if (!tree.read (cache_file)) {
/* valid cache file was found, now check version
* see ARDOUR::vst3_scan_and_cache VST3Cache version
*/
int cf_version = 0;
if (!tree.root()->get_property ("version", cf_version) || cf_version < 1) {
run_scan = true;
}
} else {
/* failed to parse XML */ /* failed to parse XML */
run_scan = true; run_scan = true;
} }

18
libs/ardour/vst3_scan.cc
View File

@ -47,6 +47,8 @@
using namespace std; using namespace std;
using namespace Steinberg; using namespace Steinberg;
#define ARDOUR_VST3_CACHE_FILE_VERSION 2
static const char* fmt_media (Vst::MediaType m) { static const char* fmt_media (Vst::MediaType m) {
switch (m) { switch (m) {
case Vst::kAudio: return "kAudio"; case Vst::kAudio: return "kAudio";
@ -392,8 +394,20 @@ ARDOUR::vst3_valid_cache_file (std::string const& module_path, bool verbose, boo
if (sb_vst.st_mtime < sb_v3i.st_mtime) { if (sb_vst.st_mtime < sb_v3i.st_mtime) {
/* plugin is older than cache file */ /* plugin is older than cache file */
if (verbose) { if (verbose) {
PBD::info << "Cache file is up-to-date." << endmsg; PBD::info << "Cache file timestamp is valid." << endmsg;
} }
/* check file format version */
XMLTree tree;
if (!tree.read (cache_file)) {
PBD::info << "Cache file is not valid XML." << endmsg;
return "";
}
int cf_version = 0;
if (!tree.root()->get_property ("version", cf_version) || cf_version < ARDOUR_VST3_CACHE_FILE_VERSION) {
PBD::info << "Cache file version is too old." << endmsg;
return "";
}
PBD::info << "Cache file is valid and up-to-date." << endmsg;
return cache_file; return cache_file;
} else if (verbose) { } else if (verbose) {
PBD::info << "Stale cache." << endmsg; PBD::info << "Stale cache." << endmsg;
@ -454,7 +468,7 @@ bool
ARDOUR::vst3_scan_and_cache (std::string const& module_path, std::string const& bundle_path, boost::function<void (std::string const&, std::string const&, VST3Info const&)> cb, bool verbose) ARDOUR::vst3_scan_and_cache (std::string const& module_path, std::string const& bundle_path, boost::function<void (std::string const&, std::string const&, VST3Info const&)> cb, bool verbose)
{ {
XMLNode* root = new XMLNode ("VST3Cache"); XMLNode* root = new XMLNode ("VST3Cache");
root->set_property ("version", 1); root->set_property ("version", ARDOUR_VST3_CACHE_FILE_VERSION);
root->set_property ("bundle", bundle_path); root->set_property ("bundle", bundle_path);
root->set_property ("module", module_path); root->set_property ("module", module_path);