allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Increase plugin-scan progress display frequency

Browse Source
This commit is contained in:
Robin Gareus
2020-10-27 22:20:57 +01:00
parent dc5b88f730
commit 7826a1a2a2
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/plugin_manager.cc
View File

@@ -1807,17 +1807,14 @@ PluginManager::run_vst3_scanner_app (std::string bundle_path) const
int timeout = Config->get_vst_scan_timeout(); // deciseconds
bool notime = (timeout <= 0);
ARDOUR::PluginScanTimeout (timeout);
while (scanner.is_running () && (notime || timeout > 0)) {
if (!notime && !no_timeout ()) {
if (timeout % 5 == 0) {
ARDOUR::PluginScanTimeout (timeout);
}
--timeout;
if (!notime && no_timeout ()) {
notime = true;
timeout = -1;
}
ARDOUR::GUIIdle ();
ARDOUR::PluginScanTimeout (timeout);
--timeout;
Glib::usleep (100000);
if (cancelled () || (!notime && timeout == 0)) {

15
libs/ardour/vst_info_file.cc
View File

@@ -1006,18 +1006,17 @@ vstfx_get_info (const char* dllpath, enum ARDOUR::PluginType type, enum VSTScanM
} else {
int timeout = PLUGIN_SCAN_TIMEOUT;
bool no_timeout = (timeout <= 0);
ARDOUR::PluginScanTimeout (timeout);
while (scanner.is_running () && (no_timeout || timeout > 0)) {
if (!no_timeout && !ARDOUR::PluginManager::instance ().no_timeout ()) {
if (timeout%5 == 0) {
ARDOUR::PluginScanTimeout (timeout);
}
--timeout;
if (!no_timeout && ARDOUR::PluginManager::instance().no_timeout()) {
no_timeout = true;
timeout = -1;
}
ARDOUR::GUIIdle ();
ARDOUR::PluginScanTimeout (timeout);
--timeout;
Glib::usleep (100000);
if (ARDOUR::PluginManager::instance ().cancelled ()) {
if (ARDOUR::PluginManager::instance ().cancelled () /*|| (!no_timeout && timeout == 0*)*/) {
// remove info file (might be incomplete)
vstfx_remove_infofile (dllpath);
// remove temporary blacklist file (scan incomplete)