X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fplugin.cc;h=f3d66971b813e1618eb76389cca38b86e6a7468e;hb=cbef72b8a13;hp=17984361b0e9f5de0132744ca35a92baf3b9a4ae;hpb=64e1bf5ab793a7df5e2f4c2d68d2a280f8570470;p=ardour.git

diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 17984361b0..f3d66971b8 100644
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -87,12 +87,6 @@ PluginInfo::needs_midi_input () const
 	return (n_inputs.n_midi() != 0);
 }
 
-bool
-PluginInfo::is_instrument () const
-{
-	return (n_inputs.n_midi() != 0) && (n_outputs.n_audio() > 0) && (n_inputs.n_audio() == 0);
-}
-
 Plugin::Plugin (AudioEngine& e, Session& s)
 	: _engine (e)
 	, _session (s)
@@ -101,6 +95,7 @@ Plugin::Plugin (AudioEngine& e, Session& s)
 	, _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);
 }
@@ -116,6 +111,7 @@ Plugin::Plugin (const Plugin& other)
 	, _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);
 }
@@ -345,16 +341,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*/,
-		ChanMapping /*in_map*/, ChanMapping /*out_map*/,
-		pframes_t /* nframes */, framecnt_t /*offset*/)
+		samplepos_t /*start*/, samplepos_t /*end*/, double /*speed*/,
+		ChanMapping const& /*in_map*/, ChanMapping const& /*out_map*/,
+		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());
@@ -477,7 +485,6 @@ XMLNode &
 Plugin::get_state ()
 {
 	XMLNode* root = new XMLNode (state_node_name ());
-	LocaleGuard lg;
 
 	root->set_property (X_("last-preset-uri"), _last_preset.uri);
 	root->set_property (X_("last-preset-label"), _last_preset.label);
@@ -503,4 +510,43 @@ 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;
+}
+
+bool
+PluginInfo::is_effect () const
+{
+	return (!is_instrument () && !is_utility ()  && !is_analyzer ());
+}
+
+bool
+PluginInfo::is_instrument () const
+{
+	if (category == "Instrument") {
+		return true;
+	}
+
+	// second check: if we have  midi input and audio output, we're likely an instrument
+	return (n_inputs.n_midi() != 0) && (n_outputs.n_audio() > 0) && (n_inputs.n_audio() == 0);
+}
 
+bool
+PluginInfo::is_utility () const
+{
+	/* XXX beware of translations, e.g. LV2 categories */
+	return (category == "Utility" || category == "MIDI" || category == "Generator");
+}
+
+bool
+PluginInfo::is_analyzer () const
+{
+	return (category == "Analyser" || category == "Anaylsis" || category == "Analyzer");
+}