diff options
| author | Robin Gareus <robin@gareus.org> | 2014-03-09 16:33:58 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-03-09 20:32:52 +0100 |
| commit | da73b0f670625e142f7784a60fa31e1eeb0666b3 (patch) | |
| tree | 0ee9589749f86abcfa28ee45ba48080e7ab7e99f /libs/ardour | |
| parent | 52c8b6d66a34952c4b0cd02eba722cd1b26bef17 (diff) | |
prepare configurable VST scan timeout
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/vst_info_file.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 724c214938..defe75de4d 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -206,6 +206,7 @@ CONFIG_VARIABLE (bool, use_windows_vst, "use-windows-vst", true) CONFIG_VARIABLE (bool, use_lxvst, "use-lxvst", true) CONFIG_VARIABLE (bool, show_plugin_scan_window, "show-plugin-scan-window", false) CONFIG_VARIABLE (bool, discover_vst_on_start, "discover-vst-on-start", false) +CONFIG_VARIABLE (int, vst_scan_timeout, "vst-scan-timeout", 600) /* deciseconds, per plugin, <= 0 no timeout */ /* custom user plugin paths */ CONFIG_VARIABLE (std::string, plugin_path_vst, "plugin-path-vst", "@default@") diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc index 90076815b3..1db9afbbc4 100644 --- a/libs/ardour/vst_info_file.cc +++ b/libs/ardour/vst_info_file.cc @@ -45,6 +45,7 @@ #ifndef VST_SCANNER_APP #include "pbd/system_exec.h" #include "ardour/plugin_manager.h" // scanner_bin_path +#include "ardour/rc_configuration.h" #endif #include "ardour/filesystem_paths.h" @@ -53,7 +54,7 @@ #include "ardour/vst_info_file.h" #define MAX_STRING_LEN 256 -#define PLUGIN_SCAN_TIMEOUT (600) // in deciseconds +#define PLUGIN_SCAN_TIMEOUT (Config->get_vst_scan_timeout()) // in deciseconds /* CACHE FILE PATHS */ |