API evolution

The Session-reference is only needed to instantiate/load the plugin.
Indexing presets is not supposed to call load() and be const WRT to
PluginInfo

1 files changed, 30 insertions, 28 deletions

diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc
index ac868cd565..2c50144f26 100644
--- a/libs/ardour/lxvst_plugin.cc
+++ b/libs/ardour/lxvst_plugin.cc
@@ -99,7 +99,7 @@ LXVSTPluginInfo::load (Session& session)
 }
 
 std::vector<Plugin::PresetRecord>
-LXVSTPluginInfo::get_presets(Session&)
+LXVSTPluginInfo::get_presets (bool user_only) const
 {
 	std::vector<Plugin::PresetRecord> p;
 #ifndef NO_PLUGIN_STATE
@@ -107,45 +107,47 @@ LXVSTPluginInfo::get_presets(Session&)
 		return p;
 	}
 
-#if 0 // TODO - cache, instantiating the plugin can be heavy
-	/* Built-in presets */
-	VSTHandle* handle = vstfx_load(path.c_str());
-	Session::vst_current_loading_id = atoi (unique_id);
-	AEffect* plugin = handle->main_entry (Session::vst_callback);
-	Session::vst_current_loading_id = 0;
-
-	plugin->dispatcher (plugin, effOpen, 0, 0, 0, 0); // :(
-	int const vst_version = plugin->dispatcher (plugin, effGetVstVersion, 0, 0, NULL, 0);
-
-	for (int i = 0; i < plugin->numPrograms; ++i) {
-		Plugin::PresetRecord r (string_compose (X_("VST:%1:%2"), unique_id, i), "", false);
-		if (vst_version >= 2) {
-			char buf[256];
-			if (plugin->dispatcher (plugin, 29, i, 0, buf, 0) == 1) {
-				r.label = buf;
+	if (!user_only) {
+		// TODO - cache, instantiating the plugin can be heavy
+		/* Built-in presets */
+		VSTHandle* handle = vstfx_load(path.c_str());
+		Session::vst_current_loading_id = atoi (unique_id);
+		AEffect* plugin = handle->main_entry (Session::vst_callback);
+		Session::vst_current_loading_id = 0;
+
+		plugin->dispatcher (plugin, effOpen, 0, 0, 0, 0); // :(
+		int const vst_version = plugin->dispatcher (plugin, effGetVstVersion, 0, 0, NULL, 0);
+
+		for (int i = 0; i < plugin->numPrograms; ++i) {
+			Plugin::PresetRecord r (string_compose (X_("VST:%1:%2"), unique_id, i), "", false);
+			if (vst_version >= 2) {
+				char buf[256];
+				if (plugin->dispatcher (plugin, 29, i, 0, buf, 0) == 1) {
+					r.label = buf;
+				} else {
+					r.label = string_compose (_("Preset %1"), i);
+				}
 			} else {
 				r.label = string_compose (_("Preset %1"), i);
 			}
-		} else {
-			r.label = string_compose (_("Preset %1"), i);
+			p.push_back (r);
 		}
-		p.push_back (r);
-	}
 
-	plugin->dispatcher (plugin, effMainsChanged, 0, 0, 0, 0);
-	plugin->dispatcher (plugin, effClose, 0, 0, 0, 0); // :(
+		plugin->dispatcher (plugin, effMainsChanged, 0, 0, 0, 0);
+		plugin->dispatcher (plugin, effClose, 0, 0, 0, 0); // :(
 
-	if (handle->plugincnt) {
-		handle->plugincnt--;
+		if (handle->plugincnt) {
+			handle->plugincnt--;
+		}
+		vstfx_unload (handle);
 	}
-	vstfx_unload (handle);
-#endif
+
 	/* user presets */
 	XMLTree* t = new XMLTree;
 	std::string pf = Glib::build_filename (ARDOUR::user_config_directory (), "presets", string_compose ("vst-%1", unique_id));
 	if (Glib::file_test (pf, Glib::FILE_TEST_EXISTS)) {
 		t->set_filename (pf);
-		if (t->read ()) {
+		if (t->read ()) { // TODO read names only. skip parsing the actual data
 			XMLNode* root = t->root ();
 			for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
 				XMLProperty* uri = (*i)->property (X_("uri"));