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

PM: change scan timeout to from out-out to opt-in

Browse Source
This commit is contained in:
Robin Gareus
2021-07-22 17:05:40 +02:00
parent 572138ba40
commit 85d509a292
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ public:
void cancel_scan_one ();
void cancel_scan_timeout_all ();
void cancel_scan_timeout_one ();
void enable_scan_timeout ();
void clear_vst_cache ();
void clear_vst_blacklist ();
@@ -293,6 +294,7 @@ private:
bool _cancel_scan_all;
bool _cancel_scan_timeout_one;
bool _cancel_scan_timeout_all;
bool _enable_scan_timeout;
void reset_scan_cancel_state (bool single = false);

29
libs/ardour/plugin_manager.cc
View File

@@ -186,6 +186,7 @@ PluginManager::PluginManager ()
, _cancel_scan_all (false)
, _cancel_scan_timeout_one (false)
, _cancel_scan_timeout_all (false)
, _enable_scan_timeout (false)
{
char* s;
string lrdf_path;
@@ -651,6 +652,12 @@ PluginManager::detect_ambiguities ()
PluginListChanged (); /* EMIT SIGNAL */
}
void
PluginManager::enable_scan_timeout ()
{
_enable_scan_timeout = true;
}
void
PluginManager::cancel_scan_all ()
{
@@ -685,6 +692,7 @@ PluginManager::reset_scan_cancel_state (bool single)
}
_cancel_scan_all = false;
_cancel_scan_timeout_all = false;
_enable_scan_timeout = false;
}
void
@@ -1199,19 +1207,22 @@ PluginManager::run_auv2_scanner_app (CAComponentDescription const& desc, AUv2Des
return false;
}
int timeout = Config->get_vst_scan_timeout(); // deciseconds
int timeout = _enable_scan_timeout ? 1 + Config->get_plugin_scan_timeout() : 0; /* deciseconds */
bool notime = (timeout <= 0);
while (scanner.is_running () && (notime || timeout > 0)) {
if (!notime && no_timeout ()) {
notime = true;
timeout = -1;
} else if (notime && !no_timeout() && _enable_scan_timeout) {
notime = false;
timeout = 1 + Config->get_plugin_scan_timeout ();
}
ARDOUR::PluginScanTimeout (timeout);
if (timeout > -864000) {
--timeout;
}
ARDOUR::PluginScanTimeout (timeout);
Glib::usleep (100000);
if (cancelled () || (!notime && timeout == 0)) {
@@ -1489,19 +1500,22 @@ PluginManager::run_vst2_scanner_app (std::string path, PSLEPtr psle) const
return false;
}
int timeout = Config->get_vst_scan_timeout(); // deciseconds
int timeout = _enable_scan_timeout ? 1 + Config->get_plugin_scan_timeout() : 0; /* deciseconds */
bool notime = (timeout <= 0);
while (scanner.is_running () && (notime || timeout > 0)) {
if (!notime && no_timeout ()) {
notime = true;
timeout = -1;
} else if (notime && !no_timeout() && _enable_scan_timeout) {
notime = false;
timeout = 1 + Config->get_plugin_scan_timeout ();
}
ARDOUR::PluginScanTimeout (timeout);
if (timeout > -864000) {
--timeout;
}
ARDOUR::PluginScanTimeout (timeout);
Glib::usleep (100000);
if (cancelled () || (!notime && timeout == 0)) {
@@ -2247,19 +2261,22 @@ PluginManager::run_vst3_scanner_app (std::string bundle_path, PSLEPtr psle) cons
return false;
}
int timeout = Config->get_vst_scan_timeout(); // deciseconds
int timeout = _enable_scan_timeout ? 1 + Config->get_plugin_scan_timeout() : 0; /* deciseconds */
bool notime = (timeout <= 0);
while (scanner.is_running () && (notime || timeout > 0)) {
if (!notime && no_timeout ()) {
notime = true;
timeout = -1;
} else if (notime && !no_timeout() && _enable_scan_timeout) {
notime = false;
timeout = 1 + Config->get_plugin_scan_timeout ();
}
ARDOUR::PluginScanTimeout (timeout);
if (timeout > -864000) {
--timeout;
}
ARDOUR::PluginScanTimeout (timeout);
Glib::usleep (100000);
if (cancelled () || (!notime && timeout == 0)) {