From 2ca3009143452669e415237a667f99eb9fc57285 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 9 Sep 2017 02:23:13 +0200 Subject: Allow to send MIDI data directly to a plugin --- libs/ardour/ardour/plugin.h | 5 +++++ libs/ardour/ardour/plugin_insert.h | 2 ++ libs/ardour/plugin.cc | 18 ++++++++++++++++-- libs/ardour/plugin_insert.cc | 12 ++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 419e33e5fa..52fbc71c68 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -33,6 +33,7 @@ #include "ardour/cycles.h" #include "ardour/latent.h" #include "ardour/libardour_visibility.h" +#include "ardour/midi_ring_buffer.h" #include "ardour/midi_state_tracker.h" #include "ardour/parameter_descriptor.h" #include "ardour/types.h" @@ -159,6 +160,8 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent return boost::shared_ptr(); } + bool write_immediate_event (size_t size, const uint8_t* buf); + void realtime_handle_transport_stopped (); void realtime_locate (); void monitoring_changed (); @@ -379,6 +382,8 @@ private: PBD::ScopedConnection _preset_connection; + MidiRingBuffer _immediate_events; + void resolve_midi (); }; diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index f212528082..a40cdc1bea 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -77,6 +77,8 @@ class LIBARDOUR_API PluginInsert : public Processor bool reset_parameters_to_default (); bool can_reset_all_parameters (); + bool write_immediate_event (size_t size, const uint8_t* buf); + int set_block_size (pframes_t nframes); ChanMapping input_map (uint32_t num) const { diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index 7c312011be..64f00cf1c4 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -101,6 +101,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 +117,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 +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*/, ChanMapping /*in_map*/, ChanMapping /*out_map*/, - pframes_t /* nframes */, framecnt_t /*offset*/) + pframes_t nframes, framecnt_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()); diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 2afd18d199..ce05d6c298 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -705,6 +705,18 @@ PluginInsert::bypassable_changed () BypassableChanged (); } +bool +PluginInsert::write_immediate_event (size_t size, const uint8_t* buf) +{ + bool rv = true; + for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) { + if (!(*i)->write_immediate_event (size, buf)) { + rv = false; + } + } + return rv; +} + void PluginInsert::preset_load_set_value (uint32_t p, float v) { -- cgit v1.2.3