finally get to the bottom of where NO_PLUGIN_STATE needs to be in order to be useful
[ardour.git] / libs / ardour / lv2_plugin.cc
index e8f8a5c52159b24be93cb0bf20d3c1ab61b9e71c..5ea76934a5ffe85923ee5be67d6c052aaacb45c5 100644 (file)
 
 #include <string>
 #include <vector>
+#include <limits>
 
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
 
-#include <glibmm.h>
 #include <giomm/file.h>
+#include <glib/gprintf.h>
+#include <glibmm.h>
 
 #include <boost/utility.hpp>
 
+#include "pbd/pathscanner.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/xml++.h"
 
 #include "libardour-config.h"
 
-#include "ardour/types.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
 #include "ardour/debug.h"
 #include "ardour/lv2_plugin.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
+#include "ardour/types.h"
+#include "ardour/utils.h"
 #include "ardour/worker.h"
+#include "ardour/lv2_bundled_search_path.h"
 
 #include "i18n.h"
 #include <locale.h>
 #include <lilv/lilv.h>
 
 #include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/lv2plug.in/ns/ext/log/log.h"
+#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
 #include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
 #include "lv2/lv2plug.in/ns/ext/presets/presets.h"
 #include "lv2/lv2plug.in/ns/ext/state/state.h"
 #include "lv2/lv2plug.in/ns/ext/time/time.h"
 #include "lv2/lv2plug.in/ns/ext/worker/worker.h"
+#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
 #ifdef HAVE_NEW_LV2
 #include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
+#include "lv2/lv2plug.in/ns/ext/options/options.h"
 #endif
 
 #include "lv2_evbuf.h"
 #include <suil/suil.h>
 #endif
 
+/** The number of MIDI buffers that will fit in a UI/worker comm buffer.
+    This needs to be roughly the number of cycles the UI will get around to
+    actually processing the traffic.  Lower values are flakier but save memory.
+*/
+static const size_t NBUFS = 4;
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
 URIMap LV2Plugin::_uri_map;
-uint32_t LV2Plugin::_midi_event_type = _uri_map.uri_to_id(
-       "http://lv2plug.in/ns/ext/midi#MidiEvent");
-uint32_t LV2Plugin::_chunk_type = _uri_map.uri_to_id(
-       LV2_ATOM__Chunk);
-uint32_t LV2Plugin::_sequence_type = _uri_map.uri_to_id(
-       LV2_ATOM__Sequence);
-uint32_t LV2Plugin::_event_transfer_type = _uri_map.uri_to_id(
-       LV2_ATOM__eventTransfer);
-uint32_t LV2Plugin::_path_type = _uri_map.uri_to_id(
-       LV2_ATOM__Path);
+
+LV2Plugin::URIDs LV2Plugin::urids = {
+       _uri_map.uri_to_id(LV2_ATOM__Chunk),
+       _uri_map.uri_to_id(LV2_ATOM__Path),
+       _uri_map.uri_to_id(LV2_ATOM__Sequence),
+       _uri_map.uri_to_id(LV2_ATOM__eventTransfer),
+       _uri_map.uri_to_id(LV2_LOG__Error),
+       _uri_map.uri_to_id(LV2_LOG__Note),
+       _uri_map.uri_to_id(LV2_LOG__Warning),
+       _uri_map.uri_to_id(LV2_MIDI__MidiEvent),
+       _uri_map.uri_to_id(LV2_TIME__Position),
+       _uri_map.uri_to_id(LV2_TIME__bar),
+       _uri_map.uri_to_id(LV2_TIME__barBeat),
+       _uri_map.uri_to_id(LV2_TIME__beatUnit),
+       _uri_map.uri_to_id(LV2_TIME__beatsPerBar),
+       _uri_map.uri_to_id(LV2_TIME__beatsPerMinute),
+       _uri_map.uri_to_id(LV2_TIME__frame),
+       _uri_map.uri_to_id(LV2_TIME__speed)
+};
 
 class LV2World : boost::noncopyable {
 public:
        LV2World ();
        ~LV2World ();
 
+       void load_bundled_plugins();
+
        LilvWorld* world;
 
        LilvNode* atom_AtomPort;
@@ -94,25 +121,36 @@ public:
        LilvNode* atom_Sequence;
        LilvNode* atom_bufferType;
        LilvNode* atom_eventTransfer;
+       LilvNode* atom_supports;
        LilvNode* ev_EventPort;
        LilvNode* ext_logarithmic;
+       LilvNode* ext_notOnGUI;
        LilvNode* lv2_AudioPort;
        LilvNode* lv2_ControlPort;
        LilvNode* lv2_InputPort;
        LilvNode* lv2_OutputPort;
        LilvNode* lv2_enumeration;
+       LilvNode* lv2_freewheeling;
        LilvNode* lv2_inPlaceBroken;
        LilvNode* lv2_integer;
+       LilvNode* lv2_reportsLatency;
        LilvNode* lv2_sampleRate;
        LilvNode* lv2_toggled;
        LilvNode* midi_MidiEvent;
        LilvNode* rdfs_comment;
+       LilvNode* rsz_minimumSize;
+       LilvNode* time_Position;
        LilvNode* ui_GtkUI;
        LilvNode* ui_external;
+
+private:
+       bool _bundle_checked;
 };
 
 static LV2World _world;
 
+/* worker extension */
+
 /** Called by the plugin to schedule non-RT work. */
 static LV2_Worker_Status
 work_schedule(LV2_Worker_Schedule_Handle handle,
@@ -147,68 +185,64 @@ work_respond(LV2_Worker_Respond_Handle handle,
        }
 }
 
-#ifdef HAVE_NEW_LV2
-/** Called by the plugin to discover properties of the block length. */
-static LV2_Buf_Size_Status
-get_sample_count(LV2_Buf_Size_Access_Handle handle,
-                 uint32_t*                  min,
-                 uint32_t*                  max,
-                 uint32_t*                  multiple_of,
-                 uint32_t*                  power_of)
-{
-       AudioEngine* engine = (AudioEngine*)handle;
-       *min         = 1;
-       *max         = engine->frames_per_cycle();
-       *multiple_of = 1;
-       *power_of    = 0;
-       return LV2_BUF_SIZE_SUCCESS;
-}
-
-/** Called by the plugin to get the size required for some buffer type. */
-static LV2_Buf_Size_Status
-get_buf_size(LV2_Buf_Size_Access_Handle handle,
-             uint32_t*                  buf_size,
-             LV2_URID                   type,
-             uint32_t                   sample_count)
-{
-       AudioEngine* engine = (AudioEngine*)handle;
-       if (type == LV2Plugin::_sequence_type) {
-               *buf_size = engine->raw_buffer_size(DataType::MIDI);
-               return LV2_BUF_SIZE_SUCCESS;
-       }
-       *buf_size = 0;
-       return LV2_BUF_SIZE_ERR_BAD_TYPE;
-}
-
-static LV2_Buf_Size_Access buf_size_access = {
-       NULL, sizeof(LV2_Buf_Size_Access), get_sample_count, get_buf_size
-};
-#endif
+/* log extension */
+
+static int
+log_vprintf(LV2_Log_Handle /*handle*/,
+            LV2_URID       type,
+            const char*    fmt,
+            va_list        args)
+{
+       char* str = NULL;
+       const int ret = g_vasprintf(&str, fmt, args);
+       if (type == LV2Plugin::urids.log_Error) {
+               error << str << endmsg;
+       } else if (type == LV2Plugin::urids.log_Warning) {
+               warning << str << endmsg;
+       } else if (type == LV2Plugin::urids.log_Note) {
+               info << str << endmsg;
+       }
+       // TODO: Toggleable log:Trace message support
+       return ret;
+}
+
+static int
+log_printf(LV2_Log_Handle handle,
+           LV2_URID       type,
+           const char*    fmt, ...)
+{
+       va_list args;
+       va_start(args, fmt);
+       const int ret = log_vprintf(handle, type, fmt, args);
+       va_end(args);
+       return ret;
+}
 
 struct LV2Plugin::Impl {
        Impl() : plugin(0), ui(0), ui_type(0), name(0), author(0), instance(0)
               , work_iface(0)
               , state(0)
        {}
-       
+
        /** Find the LV2 input port with the given designation.
         * If found, bufptrs[port_index] will be set to bufptr.
         */
-       LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
-
-       LilvPlugin*           plugin;
-       const LilvUI*         ui;
-       const LilvNode*       ui_type;
-       LilvNode*             name;
-       LilvNode*             author;
-       LilvInstance*         instance;
-       LV2_Worker_Interface* work_iface;
-       LilvState*            state;
+       const LilvPort* designated_input (const char* uri, void** bufptrs[], void** bufptr);
+
+       const LilvPlugin*           plugin;
+       const LilvUI*               ui;
+       const LilvNode*             ui_type;
+       LilvNode*                   name;
+       LilvNode*                   author;
+       LilvInstance*               instance;
+       const LV2_Worker_Interface* work_iface;
+       LilvState*                  state;
+       LV2_Atom_Forge              forge;
 };
 
 LV2Plugin::LV2Plugin (AudioEngine& engine,
                       Session&     session,
-                      void*        c_plugin,
+                      const void*  c_plugin,
                       framecnt_t   rate)
        : Plugin (engine, session)
        , Workee ()
