implement plugin-scan cancel-button sensitivity

5 files changed, 8 insertions, 8 deletions

diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 38d8a9a6a2..003f05ca5d 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -50,7 +50,7 @@ namespace ARDOUR {
 	class AudioEngine;
 
 	extern LIBARDOUR_API PBD::Signal1<void,std::string> BootMessage;
-	extern LIBARDOUR_API PBD::Signal2<void,std::string,std::string> PluginScanMessage;
+	extern LIBARDOUR_API PBD::Signal3<void,std::string,std::string,bool> PluginScanMessage;
 	extern LIBARDOUR_API PBD::Signal0<void> GUIIdle;
 
 	/**
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index 332f50546f..9e461c6346 100644
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -2278,7 +2278,7 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip
 		}
 
 		AUPluginInfo::get_names (temp, info->name, info->creator);
-		ARDOUR::PluginScanMessage(_("AU"), info->name);
+		ARDOUR::PluginScanMessage(_("AU"), info->name, false);
 
 		info->type = ARDOUR::AudioUnit;
 		info->unique_id = stringify_descriptor (*info->descriptor);
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index f04ffe691d..71d65a60f3 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -125,7 +125,7 @@ mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0;
 mix_buffers_no_gain_t   ARDOUR::mix_buffers_no_gain = 0;
 
 PBD::Signal1<void,std::string> ARDOUR::BootMessage;
-PBD::Signal2<void,std::string,std::string> ARDOUR::PluginScanMessage;
+PBD::Signal3<void,std::string,std::string,bool> ARDOUR::PluginScanMessage;
 PBD::Signal0<void> ARDOUR::GUIIdle;
 
 namespace ARDOUR {
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index a9b21924ed..345c1a47dd 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -2110,7 +2110,7 @@ LV2PluginInfo::discover()
 
 		info->name = string(lilv_node_as_string(name));
 		lilv_node_free(name);
-		ARDOUR::PluginScanMessage(_("LV2"), info->name);
+		ARDOUR::PluginScanMessage(_("LV2"), info->name, false);
 
 		const LilvPluginClass* pclass = lilv_plugin_get_class(p);
 		const LilvNode*        label  = lilv_plugin_class_get_label(pclass);
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index c145fd3aa4..fc27a34255 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -210,7 +210,7 @@ PluginManager::refresh (bool cache_only)
 #endif
 
 	PluginListChanged (); /* EMIT SIGNAL */
-	PluginScanMessage(X_("closeme"), "");
+	PluginScanMessage(X_("closeme"), "", false);
 	cancel_scan = false;
 }
 
@@ -351,7 +351,7 @@ PluginManager::ladspa_refresh ()
 					    dll_extension_pattern, ladspa_modules);
 
 	for (vector<std::string>::iterator i = ladspa_modules.begin(); i != ladspa_modules.end(); ++i) {
-		ARDOUR::PluginScanMessage(_("LADSPA"), *i);
+		ARDOUR::PluginScanMessage(_("LADSPA"), *i, false);
 		ladspa_discover (*i);
 	}
 }
@@ -664,7 +664,7 @@ PluginManager::windows_vst_discover_from_path (string path, bool cache_only)
 	if (plugin_objects) {
 		for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
 			if (cancelled()) break;
-			ARDOUR::PluginScanMessage(_("VST"), **x);
+			ARDOUR::PluginScanMessage(_("VST"), **x, !cache_only);
 			windows_vst_discover (**x, cache_only);
 		}
 
@@ -804,7 +804,7 @@ PluginManager::lxvst_discover_from_path (string path, bool cache_only)
 	if (plugin_objects) {
 		for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
 			if (cancelled()) break;
-			ARDOUR::PluginScanMessage(_("LXVST"), **x);
+			ARDOUR::PluginScanMessage(_("LXVST"), **x, !cache_only);
 			lxvst_discover (**x, cache_only);
 		}