X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplugin.cc;h=e0ba0f00f7fabc31a9e2dcd8c7c20fd1b726ac68;hb=5ada17eba0195d90f0685776251b384efdf5168e;hp=d21ecfe632f4d2849f7451d0a2ac9cf168ab98d4;hpb=8b93fb02f38148c25c91ed41a4f12735be38dbf0;p=ardour.git

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index d21ecfe632..e0ba0f00f7 100644
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -97,12 +97,13 @@ Plugin::Plugin (AudioEngine& e, Session& s)
 	: _engine (e)
 	, _session (s)
 	, _cycles (0)
+	, _owner (0)
 	, _have_presets (false)
 	, _have_pending_stop_events (false)
 	, _parameter_changed_since_last_preset (false)
+	, _immediate_events(6096) // FIXME: size?
 {
 	_pending_stop_events.ensure_buffers (DataType::MIDI, 1, 4096);
-	PresetsChanged.connect_same_thread (_preset_connection, boost::bind (&Plugin::update_presets, this, _1 ,_2));
 }
 
 Plugin::Plugin (const Plugin& other)
@@ -112,12 +113,13 @@ Plugin::Plugin (const Plugin& other)
 	, _session (other._session)
 	, _info (other._info)
 	, _cycles (0)
+	, _owner (other._owner)
 	, _have_presets (false)
 	, _have_pending_stop_events (false)
 	, _parameter_changed_since_last_preset (false)
+	, _immediate_events(6096) // FIXME: size?
 {
 	_pending_stop_events.ensure_buffers (DataType::MIDI, 1, 4096);
-	PresetsChanged.connect_same_thread (_preset_connection, boost::bind (&Plugin::update_presets, this, _1 ,_2));
 }
 
 Plugin::~Plugin ()
@@ -128,18 +130,23 @@ void
 Plugin::remove_preset (string name)
 {
 	Plugin::PresetRecord const * p = preset_by_label (name);
+	if (!p) {
+		PBD::error << _("Trying to remove nonexistent preset.") << endmsg;
+		return;
+	}
 	if (!p->user) {
 		PBD::error << _("Cannot remove plugin factory preset.") << endmsg;
 		return;
 	}
 
 	do_remove_preset (name);
-	_presets.erase (preset_by_label (name)->uri);
+	_presets.erase (p->uri);
 
 	_last_preset.uri = "";
 	_parameter_changed_since_last_preset = false;
-	PresetRemoved (); /* EMIT SIGNAL */
+	_have_presets = false;
 	PresetsChanged (unique_id(), this); /* EMIT SIGNAL */
+	PresetRemoved (); /* EMIT SIGNAL */
 }
 
 /** @return PresetRecord with empty URI on failure */
@@ -155,8 +162,9 @@ Plugin::save_preset (string name)
 
 	if (!uri.empty()) {
 		_presets.insert (make_pair (uri, PresetRecord (uri, name)));
-		PresetAdded (); /* EMIT SIGNAL */
+		_have_presets = false;
 		PresetsChanged (unique_id(), this); /* EMIT SIGNAL */
+		PresetAdded (); /* EMIT SIGNAL */
 	}
 
 	return PresetRecord (uri, name);
@@ -339,16 +347,28 @@ Plugin::preset_by_uri (const string& uri)
 	}
 }
 
+bool
+Plugin::write_immediate_event (size_t size, const uint8_t* buf)
+{
+	if (!Evoral::midi_event_is_valid (buf, size)) {
+		return false;
+	}
+	return (_immediate_events.write (0, Evoral::MIDI_EVENT, size, buf) == size);
+}
+
 int
 Plugin::connect_and_run (BufferSet& bufs,
-		framepos_t /*start*/, framepos_t /*end*/, double /*speed*/,
+		samplepos_t /*start*/, samplepos_t /*end*/, double /*speed*/,
 		ChanMapping /*in_map*/, ChanMapping /*out_map*/,
-		pframes_t /* nframes */, framecnt_t /*offset*/)
+		pframes_t nframes, samplecnt_t /*offset*/)
 {
 	if (bufs.count().n_midi() > 0) {
 
-		/* Track notes that we are sending to the plugin */
+		if (_immediate_events.read_space() && nframes > 0) {
+			_immediate_events.read (bufs.get_midi (0), 0, 1, nframes - 1, true);
+		}
 
+		/* Track notes that we are sending to the plugin */
 		const MidiBuffer& b = bufs.get_midi (0);
 
 		_tracker.track (b.begin(), b.end());
@@ -393,18 +413,6 @@ Plugin::resolve_midi ()
 	_have_pending_stop_events = true;
 }
 
-void
-Plugin::update_presets (std::string src_unique_id, Plugin* src )
-{
-	if (src == this || unique_id() != src_unique_id) {
-		return;
-	}
-	_have_presets = false;
-	// TODO check if a preset was added/removed and emit the proper signal
-	// so far no subscriber distinguishes between PresetAdded and PresetRemoved
-	PresetAdded();
-}
-
 vector<Plugin::PresetRecord>
 Plugin::get_presets ()
 {
@@ -458,7 +466,6 @@ void
 Plugin::set_parameter (uint32_t /* which */, float /* value */)
 {
 	_parameter_changed_since_last_preset = true;
-	_session.set_dirty ();
 	PresetDirty (); /* EMIT SIGNAL */
 }
 
@@ -474,21 +481,9 @@ Plugin::parameter_changed_externally (uint32_t which, float /* value */)
 int
 Plugin::set_state (const XMLNode& node, int /*version*/)
 {
-	XMLProperty const * p = node.property (X_("last-preset-uri"));
-	if (p) {
-		_last_preset.uri = p->value ();
-	}
-
-	p = node.property (X_("last-preset-label"));
-	if (p) {
-		_last_preset.label = p->value ();
-	}
-
-	p = node.property (X_("parameter-changed-since-last-preset"));
-	if (p) {
-		_parameter_changed_since_last_preset = string_is_affirmative (p->value ());
-	}
-
+	node.get_property (X_("last-preset-uri"), _last_preset.uri);
+	node.get_property (X_("last-preset-label"), _last_preset.label);
+	node.get_property (X_("parameter-changed-since-last-preset"), _parameter_changed_since_last_preset);
 	return 0;
 }
 
@@ -496,11 +491,10 @@ XMLNode &
 Plugin::get_state ()
 {
 	XMLNode* root = new XMLNode (state_node_name ());
-	LocaleGuard lg;
 
-	root->add_property (X_("last-preset-uri"), _last_preset.uri);
-	root->add_property (X_("last-preset-label"), _last_preset.label);
-	root->add_property (X_("parameter-changed-since-last-preset"), _parameter_changed_since_last_preset ? X_("yes") : X_("no"));
+	root->set_property (X_("last-preset-uri"), _last_preset.uri);
+	root->set_property (X_("last-preset-label"), _last_preset.label);
+	root->set_property (X_("parameter-changed-since-last-preset"), _parameter_changed_since_last_preset);
 
 #ifndef NO_PLUGIN_STATE
 	add_state (root);
@@ -522,4 +516,13 @@ Plugin::set_info (PluginInfoPtr info)
 	_info = info;
 }
 
-
+std::string
+Plugin::parameter_label (uint32_t which) const
+{
+	if (which >= parameter_count ()) {
+		return "";
+	}
+	ParameterDescriptor pd;
+	get_parameter_descriptor (which, pd);
+	return pd.label;
+}