@@ -237,21 +271,26 @@ LV2Plugin::LV2Plugin (const LV2Plugin& other)
 }
 
 void
-LV2Plugin::init(void* c_plugin, framecnt_t rate)
+LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 {
        DEBUG_TRACE(DEBUG::LV2, "init\n");
 
-       _impl->plugin           = (LilvPlugin*)c_plugin;
+       _impl->plugin           = (const LilvPlugin*)c_plugin;
        _impl->ui               = NULL;
        _impl->ui_type          = NULL;
        _to_ui                  = NULL;
        _from_ui                = NULL;
        _control_data           = 0;
        _shadow_data            = 0;
+       _atom_ev_buffers        = 0;
        _ev_buffers             = 0;
        _bpm_control_port       = 0;
        _freewheel_control_port = 0;
        _latency_control_port   = 0;
+       _next_cycle_start       = std::numeric_limits<framepos_t>::max();
+       _next_cycle_speed       = 1.0;
+       _block_length           = _engine.frames_per_cycle();
+       _seq_size               = _engine.raw_buffer_size(DataType::MIDI);
        _state_version          = 0;
        _was_activated          = false;
        _has_state_interface    = false;
@@ -259,16 +298,13 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
        _instance_access_feature.URI = "http://lv2plug.in/ns/ext/instance-access";
        _data_access_feature.URI     = "http://lv2plug.in/ns/ext/data-access";
        _make_path_feature.URI       = LV2_STATE__makePath;
+       _log_feature.URI             = LV2_LOG__log;
        _work_schedule_feature.URI   = LV2_WORKER__schedule;
        _work_schedule_feature.data  = NULL;
+       _def_state_feature.URI       = LV2_STATE_PREFIX "loadDefaultState";  // Post LV2-1.2.0
+       _def_state_feature.data      = NULL;
 
-#ifdef HAVE_NEW_LV2
-       _buf_size_feature.URI  = LV2_BUF_SIZE__access;
-       _buf_size_feature.data = &buf_size_access;
-       buf_size_access.handle = &_engine;
-#endif
-
-       LilvPlugin* plugin = _impl->plugin;
+       const LilvPlugin* plugin = _impl->plugin;
 
        LilvNode* state_iface_uri = lilv_new_uri(_world.world, LV2_STATE__interface);
        LilvNode* state_uri       = lilv_new_uri(_world.world, LV2_STATE_URI);
@@ -280,20 +316,37 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
        lilv_node_free(state_uri);
        lilv_node_free(state_iface_uri);
 
-       _features    = (LV2_Feature**)calloc(8, sizeof(LV2_Feature*));
+       _features    = (LV2_Feature**)calloc(11, sizeof(LV2_Feature*));
        _features[0] = &_instance_access_feature;
        _features[1] = &_data_access_feature;
        _features[2] = &_make_path_feature;
        _features[3] = _uri_map.uri_map_feature();
        _features[4] = _uri_map.urid_map_feature();
        _features[5] = _uri_map.urid_unmap_feature();
+       _features[6] = &_log_feature;
+
+       unsigned n_features = 7;
+#ifdef HAVE_NEW_LV2
+       _features[n_features++] = &_def_state_feature;
+#endif
+
+       lv2_atom_forge_init(&_impl->forge, _uri_map.urid_map());
 
-       unsigned n_features = 6;
 #ifdef HAVE_NEW_LV2
-       _buf_size_feature.URI  = LV2_BUF_SIZE__access;
-       _buf_size_feature.data = &buf_size_access;
-       buf_size_access.handle = &_engine;
-       _features[n_features++] = &_buf_size_feature;
+       LV2_URID atom_Int = _uri_map.uri_to_id(LV2_ATOM__Int);
+       LV2_Options_Option options[] = {
+               { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__minBlockLength),
+                 sizeof(int32_t), atom_Int, &_block_length },
+               { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__maxBlockLength),
+                 sizeof(int32_t), atom_Int, &_block_length },
+               { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__sequenceSize),
+                 sizeof(int32_t), atom_Int, &_seq_size },
+               { LV2_OPTIONS_INSTANCE, 0, 0, 0, 0, NULL }
+       };
+
+       _options_feature.URI    = LV2_OPTIONS__options;
+       _options_feature.data   = options;
+       _features[n_features++] = &_options_feature;
 #endif
 
        LV2_State_Make_Path* make_path = (LV2_State_Make_Path*)malloc(
@@ -302,11 +355,18 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
        make_path->path = &lv2_state_make_path;
        _make_path_feature.data = make_path;
 
+       LV2_Log_Log* log = (LV2_Log_Log*)malloc(sizeof(LV2_Log_Log));
+       log->handle  = this;
+       log->printf  = &log_printf;
+       log->vprintf = &log_vprintf;
+       _log_feature.data = log;
+
        LilvNode* worker_schedule = lilv_new_uri(_world.world, LV2_WORKER__schedule);
        if (lilv_plugin_has_feature(plugin, worker_schedule)) {
                LV2_Worker_Schedule* schedule = (LV2_Worker_Schedule*)malloc(
                        sizeof(LV2_Worker_Schedule));
-               _worker                     = new Worker(this, 4096);
+               size_t buf_size = _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS;
+               _worker                     = new Worker(this, buf_size);
                schedule->handle            = this;
                schedule->schedule_work     = work_schedule;
                _work_schedule_feature.data = schedule;
@@ -327,7 +387,12 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
        _data_access_extension_data.extension_data = _impl->instance->lv2_descriptor->extension_data;
        _data_access_feature.data                  = &_data_access_extension_data;
 
-       _impl->work_iface = (LV2_Worker_Interface*)extension_data(LV2_WORKER__interface);
+       LilvNode* worker_iface_uri = lilv_new_uri(_world.world, LV2_WORKER__interface);
+       if (lilv_plugin_has_extension_data(plugin, worker_iface_uri)) {
+               _impl->work_iface = (const LV2_Worker_Interface*)extension_data(
+                       LV2_WORKER__interface);
+       }
+       lilv_node_free(worker_iface_uri);
 
        if (lilv_plugin_has_feature(plugin, _world.lv2_inPlaceBroken)) {
                error << string_compose(
@@ -338,12 +403,22 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
                throw failed_constructor();
        }
 
+#ifdef HAVE_NEW_LILV
+       // Load default state
+       LilvState* state = lilv_state_new_from_world(
+               _world.world, _uri_map.urid_map(), lilv_plugin_get_uri(_impl->plugin));
+       if (state && _has_state_interface) {
+               lilv_state_restore(state, _impl->instance, NULL, NULL, 0, NULL);
+       }
+#endif
+
        _sample_rate = rate;
 
        const uint32_t num_ports = this->num_ports();
        for (uint32_t i = 0; i < num_ports; ++i) {
                const LilvPort* port  = lilv_plugin_get_port_by_index(_impl->plugin, i);
                PortFlags       flags = 0;
+               size_t          minimumSize = 0;
 
                if (lilv_port_is_a(_impl->plugin, port, _world.lv2_OutputPort)) {
                        flags |= PORT_OUTPUT;
@@ -362,13 +437,30 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
                        flags |= PORT_AUDIO;
                } else if (lilv_port_is_a(_impl->plugin, port, _world.ev_EventPort)) {
                        flags |= PORT_EVENT;
+                       flags |= PORT_MIDI;  // We assume old event API ports are for MIDI
                } else if (lilv_port_is_a(_impl->plugin, port, _world.atom_AtomPort)) {
                        LilvNodes* buffer_types = lilv_port_get_value(
                                _impl->plugin, port, _world.atom_bufferType);
-                               if (lilv_nodes_contains(buffer_types, _world.atom_Sequence)) {
-                                       flags |= PORT_MESSAGE;
+                       LilvNodes* atom_supports = lilv_port_get_value(
+                               _impl->plugin, port, _world.atom_supports);
+
+                       if (lilv_nodes_contains(buffer_types, _world.atom_Sequence)) {
+                               flags |= PORT_SEQUENCE;
+                               if (lilv_nodes_contains(atom_supports, _world.midi_MidiEvent)) {
+                                       flags |= PORT_MIDI;
                                }
+                               if (lilv_nodes_contains(atom_supports, _world.time_Position)) {
+                                       flags |= PORT_POSITION;
+                               }
+                       }
+                       LilvNodes* min_size_v = lilv_port_get_value(_impl->plugin, port, _world.rsz_minimumSize);
+                       LilvNode* min_size = min_size_v ? lilv_nodes_get_first(min_size_v) : NULL;
+                       if (min_size && lilv_node_is_int(min_size)) {
+                               minimumSize = lilv_node_as_int(min_size);
+                       }
+                       lilv_nodes_free(min_size_v);
                        lilv_nodes_free(buffer_types);
+                       lilv_nodes_free(atom_supports);
                } else {
                        error << string_compose(
                                "LV2: \"%1\" port %2 has no known data type",
@@ -377,6 +469,7 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
                }
 
                _port_flags.push_back(flags);
+               _port_minimumSize.push_back(minimumSize);
        }
 
        _control_data = new float[num_ports];
@@ -477,6 +570,7 @@ LV2Plugin::init(void* c_plugin, framecnt_t rate)
                }
        }
 
+       allocate_atom_event_buffers();
        latency_compute_run();
 }
 
@@ -497,6 +591,16 @@ LV2Plugin::~LV2Plugin ()
 
        delete _to_ui;
        delete _from_ui;
+       delete _worker;
+
+       if (_atom_ev_buffers) {
+               LV2_Evbuf**  b = _atom_ev_buffers;
+               while (*b) {
+                       free(*b);
+                       b++;
+               }
+               free(_atom_ev_buffers);
+       }
 
        delete [] _control_data;
        delete [] _shadow_data;
@@ -611,14 +715,11 @@ LV2Plugin::set_parameter(uint32_t which, float val)
                            "%1 set parameter %2 to %3\n", name(), which, val));
 
        if (which < lilv_plugin_get_num_ports(_impl->plugin)) {
-               
                if (get_parameter (which) == val) {
                        return;
                }
-               
-               _shadow_data[which] = val;
-               
 
+               _shadow_data[which] = val;
        } else {
                warning << string_compose(
                    _("Illegal parameter number used with plugin \"%1\". "
@@ -652,7 +753,7 @@ LV2Plugin::get_docs() const
 
        return "";
 }
-       
+
 std::string
 LV2Plugin::get_parameter_docs(uint32_t which) const
 {
@@ -687,27 +788,27 @@ LV2Plugin::nth_parameter(uint32_t n, bool& ok) const
 }
 
 const void*
-LV2Plugin::extension_data (const char* uri) const
+LV2Plugin::extension_data(const char* uri) const
 {
        return lilv_instance_get_extension_data(_impl->instance, uri);
 }
 
-void*
-LV2Plugin::c_plugin ()
+const void*
+LV2Plugin::c_plugin()
 {
        return _impl->plugin;
 }
 
-void*
-LV2Plugin::c_ui ()
+const void*
+LV2Plugin::c_ui()
 {
-       return (void*)_impl->ui;
+       return (const void*)_impl->ui;
 }
 
-void*
-LV2Plugin::c_ui_type ()
+const void*
+LV2Plugin::c_ui_type()
 {
-       return (void*)_impl->ui_type;
+       return (const void*)_impl->ui_type;
 }
 
 /** Directory for all plugin state. */
@@ -760,9 +861,6 @@ LV2Plugin::lv2_state_make_path(LV2_State_Make_Path_Handle handle,
        DEBUG_TRACE(DEBUG::LV2, string_compose("new file path %1 => %2\n",
                                               path, abs_path));
 
-       std::cerr << "MAKE PATH " << path
-                 << " => " << g_strndup(abs_path.c_str(), abs_path.length())
-                 << std::endl;
        return g_strndup(abs_path.c_str(), abs_path.length());
 }
 
@@ -807,13 +905,10 @@ LV2Plugin::add_state(XMLNode* root) const
        }
 
        if (_has_state_interface) {
-               cout << "LV2 " << name() << " has state interface" << endl;
                // Provisionally increment state version and create directory
                const std::string new_dir = state_dir(++_state_version);
                g_mkdir_with_parents(new_dir.c_str(), 0744);
 
-               cout << "NEW DIR: " << new_dir << endl;
-
                LilvState* state = lilv_state_new_from_instance(
                        _impl->plugin,
                        _impl->instance,
@@ -823,7 +918,7 @@ LV2Plugin::add_state(XMLNode* root) const
                        _session.externals_dir().c_str(),
                        new_dir.c_str(),
                        NULL,
-                       (void*)this,
+                       const_cast<LV2Plugin*>(this),
                        0,
                        NULL);
 
@@ -838,19 +933,14 @@ LV2Plugin::add_state(XMLNode* root) const
 
                        lilv_state_free(_impl->state);
                        _impl->state = state;
-
-                       cout << "Saved LV2 state to " << state_dir(_state_version) << endl;
                } else {
                        // State is identical, decrement version and nuke directory
-                       cout << "LV2 state identical, not saving" << endl;
                        lilv_state_free(state);
                        remove_directory(new_dir);
                        --_state_version;
                }
 
                root->add_property("state-dir", string_compose("state%1", _state_version));
-       } else {
-               cout << "LV2 " << name() << " has no state interface." << endl;
        }
 }
 
