diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/ardour.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/plugin_manager.h | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 003f05ca5d..465de04127 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -51,6 +51,7 @@ namespace ARDOUR { extern LIBARDOUR_API PBD::Signal1<void,std::string> BootMessage; extern LIBARDOUR_API PBD::Signal3<void,std::string,std::string,bool> PluginScanMessage; + extern LIBARDOUR_API PBD::Signal1<void,int> PluginScanTimeout; extern LIBARDOUR_API PBD::Signal0<void> GUIIdle; /** diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index 17400ea4d8..6239bd7cb0 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -53,13 +53,15 @@ class LIBARDOUR_API PluginManager : public boost::noncopyable { void refresh (bool cache_only = false); void cancel_plugin_scan(); + void cancel_plugin_timeout(); void clear_vst_cache (); void clear_vst_blacklist (); const std::string get_default_windows_vst_path() const { return windows_vst_path; } const std::string get_default_lxvst_path() const { return lxvst_path; } - bool cancelled () { return cancel_scan; } + bool cancelled () { return _cancel_scan; } + bool no_timeout () { return _cancel_timeout; } enum PluginStatusType { Normal = 0, @@ -112,7 +114,8 @@ class LIBARDOUR_API PluginManager : public boost::noncopyable { std::string windows_vst_path; std::string lxvst_path; - bool cancel_scan; + bool _cancel_scan; + bool _cancel_timeout; void ladspa_refresh (); void windows_vst_refresh (bool cache_only = false); |