@@ -892,38 +982,38 @@ LV2Plugin::find_presets()
        lilv_node_free(lv2_appliesTo);
 }
 
+static void
+set_port_value(const char* port_symbol,
+               void*       user_data,
+               const void* value,
+               uint32_t    /*size*/,
+               uint32_t    type)
+{
+       LV2Plugin* self = (LV2Plugin*)user_data;
+       if (type != 0 && type != self->_uri_map.uri_to_id(LV2_ATOM__Float)) {
+               return;  // TODO: Support non-float ports
+       }
+
+       const uint32_t port_index = self->port_index(port_symbol);
+       if (port_index != (uint32_t)-1) {
+               self->set_parameter(port_index, *(const float*)value);
+       }
+}
+
 bool
 LV2Plugin::load_preset(PresetRecord r)
 {
+       LilvWorld* world = _world.world;
+       LilvNode*  pset  = lilv_new_uri(world, r.uri.c_str());
+       LilvState* state = lilv_state_new_from_world(world, _uri_map.urid_map(), pset);
 
-       std::map<std::string,uint32_t>::iterator it;
-
-       LilvNode* lv2_port   = lilv_new_uri(_world.world, LILV_NS_LV2 "port");
-       LilvNode* lv2_symbol = lilv_new_uri(_world.world, LILV_NS_LV2 "symbol");
-       LilvNode* preset     = lilv_new_uri(_world.world, r.uri.c_str());
-       LilvNode* pset_value = lilv_new_uri(_world.world, LV2_PRESETS__value);
-
-       LilvNodes* ports = lilv_world_find_nodes(_world.world, preset, lv2_port, NULL);
-       LILV_FOREACH(nodes, i, ports) {
-               const LilvNode* port   = lilv_nodes_get(ports, i);
-               const LilvNode* symbol = get_value(_world.world, port, lv2_symbol);
-               const LilvNode* value  = get_value(_world.world, port, pset_value);
-               if (value && lilv_node_is_float(value)) {
-                       it = _port_indices.find(lilv_node_as_string(symbol));
-                       if (it != _port_indices.end())
-                               set_parameter(it->second,lilv_node_as_float(value));
-               }
+       if (state) {
+               lilv_state_restore(state, _impl->instance, set_port_value, this, 0, NULL);
+               lilv_state_free(state);
        }
-       lilv_nodes_free(ports);
-
-       lilv_node_free(pset_value);
-       lilv_node_free(preset);
-       lilv_node_free(lv2_symbol);
-       lilv_node_free(lv2_port);
-
-       Plugin::load_preset(r);
 
-       return true;
+       lilv_node_free(pset);
+       return state;
 }
 
 const void*
@@ -932,7 +1022,6 @@ ARDOUR::lv2plugin_get_port_value(const char* port_symbol,
                                  uint32_t*   size,
                                  uint32_t*   type)
 {
-       // cerr << "get_port_value(" << port_symbol << ", ...) ... ";
        LV2Plugin *plugin = (LV2Plugin *) user_data;
 
        uint32_t index = plugin->port_index(port_symbol);
@@ -942,14 +1031,11 @@ ARDOUR::lv2plugin_get_port_value(const char* port_symbol,
                        *size = sizeof(float);
                        *type = plugin->_uri_map.uri_to_id(LV2_ATOM__Float);
                        value = &plugin->_shadow_data[index];
-                       // cerr << "index="<< index << ",*size=" << *size << ",*type=" << *type << ",*value=" << *value << endl;
 
                        return value;
                }
-               // cerr << "port is not input control port! ";
        }
 
-       // cerr << "returning NULL!" << endl;
        *size = *type = 0;
        return NULL;
 }
@@ -958,59 +1044,53 @@ ARDOUR::lv2plugin_get_port_value(const char* port_symbol,
 std::string
 LV2Plugin::do_save_preset(string name)
 {
-       // cerr << "LV2Plugin::do_save_preset(" << name << ")" << endl;
-
-       string pset_uri = uri();
-       pset_uri += "#";
-       pset_uri += name;
-
-       string save_dir = Glib::build_filename(
-               Glib::get_home_dir(), 
-               Glib::build_filename(".lv2", "presets") 
-       );
+       const string base_name = legalize_for_uri(name);
+       const string file_name = base_name + ".ttl";
+       const string bundle    = Glib::build_filename(
+               Glib::get_home_dir(),
+               Glib::build_filename(".lv2", base_name + ".lv2"));
 
        LilvState* state = lilv_state_new_from_instance(
                _impl->plugin,
                _impl->instance,
                _uri_map.urid_map(),
-               scratch_dir().c_str(),                  // file_dir
-               NULL,                                   // copy_dir
-               NULL,                                   // link_dir
-               save_dir.c_str(),                       // save_dir
-               lv2plugin_get_port_value,               // get_value
-               (void*) this,                           // user_data
-               LV2_STATE_IS_POD|LV2_STATE_IS_PORTABLE, // flags
-               _features                               // features
+               scratch_dir().c_str(),                   // file_dir
+               bundle.c_str(),                          // copy_dir
+               bundle.c_str(),                          // link_dir
+               bundle.c_str(),                          // save_dir
+               lv2plugin_get_port_value,                // get_value
+               (void*)this,                             // user_data
+               LV2_STATE_IS_POD|LV2_STATE_IS_PORTABLE,  // flags
+               _features                                // features
        );
 
        lilv_state_set_label(state, name.c_str());
        lilv_state_save(
-               _world.world,           // world
-               _uri_map.urid_map(),    // map
-               _uri_map.urid_unmap(),  // unmap
-               state,                  // state
-               pset_uri.c_str(),       // uri
-               save_dir.c_str(),       // dir
-               (name + ".ttl").c_str() // filename
-
+               _world.world,           // world
+               _uri_map.urid_map(),    // map
+               _uri_map.urid_unmap(),  // unmap
+               state,                  // state
+               NULL,                   // uri (NULL = use file URI)
+               bundle.c_str(),         // dir
+               file_name.c_str()       // filename
        );
 
        lilv_state_free(state);
-       return pset_uri;
+
+       return Glib::filename_to_uri(Glib::build_filename(bundle, file_name));
 }
 
 void
 LV2Plugin::do_remove_preset(string name)
 {
        string preset_file = Glib::build_filename(
-               Glib::get_home_dir(), 
+               Glib::get_home_dir(),
                Glib::build_filename(
                        Glib::build_filename(".lv2", "presets"),
                        name + ".ttl"
                )
        );
        unlink(preset_file.c_str());
-
 }
 
 bool
@@ -1023,25 +1103,20 @@ bool
 LV2Plugin::has_message_output() const
 {
        for (uint32_t i = 0; i < num_ports(); ++i) {
-               if ((_port_flags[i] & PORT_MESSAGE) && _port_flags[i] & PORT_OUTPUT) {
+               if ((_port_flags[i] & PORT_SEQUENCE) &&
+                   (_port_flags[i] & PORT_OUTPUT)) {
                        return true;
                }
        }
        return false;
 }
 
-uint32_t
-LV2Plugin::atom_eventTransfer() const
-{
-       return _event_transfer_type;
-}
-
-void
+bool
 LV2Plugin::write_to(RingBuffer<uint8_t>* dest,
                     uint32_t             index,
                     uint32_t             protocol,
                     uint32_t             size,
-                    uint8_t*             body)
+                    const uint8_t*       body)
 {
        const uint32_t buf_size = sizeof(UIMessage) + size;
        uint8_t        buf[buf_size];
@@ -1052,39 +1127,46 @@ LV2Plugin::write_to(RingBuffer<uint8_t>* dest,
        msg->size     = size;
        memcpy(msg + 1, body, size);
 
-       if (dest->write(buf, buf_size) != buf_size) {
-               error << "Error writing to UI=>Plugin RingBuffer" << endmsg;
-       }
+       return (dest->write(buf, buf_size) == buf_size);
 }
 
-void
-LV2Plugin::write_from_ui(uint32_t index,
-                         uint32_t protocol,
-                         uint32_t size,
-                         uint8_t* body)
+bool
+LV2Plugin::write_from_ui(uint32_t       index,
+                         uint32_t       protocol,
+                         uint32_t       size,
+                         const uint8_t* body)
 {
        if (!_from_ui) {
-               _from_ui = new RingBuffer<uint8_t>(4096);
+               _from_ui = new RingBuffer<uint8_t>(
+                       _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS);
        }
 
-       write_to(_from_ui, index, protocol, size, body);
+       if (!write_to(_from_ui, index, protocol, size, body)) {
+               error << "Error writing from UI to plugin" << endmsg;
+               return false;
+       }
+       return true;
 }
 
-void
-LV2Plugin::write_to_ui(uint32_t index,
-                       uint32_t protocol,
-                       uint32_t size,
-                       uint8_t* body)
+bool
+LV2Plugin::write_to_ui(uint32_t       index,
+                       uint32_t       protocol,
+                       uint32_t       size,
+                       const uint8_t* body)
 {
-       std::cerr << "WRITE TO UI" << std::endl;
-       write_to(_to_ui, index, protocol, size, body);
+       if (!write_to(_to_ui, index, protocol, size, body)) {
+               error << "Error writing from plugin to UI" << endmsg;
+               return false;
+       }
+       return true;
 }
 
 void
 LV2Plugin::enable_ui_emmission()
 {
        if (!_to_ui) {
-               _to_ui = new RingBuffer<uint8_t>(4096);
+               _to_ui = new RingBuffer<uint8_t>(
+                       _session.engine().raw_buffer_size(DataType::MIDI) * NBUFS);
        }
 }
 
@@ -1151,6 +1233,8 @@ LV2Plugin::set_state(const XMLNode& node, int version)
                return -1;
        }
 
+#ifndef NO_PLUGIN_STATE
+
        if (version < 3000) {
                nodes = node.children("port");
        } else {
@@ -1199,7 +1283,6 @@ LV2Plugin::set_state(const XMLNode& node, int version)
                        plugin_dir(),
                        Glib::build_filename(prop->value(), "state.ttl"));
 
-               cout << "Loading LV2 state from " << state_file << endl;
                LilvState* state = lilv_state_new_from_file(
                        _world.world, _uri_map.urid_map(), NULL, state_file.c_str());
 
@@ -1207,6 +1290,7 @@ LV2Plugin::set_state(const XMLNode& node, int version)
        }
 
        latency_compute_run();
+#endif
 
        return Plugin::set_state(node, version);
 }
@@ -1258,6 +1342,27 @@ string
 LV2Plugin::describe_parameter(Evoral::Parameter which)
 {
        if (( which.type() == PluginAutomation) && ( which.id() < parameter_count()) ) {
+
+               if (lilv_port_has_property(_impl->plugin,
+                                       lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.ext_notOnGUI)) {
+                       return X_("hidden");
+               }
+
+               if (lilv_port_has_property(_impl->plugin,
+                                       lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_freewheeling)) {
+                       return X_("hidden");
+               }
+
+               if (lilv_port_has_property(_impl->plugin,
+                                       lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_sampleRate)) {
+                       return X_("hidden");
+               }
+
+               if (lilv_port_has_property(_impl->plugin,
+                                       lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_reportsLatency)) {
+                       return X_("latency");
+               }
+
                LilvNode* name = lilv_port_get_name(_impl->plugin,
                                                    lilv_plugin_get_port_by_index(_impl->plugin, which.id()));
                string ret(lilv_node_as_string(name));
@@ -1325,6 +1430,102 @@ LV2Plugin::cleanup()
        _impl->instance = NULL;
 }
 
+void
+LV2Plugin::allocate_atom_event_buffers()
+{
+       /* reserve local scratch buffers for ATOM event-queues */
+       const LilvPlugin* p = _impl->plugin;
+
+       /* count non-MIDI atom event-ports
+        * TODO: nicely ask drobilla to make a lilv_ call for that
+        */
+       int count_atom_out = 0;
+       int count_atom_in = 0;
+       int minimumSize = 32768; // TODO use a per-port minimum-size
+       for (uint32_t i = 0; i < lilv_plugin_get_num_ports(p); ++i) {
+               const LilvPort* port  = lilv_plugin_get_port_by_index(p, i);
+               if (lilv_port_is_a(p, port, _world.atom_AtomPort)) {
+                       LilvNodes* buffer_types = lilv_port_get_value(
+                               p, port, _world.atom_bufferType);
+                       LilvNodes* atom_supports = lilv_port_get_value(
+                               p, port, _world.atom_supports);
+
+                       if (!lilv_nodes_contains(buffer_types, _world.atom_Sequence)
+                                       || !lilv_nodes_contains(atom_supports, _world.midi_MidiEvent)) {
+                               if (lilv_port_is_a(p, port, _world.lv2_InputPort)) {
+                                       count_atom_in++;
+                               }
+                               if (lilv_port_is_a(p, port, _world.lv2_OutputPort)) {
+                                       count_atom_out++;
+                               }
+                               LilvNodes* min_size_v = lilv_port_get_value(_impl->plugin, port, _world.rsz_minimumSize);
+                               LilvNode* min_size = min_size_v ? lilv_nodes_get_first(min_size_v) : NULL;
+                               if (min_size && lilv_node_is_int(min_size)) {
+                                       minimumSize = std::max(minimumSize, lilv_node_as_int(min_size));
+                               }
+                               lilv_nodes_free(min_size_v);
+                       }
+                       lilv_nodes_free(buffer_types);
+                       lilv_nodes_free(atom_supports);
+               }
+       }
+
+       DEBUG_TRACE(DEBUG::LV2, string_compose("%1 need buffers for %2 atom-in and %3 atom-out event-ports\n",
+                               name(), count_atom_in, count_atom_out));
+
+       const int total_atom_buffers = (count_atom_in + count_atom_out);
+       if (_atom_ev_buffers || total_atom_buffers == 0) {
+               return;
+       }
+
+       DEBUG_TRACE(DEBUG::LV2, string_compose("allocate %1 atom_ev_buffers\n", total_atom_buffers));
+       _atom_ev_buffers = (LV2_Evbuf**) malloc((total_atom_buffers + 1) * sizeof(LV2_Evbuf*));
+       for (int i = 0; i < total_atom_buffers; ++i ) {
+               _atom_ev_buffers[i] = lv2_evbuf_new(minimumSize, LV2_EVBUF_ATOM,
+                               LV2Plugin::urids.atom_Chunk, LV2Plugin::urids.atom_Sequence);
+       }
+       _atom_ev_buffers[total_atom_buffers] = 0;
+       return;
+}
+
+/** Write an ardour position/time/tempo/meter as an LV2 event.
+ * @return true on success.
+ */
+static bool
+write_position(LV2_Atom_Forge*     forge,
+               LV2_Evbuf*          buf,
+               const TempoMetric&  t,
+               Timecode::BBT_Time& bbt,
+               double              speed,
+               framepos_t          position,
+               framecnt_t          offset)
+{
+       uint8_t pos_buf[256];
+       lv2_atom_forge_set_buffer(forge, pos_buf, sizeof(pos_buf));
+       LV2_Atom_Forge_Frame frame;
+       lv2_atom_forge_blank(forge, &frame, 1, LV2Plugin::urids.time_Position);
+       lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_frame, 0);
+       lv2_atom_forge_long(forge, position);
+       lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_speed, 0);
+       lv2_atom_forge_float(forge, speed);
+       lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_barBeat, 0);
+       lv2_atom_forge_float(forge, bbt.beats - 1 +
+                            (bbt.ticks / Timecode::BBT_Time::ticks_per_beat));
+       lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_bar, 0);
+       lv2_atom_forge_long(forge, bbt.bars - 1);
+       lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_beatUnit, 0);
+       lv2_atom_forge_int(forge, t.meter().note_divisor());
+       lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_beatsPerBar, 0);
+       lv2_atom_forge_float(forge, t.meter().divisions_per_bar());
+       lv2_atom_forge_property_head(forge, LV2Plugin::urids.time_beatsPerMinute, 0);
+       lv2_atom_forge_float(forge, t.tempo().beats_per_minute());
+
+       LV2_Evbuf_Iterator    end  = lv2_evbuf_end(buf);
+       const LV2_Atom* const atom = (const LV2_Atom*)pos_buf;
+       return lv2_evbuf_write(&end, offset, 0, atom->type, atom->size,
+                              (const uint8_t*)(atom + 1));
+}
+
 int
 LV2Plugin::connect_and_run(BufferSet& bufs,
        ChanMapping in_map, ChanMapping out_map,
@@ -1335,32 +1536,36 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
 
        cycles_t then = get_cycles();
 
+       TempoMap&               tmap     = _session.tempo_map();
+       Metrics::const_iterator metric_i = tmap.metrics_end();
+       TempoMetric             tmetric  = tmap.metric_at(_session.transport_frame(), &metric_i);
+
        if (_freewheel_control_port) {
-               *_freewheel_control_port = _session.engine().freewheeling ();
+               *_freewheel_control_port = _session.engine().freewheeling();
        }
 
        if (_bpm_control_port) {
-               TempoMap& tmap (_session.tempo_map ());
-               Tempo tempo = tmap.tempo_at (_session.transport_frame () + offset);
-               *_bpm_control_port = tempo.beats_per_minute ();
+               *_bpm_control_port = tmetric.tempo().beats_per_minute();
        }
 
        ChanCount bufs_count;
        bufs_count.set(DataType::AUDIO, 1);
        bufs_count.set(DataType::MIDI, 1);
        BufferSet& silent_bufs  = _session.get_silent_buffers(bufs_count);
-       BufferSet& scratch_bufs = _session.get_silent_buffers(bufs_count);
+       BufferSet& scratch_bufs = _session.get_scratch_buffers(bufs_count);
        uint32_t const num_ports = parameter_count();
+       uint32_t const nil_index = std::numeric_limits<uint32_t>::max();
 
        uint32_t audio_in_index  = 0;
        uint32_t audio_out_index = 0;
        uint32_t midi_in_index   = 0;
        uint32_t midi_out_index  = 0;
-       bool valid;
+       uint32_t atom_port_index = 0;
        for (uint32_t port_index = 0; port_index < num_ports; ++port_index) {
                void*     buf   = NULL;
-               uint32_t  index = 0;
+               uint32_t  index = nil_index;
                PortFlags flags = _port_flags[port_index];
+               bool      valid = false;
                if (flags & PORT_AUDIO) {
                        if (flags & PORT_INPUT) {
                                index = in_map.get(DataType::AUDIO, audio_in_index++, &valid);
@@ -1373,24 +1578,83 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                        ? bufs.get_audio(index).data(offset)
                                        : scratch_bufs.get_audio(0).data(offset);
                        }
-               } else if (flags & (PORT_EVENT|PORT_MESSAGE)) {
+               } else if (flags & (PORT_EVENT|PORT_SEQUENCE)) {
                        /* FIXME: The checks here for bufs.count().n_midi() > index shouldn't
                           be necessary, but the mapping is illegal in some cases.  Ideally
                           that should be fixed, but this is easier...
                        */
-                       if (flags & PORT_INPUT) {
-                               index = in_map.get(DataType::MIDI, midi_in_index++, &valid);
-                               _ev_buffers[port_index] = (valid && bufs.count().n_midi() > index)
-                                       ? bufs.get_lv2_midi(true, index, flags & PORT_EVENT)
-                                       : silent_bufs.get_lv2_midi(true, 0, flags & PORT_EVENT);
-                               buf = lv2_evbuf_get_buffer(_ev_buffers[port_index]);
-                       } else {
-                               index = out_map.get(DataType::MIDI, midi_out_index++, &valid);
-                               _ev_buffers[port_index] = (valid && bufs.count().n_midi() > index)
-                                       ? bufs.get_lv2_midi(false, index, flags & PORT_EVENT)
-                                       : scratch_bufs.get_lv2_midi(false, 0, flags & PORT_EVENT);
-                               buf = lv2_evbuf_get_buffer(_ev_buffers[port_index]);
+                       if (flags & PORT_MIDI) {
+                               if (flags & PORT_INPUT) {
+                                       index = in_map.get(DataType::MIDI, midi_in_index++, &valid);
+                               } else {
+                                       index = out_map.get(DataType::MIDI, midi_out_index++, &valid);
+                               }
+                               if (valid && bufs.count().n_midi() > index) {
+                                       /* Note, ensure_lv2_bufsize() is not RT safe!
+                                        * However free()/alloc() is only called if a
+                                        * plugin requires a rsz:minimumSize buffersize
+                                        * and the existing buffer if smaller.
+                                        */
+                                       bufs.ensure_lv2_bufsize((flags & PORT_INPUT), index, _port_minimumSize[port_index]);
+                                       _ev_buffers[port_index] = bufs.get_lv2_midi(
+                                               (flags & PORT_INPUT), index, (flags & PORT_EVENT));
+                               }
+                       } else if ((flags & PORT_POSITION) && (flags & PORT_INPUT)) {
+                               lv2_evbuf_reset(_atom_ev_buffers[atom_port_index], true);
+                               _ev_buffers[port_index] = _atom_ev_buffers[atom_port_index++];
+                               valid                   = true;
+                       }
+
+                       if (valid && (flags & PORT_INPUT)) {
+                               Timecode::BBT_Time bbt;
+                               if ((flags & PORT_POSITION)) {
+                                       if (_session.transport_frame() != _next_cycle_start ||
+                                           _session.transport_speed() != _next_cycle_speed) {
+                                               // Transport has changed, write position at cycle start
+                                               tmap.bbt_time(_session.transport_frame(), bbt);
+                                               write_position(&_impl->forge, _ev_buffers[port_index],
+                                                              tmetric, bbt, _session.transport_speed(),
+                                                              _session.transport_frame(), 0);
+                                       }
+                               }
+
+                               // Get MIDI iterator range (empty range if no MIDI)
+                               MidiBuffer::iterator m = (index != nil_index)
+                                       ? bufs.get_midi(index).begin()
+                                       : silent_bufs.get_midi(0).end();
+                               MidiBuffer::iterator m_end = (index != nil_index)
+                                       ? bufs.get_midi(index).end()
+                                       : m;
+
+                               // Now merge MIDI and any transport events into the buffer
+                               const uint32_t     type = LV2Plugin::urids.midi_MidiEvent;
+                               const framepos_t   tend = _session.transport_frame() + nframes;
+                               ++metric_i;
+                               while (m != m_end || (metric_i != tmap.metrics_end() &&
+                                                     (*metric_i)->frame() < tend)) {
+                                       MetricSection* metric = (metric_i != tmap.metrics_end())
+                                               ? *metric_i : NULL;
+                                       if (m != m_end && (!metric || metric->frame() > (*m).time())) {
+                                               const Evoral::MIDIEvent<framepos_t> ev(*m, false);
+                                               LV2_Evbuf_Iterator eend = lv2_evbuf_end(_ev_buffers[port_index]);
+                                               lv2_evbuf_write(&eend, ev.time(), 0, type, ev.size(), ev.buffer());
+                                               ++m;
+                                       } else {
+                                               tmetric.set_metric(metric);
+                                               bbt = metric->start();
+                                               write_position(&_impl->forge, _ev_buffers[port_index],
+                                                              tmetric, bbt, _session.transport_speed(),
+                                                              metric->frame(),
+                                                              metric->frame() - _session.transport_frame());
+                                               ++metric_i;
+                                       }
+                               }
+                       } else if (!valid) {
+                               // Nothing we understand or care about, connect to scratch
+                               _ev_buffers[port_index] = silent_bufs.get_lv2_midi(
+                                       (flags & PORT_INPUT), 0, (flags & PORT_EVENT));
                        }
+                       buf = lv2_evbuf_get_buffer(_ev_buffers[port_index]);
                } else {
                        continue;  // Control port, leave buffer alone
                }
@@ -1411,12 +1675,14 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                error << "Error reading from UI=>Plugin RingBuffer" << endmsg;
                                break;
                        }
-                       if (msg.protocol == _event_transfer_type) {
-                               LV2_Evbuf*            buf = _ev_buffers[msg.index];
+                       if (msg.protocol == urids.atom_eventTransfer) {
+                               LV2_Evbuf*            buf  = _ev_buffers[msg.index];
                                LV2_Evbuf_Iterator    i    = lv2_evbuf_end(buf);
                                const LV2_Atom* const atom = (const LV2_Atom*)body;
-                               lv2_evbuf_write(&i, nframes, 0, atom->type, atom->size,
-                                               (const uint8_t*)LV2_ATOM_BODY(atom));
+                               if (!lv2_evbuf_write(&i, nframes, 0, atom->type, atom->size,
+                                               (const uint8_t*)(atom + 1))) {
+                                       error << "Failed to write data to LV2 event buffer\n";
+                               }
                        } else {
                                error << "Received unknown message type from UI" << endmsg;
                        }
@@ -1429,9 +1695,30 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
        midi_out_index = 0;
        for (uint32_t port_index = 0; port_index < num_ports; ++port_index) {
                PortFlags flags = _port_flags[port_index];
-
-               // Flush MIDI (write back to Ardour MIDI buffers)
-               if ((flags & PORT_OUTPUT) && (flags & (PORT_EVENT|PORT_MESSAGE))) {
+               bool      valid = false;
+
+               /* TODO ask drobilla about comment
+                * "Make Ardour event buffers generic so plugins can communicate"
+                * in libs/ardour/buffer_set.cc:310
+                *
+                * ideally the user could choose which of the following two modes
+                * to use (e.g. instrument/effect chains  MIDI OUT vs MIDI TRHU).
+                *
+                * This implementation follows the discussion on IRC Mar 16 2013 16:47 UTC
+                * 16:51 < drobilla> rgareus: [..] i.e always replace with MIDI output [of LV2 plugin] if it's there
+                * 16:52 < drobilla> rgareus: That would probably be good enough [..] to make users not complain
+                *                            for quite a while at least ;)
+                */
+               // copy output of LV2 plugin's MIDI port to Ardour MIDI buffers -- MIDI OUT
+               if ((flags & PORT_OUTPUT) && (flags & (PORT_EVENT|PORT_SEQUENCE|PORT_MIDI))) {
+                       const uint32_t buf_index = out_map.get(
+                               DataType::MIDI, midi_out_index++, &valid);
+                       if (valid) {
+                               bufs.forward_lv2_midi(_ev_buffers[port_index], buf_index);
+                       }
+               }
+               // Flush MIDI (write back to Ardour MIDI buffers) -- MIDI THRU
+               else if ((flags & PORT_OUTPUT) && (flags & (PORT_EVENT|PORT_SEQUENCE))) {
                        const uint32_t buf_index = out_map.get(
                                DataType::MIDI, midi_out_index++, &valid);
                        if (valid) {
@@ -1440,7 +1727,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                }
 
                // Write messages to UI
-               if (_to_ui && (flags & PORT_OUTPUT) && (flags & PORT_MESSAGE)) {
+               if (_to_ui && (flags & PORT_OUTPUT) && (flags & (PORT_EVENT|PORT_SEQUENCE))) {
                        LV2_Evbuf* buf = _ev_buffers[port_index];
                        for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(buf);
                             lv2_evbuf_is_valid(i);
@@ -1448,7 +1735,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                uint32_t frames, subframes, type, size;
                                uint8_t* data;
                                lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data);
-                               write_to_ui(port_index, _event_transfer_type,
+                               write_to_ui(port_index, urids.atom_eventTransfer,
                                            size + sizeof(LV2_Atom),
                                            data - sizeof(LV2_Atom));
                        }
@@ -1458,6 +1745,10 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
        cycles_t now = get_cycles();
        set_cycles((uint32_t)(now - then));
 
+       // Update expected transport information for next cycle so we can detect changes
+       _next_cycle_speed = _session.transport_speed();
+       _next_cycle_start = _session.transport_frame() + (nframes * _next_cycle_speed);
+
        return 0;
 }
 
@@ -1596,10 +1887,10 @@ LV2Plugin::latency_compute_run()
        deactivate();
 }
 
-LilvPort*
+const LilvPort*
 LV2Plugin::Impl::designated_input (const char* uri, void** bufptrs[], void** bufptr)
 {
-       LilvPort* port        = NULL;
+       const LilvPort* port = NULL;
        LilvNode* designation = lilv_new_uri(_world.world, uri);
        port = lilv_plugin_get_port_by_designation(
                plugin, _world.lv2_InputPort, designation);
@@ -1610,28 +1901,44 @@ LV2Plugin::Impl::designated_input (const char* uri, void** bufptrs[], void** buf
        return port;
 }
 
+static bool lv2_filter (const string& str, void *arg)
+{
+       /* Not a dotfile, has a prefix before a period, suffix is "lv2" */
+       
+       return str[0] != '.' && (str.length() > 3 && str.find (".lv2") == (str.length() - 4));
+}
+
+
 LV2World::LV2World()
        : world(lilv_world_new())
+       , _bundle_checked(false)
 {
        lilv_world_load_all(world);
+
        atom_AtomPort      = lilv_new_uri(world, LV2_ATOM__AtomPort);
        atom_Chunk         = lilv_new_uri(world, LV2_ATOM__Chunk);
        atom_Sequence      = lilv_new_uri(world, LV2_ATOM__Sequence);
        atom_bufferType    = lilv_new_uri(world, LV2_ATOM__bufferType);
+       atom_supports      = lilv_new_uri(world, LV2_ATOM__supports);
        atom_eventTransfer = lilv_new_uri(world, LV2_ATOM__eventTransfer);
        ev_EventPort       = lilv_new_uri(world, LILV_URI_EVENT_PORT);
        ext_logarithmic    = lilv_new_uri(world, LV2_PORT_PROPS__logarithmic);
+       ext_notOnGUI       = lilv_new_uri(world, LV2_PORT_PROPS__notOnGUI);
        lv2_AudioPort      = lilv_new_uri(world, LILV_URI_AUDIO_PORT);
        lv2_ControlPort    = lilv_new_uri(world, LILV_URI_CONTROL_PORT);
        lv2_InputPort      = lilv_new_uri(world, LILV_URI_INPUT_PORT);
        lv2_OutputPort     = lilv_new_uri(world, LILV_URI_OUTPUT_PORT);
        lv2_inPlaceBroken  = lilv_new_uri(world, LV2_CORE__inPlaceBroken);
        lv2_integer        = lilv_new_uri(world, LV2_CORE__integer);
+       lv2_reportsLatency = lilv_new_uri(world, LV2_CORE__reportsLatency);
        lv2_sampleRate     = lilv_new_uri(world, LV2_CORE__sampleRate);
        lv2_toggled        = lilv_new_uri(world, LV2_CORE__toggled);
        lv2_enumeration    = lilv_new_uri(world, LV2_CORE__enumeration);
+       lv2_freewheeling   = lilv_new_uri(world, LV2_CORE__freeWheeling);
        midi_MidiEvent     = lilv_new_uri(world, LILV_URI_MIDI_EVENT);
        rdfs_comment       = lilv_new_uri(world, LILV_NS_RDFS "comment");
+       rsz_minimumSize    = lilv_new_uri(world, LV2_RESIZE_PORT__minimumSize);
+       time_Position      = lilv_new_uri(world, LV2_TIME__Position);
        ui_GtkUI           = lilv_new_uri(world, LV2_UI__GtkUI);
        ui_external        = lilv_new_uri(world, "http://lv2plug.in/ns/extensions/ui#external");
 }
@@ -1640,17 +1947,25 @@ LV2World::~LV2World()
 {
        lilv_node_free(ui_external);
        lilv_node_free(ui_GtkUI);
+       lilv_node_free(time_Position);
+       lilv_node_free(rsz_minimumSize);
+       lilv_node_free(rdfs_comment);
        lilv_node_free(midi_MidiEvent);
+       lilv_node_free(lv2_enumeration);
+       lilv_node_free(lv2_freewheeling);
        lilv_node_free(lv2_toggled);
        lilv_node_free(lv2_sampleRate);
+       lilv_node_free(lv2_reportsLatency);
        lilv_node_free(lv2_integer);
        lilv_node_free(lv2_inPlaceBroken);
        lilv_node_free(lv2_OutputPort);
        lilv_node_free(lv2_InputPort);
        lilv_node_free(lv2_ControlPort);
        lilv_node_free(lv2_AudioPort);
+       lilv_node_free(ext_notOnGUI);
        lilv_node_free(ext_logarithmic);
        lilv_node_free(ev_EventPort);
+       lilv_node_free(atom_supports);
        lilv_node_free(atom_eventTransfer);
        lilv_node_free(atom_bufferType);
        lilv_node_free(atom_Sequence);
@@ -1658,7 +1973,32 @@ LV2World::~LV2World()
        lilv_node_free(atom_AtomPort);
 }
 
-LV2PluginInfo::LV2PluginInfo (void* c_plugin)
+void
+LV2World::load_bundled_plugins()
+{
+       if (!_bundle_checked) {
+               cout << "Scanning folders for bundled LV2s: " << ARDOUR::lv2_bundled_search_path().to_string() << endl;
+               PathScanner scanner;
+               vector<string *> *plugin_objects = scanner (ARDOUR::lv2_bundled_search_path().to_string(), lv2_filter, 0, true, true);
+               if (plugin_objects) {
+                       for ( vector<string *>::iterator x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
+#ifdef WINDOWS
+                               string uri = "file:///" + **x + "/";
+#else
+                               string uri = "file://" + **x + "/";
+#endif
+                               LilvNode *node = lilv_new_uri(world, uri.c_str());
+                               lilv_world_load_bundle(world, node);
+                               lilv_node_free(node);
+                       }
+               }
+               delete (plugin_objects);
+
+               _bundle_checked = true;
+       }
+}
+
+LV2PluginInfo::LV2PluginInfo (const void* c_plugin)
        : _c_plugin(c_plugin)
 {
        type = ARDOUR::LV2;
@@ -1674,7 +2014,7 @@ LV2PluginInfo::load(Session& session)
                PluginPtr plugin;
 
                plugin.reset(new LV2Plugin(session.engine(), session,
-                                          (LilvPlugin*)_c_plugin,
+                                          (const LilvPlugin*)_c_plugin,
                                           session.frame_rate()));
 
                plugin->set_info(PluginInfoPtr(new LV2PluginInfo(*this)));
@@ -1689,6 +2029,8 @@ LV2PluginInfo::load(Session& session)
 PluginInfoList*
 LV2PluginInfo::discover()
 {
+       _world.load_bundled_plugins();
+
        PluginInfoList*    plugs   = new PluginInfoList;
        const LilvPlugins* plugins = lilv_world_get_all_plugins(_world.world);
 
@@ -1696,11 +2038,13 @@ LV2PluginInfo::discover()
 
        LILV_FOREACH(plugins, i, plugins) {
                const LilvPlugin* p = lilv_plugins_get(plugins, i);
-               LV2PluginInfoPtr  info(new LV2PluginInfo((void*)p));
+               LV2PluginInfoPtr  info(new LV2PluginInfo((const void*)p));
 
                LilvNode* name = lilv_plugin_get_name(p);
-               if (!name) {
-                       cerr << "LV2: invalid plugin\n";
+               if (!name || !lilv_plugin_get_port_by_index(p, 0)) {
+                       warning << "Ignoring invalid LV2 plugin "
+                               << lilv_node_as_string(lilv_plugin_get_uri(p))
+                               << endmsg;
                        continue;
                }
 
@@ -1719,14 +2063,42 @@ LV2PluginInfo::discover()
 
                info->path = "/NOPATH"; // Meaningless for LV2
 
+               /* count atom-event-ports that feature
+                * atom:supports <http://lv2plug.in/ns/ext/midi#MidiEvent>
+                *
+                * TODO: nicely ask drobilla to make a lilv_ call for that
+                */
+               int count_midi_out = 0;
+               int count_midi_in = 0;
+               for (uint32_t i = 0; i < lilv_plugin_get_num_ports(p); ++i) {
+                       const LilvPort* port  = lilv_plugin_get_port_by_index(p, i);
+                       if (lilv_port_is_a(p, port, _world.atom_AtomPort)) {
+                               LilvNodes* buffer_types = lilv_port_get_value(
+                                       p, port, _world.atom_bufferType);
+                               LilvNodes* atom_supports = lilv_port_get_value(
+                                       p, port, _world.atom_supports);
+
+                               if (lilv_nodes_contains(buffer_types, _world.atom_Sequence)
+                                               && lilv_nodes_contains(atom_supports, _world.midi_MidiEvent)) {
+                                       if (lilv_port_is_a(p, port, _world.lv2_InputPort)) {
+                                               count_midi_in++;
+                                       }
+                                       if (lilv_port_is_a(p, port, _world.lv2_OutputPort)) {
+                                               count_midi_out++;
+                                       }
+                               }
+                               lilv_nodes_free(buffer_types);
+                               lilv_nodes_free(atom_supports);
+                       }
+               }
+
                info->n_inputs.set_audio(
                        lilv_plugin_get_num_ports_of_class(
                                p, _world.lv2_InputPort, _world.lv2_AudioPort, NULL));
                info->n_inputs.set_midi(
                        lilv_plugin_get_num_ports_of_class(
                                p, _world.lv2_InputPort, _world.ev_EventPort, NULL)
-                       + lilv_plugin_get_num_ports_of_class(
-                               p, _world.lv2_InputPort, _world.atom_AtomPort, NULL));
+                       + count_midi_in);
 
                info->n_outputs.set_audio(
                        lilv_plugin_get_num_ports_of_class(
@@ -1734,8 +2106,7 @@ LV2PluginInfo::discover()
                info->n_outputs.set_midi(
                        lilv_plugin_get_num_ports_of_class(
                                p, _world.lv2_OutputPort, _world.ev_EventPort, NULL)
-                       + lilv_plugin_get_num_ports_of_class(
-                               p, _world.lv2_OutputPort, _world.atom_AtomPort, NULL));
+                       + count_midi_out);
 
                info->unique_id = lilv_node_as_uri(lilv_plugin_get_uri(p));
                info->index     = 0; // Meaningless for LV2