LV2/midnam tweaks - fix race conditions
[ardour.git] / libs / ardour / lv2_plugin.cc
index 0892d86c330b61691688c6074116ace71a6634b7..b51db6548526efd1184ae173a602342d731c6c92 100644 (file)
 #include "pbd/stl_delete.h"
 #include "pbd/compose.h"
 #include "pbd/error.h"
+#include "pbd/locale_guard.h"
 #include "pbd/replace_all.h"
 #include "pbd/xml++.h"
 
+#ifdef PLATFORM_WINDOWS
+#include <shlobj.h> // CSIDL_*
+#include "pbd/windows_special_dirs.h"
+#endif
+
 #include "libardour-config.h"
 
 #include "ardour/audio_buffer.h"
@@ -71,6 +77,7 @@
 #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
 #include "lv2/lv2plug.in/ns/extensions/units/units.h"
 #include "lv2/lv2plug.in/ns/ext/patch/patch.h"
+#include "lv2/lv2plug.in/ns/ext/port-groups/port-groups.h"
 #ifdef HAVE_LV2_1_2_0
 #include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
 #include "lv2/lv2plug.in/ns/ext/options/options.h"
@@ -134,14 +141,18 @@ public:
        LilvNode* ext_causesArtifacts;
        LilvNode* ext_notAutomatic;
        LilvNode* ext_rangeSteps;
+       LilvNode* groups_group;
+       LilvNode* groups_element;
        LilvNode* lv2_AudioPort;
        LilvNode* lv2_ControlPort;
        LilvNode* lv2_InputPort;
        LilvNode* lv2_OutputPort;
+       LilvNode* lv2_designation;
        LilvNode* lv2_enumeration;
        LilvNode* lv2_freewheeling;
        LilvNode* lv2_inPlaceBroken;
        LilvNode* lv2_isSideChain;
+       LilvNode* lv2_index;
        LilvNode* lv2_integer;
        LilvNode* lv2_default;
        LilvNode* lv2_minimum;
@@ -184,6 +195,7 @@ public:
        LilvNode* auto_automation_control; // atom:supports
        LilvNode* auto_automation_controlled; // lv2:portProperty
        LilvNode* auto_automation_controller; // lv2:portProperty
+       LilvNode* inline_display_in_gui; // lv2:optionalFeature
 #endif
 
 private:
@@ -218,19 +230,36 @@ work_respond(LV2_Worker_Respond_Handle handle,
 
 #ifdef LV2_EXTENDED
 /* inline display extension */
-static void
-queue_draw (LV2_Inline_Display_Handle handle)
+void
+LV2Plugin::queue_draw (LV2_Inline_Display_Handle handle)
 {
        LV2Plugin* plugin = (LV2Plugin*)handle;
        plugin->QueueDraw(); /* EMIT SIGNAL */
 }
 
-static void
-midnam_update (LV2_Midnam_Handle handle)
+void
+LV2Plugin::midnam_update (LV2_Midnam_Handle handle)
 {
        LV2Plugin* plugin = (LV2Plugin*)handle;
+       plugin->_midnam_dirty = true;
        plugin->UpdateMidnam (); /* EMIT SIGNAL */
 }
+
+void
+LV2Plugin::bankpatch_notify (LV2_BankPatch_Handle handle, uint8_t chn, uint32_t bank, uint8_t pgm)
+{
+       LV2Plugin* plugin = (LV2Plugin*)handle;
+       if (chn > 15) {
+               return;
+       }
+       plugin->seen_bankpatch = true;
+       if (pgm > 127 || bank > 16383) {
+               plugin->_bankpatch[chn] = UINT32_MAX;
+       } else {
+               plugin->_bankpatch[chn] = (bank << 7) | pgm;
+       }
+       plugin->BankPatchChange (chn); /* EMIT SIGNAL */
+}
 #endif
 
 /* log extension */
@@ -317,6 +346,7 @@ struct LV2Plugin::Impl {
 #ifdef LV2_EXTENDED
        LV2_Inline_Display*          queue_draw;
        LV2_Midnam*                  midnam;
+       LV2_BankPatch*               bankpatch;
 #endif
 };
 
@@ -384,6 +414,7 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
        _was_activated          = false;
        _has_state_interface    = false;
        _can_write_automation   = false;
+       _inline_display_in_gui  = false;
        _max_latency            = 0;
        _current_latency        = 0;
        _impl->block_length     = _session.get_block_size();
@@ -409,7 +440,7 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
        lilv_node_free(state_uri);
        lilv_node_free(state_iface_uri);
 
-       _features    = (LV2_Feature**)calloc(13, sizeof(LV2_Feature*));
+       _features    = (LV2_Feature**)calloc(14, sizeof(LV2_Feature*));
        _features[0] = &_instance_access_feature;
        _features[1] = &_data_access_feature;
        _features[2] = &_make_path_feature;
@@ -444,6 +475,15 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
        _midnam_feature.URI  = LV2_MIDNAM__update;
        _midnam_feature.data = _impl->midnam;
        _features[n_features++]  = &_midnam_feature;
+
+       _impl->bankpatch = (LV2_BankPatch*)
+               malloc (sizeof(LV2_BankPatch));
+       _impl->bankpatch->handle = this;
+       _impl->bankpatch->notify = bankpatch_notify;
+
+       _bankpatch_feature.URI  = LV2_BANKPATCH__notify;
+       _bankpatch_feature.data = _impl->bankpatch;
+       _features[n_features++]  = &_bankpatch_feature;
 #endif
 
 #ifdef HAVE_LV2_1_2_0
@@ -477,6 +517,13 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
        _features[n_features++] = &_options_feature;
 #endif
 
+#ifdef LV2_EXTENDED
+       seen_bankpatch = false;
+       for (uint32_t chn = 0; chn < 16; ++chn) {
+               _bankpatch[chn] = UINT32_MAX;
+       }
+#endif
+
        LV2_State_Make_Path* make_path = (LV2_State_Make_Path*)malloc(
                sizeof(LV2_State_Make_Path));
        make_path->handle = this;
@@ -544,6 +591,7 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
        _midname_interface = (const LV2_Midnam_Interface*)
                extension_data (LV2_MIDNAM__interface);
        if (_midname_interface) {
+               _midnam_dirty = true;
                read_midnam ();
        }
 #endif
@@ -587,6 +635,9 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
        if (lilv_nodes_contains (optional_features, _world.auto_can_write_automatation)) {
                _can_write_automation = true;
        }
+       if (lilv_nodes_contains (optional_features, _world.inline_display_in_gui)) {
+               _inline_display_in_gui = true;
+       }
        lilv_nodes_free(optional_features);
 #endif
 
@@ -884,6 +935,7 @@ LV2Plugin::~LV2Plugin ()
 #ifdef LV2_EXTENDED
        free(_impl->queue_draw);
        free(_impl->midnam);
+       free(_impl->bankpatch);
 #endif
 
        free(_features);
@@ -956,6 +1008,11 @@ LV2Plugin::has_inline_display () {
        return _display_interface ? true : false;
 }
 
+bool
+LV2Plugin::inline_display_in_gui () {
+       return _inline_display_in_gui;
+}
+
 Plugin::Display_Image_Surface*
 LV2Plugin::render_inline_display (uint32_t w, uint32_t h) {
        if (_display_interface) {
@@ -974,7 +1031,7 @@ LV2Plugin::has_midnam () {
 bool
 LV2Plugin::read_midnam () {
        bool rv = false;
-       if (!_midname_interface) {
+       if (!_midname_interface || !_midnam_dirty) {
                return rv;
        }
        char* midnam = _midname_interface->midnam ((void*)_impl->instance->lv2_handle);
@@ -982,10 +1039,20 @@ LV2Plugin::read_midnam () {
                std::stringstream ss;
                ss << (void*)this;
                ss << unique_id();
-               MIDI::Name::MidiPatchManager::instance().remove_custom_midnam (ss.str());
-               rv = MIDI::Name::MidiPatchManager::instance().add_custom_midnam (ss.str(), midnam);
+               rv = MIDI::Name::MidiPatchManager::instance().update_custom_midnam (ss.str(), midnam);
+       }
+#ifndef NDEBUG
+       if (rv) {
+               info << string_compose(_("LV2: update midnam for plugin '%1'"), name ()) << endmsg;
+       } else {
+               warning << string_compose(_("LV2: Failed to parse midnam of plugin '%1'"), name ()) << endmsg;
+       }
+#endif
+       _midname_interface->free (midnam);
+       if (rv) {
+               UpdatedMidnam ();
+               _midnam_dirty = false;
        }
-       free (midnam);
        return rv;
 }
 
@@ -999,7 +1066,7 @@ LV2Plugin::midnam_model () {
        if (model) {
                rv = model;
        }
-       free (model);
+       _midname_interface->free (model);
        return rv;
 }
 #endif
@@ -1154,22 +1221,22 @@ LV2Plugin::get_layout (uint32_t which, UILayoutHint& h) const
 
                case  2: h.x0 = 1; h.x1 = 3; h.y0 = 2; h.y1 = 3; break; // Frequency 1
                case  3: h.x0 = 1; h.x1 = 3; h.y0 = 0; h.y1 = 1; break; // Gain 1
-               case  4: h.x0 = 2; h.x1 = 4; h.y0 = 1; h.y1 = 2; break; // Bandwidth 1
+               case  4: h.x0 = 1; h.x1 = 3; h.y0 = 1; h.y1 = 2; break; // Bandwidth 1
                case 18: h.x0 = 1; h.x1 = 4; h.y0 = 5; h.y1 = 6; break; // enable 1
 
                case  5: h.x0 = 4; h.x1 = 6; h.y0 = 2; h.y1 = 3; break; // Frequency 2
                case  6: h.x0 = 4; h.x1 = 6; h.y0 = 0; h.y1 = 1; break; // Gain 2
-               case  7: h.x0 = 5; h.x1 = 7; h.y0 = 1; h.y1 = 2; break; // Bandwidth 2
+               case  7: h.x0 = 4; h.x1 = 6; h.y0 = 1; h.y1 = 2; break; // Bandwidth 2
                case 19: h.x0 = 4; h.x1 = 7; h.y0 = 5; h.y1 = 6; break; // enable 2
 
                case  8: h.x0 = 7; h.x1 =  9; h.y0 = 2; h.y1 = 3; break; // Frequency 3
                case  9: h.x0 = 7; h.x1 =  9; h.y0 = 0; h.y1 = 1; break; // Gain 3
-               case 10: h.x0 = 8; h.x1 = 10; h.y0 = 1; h.y1 = 2; break; // Bandwidth 3
+               case 10: h.x0 = 7; h.x1 =  9; h.y0 = 1; h.y1 = 2; break; // Bandwidth 3
                case 20: h.x0 = 7; h.x1 = 10; h.y0 = 5; h.y1 = 6; break; // enable 3
 
                case 11: h.x0 = 10; h.x1 = 12; h.y0 = 2; h.y1 = 3; break; // Frequency 4
                case 12: h.x0 = 10; h.x1 = 12; h.y0 = 0; h.y1 = 1; break; // Gain 4
-               case 13: h.x0 = 11; h.x1 = 13; h.y0 = 1; h.y1 = 2; break; // Bandwidth 4
+               case 13: h.x0 = 10; h.x1 = 12; h.y0 = 1; h.y1 = 2; break; // Bandwidth 4
                case 21: h.x0 = 10; h.x1 = 13; h.y0 = 5; h.y1 = 6; break; // enable 4
 
                case 14: h.x0 = 13; h.x1 = 14; h.y0 = 2; h.y1 = 3; break; // Frequency H
@@ -1253,7 +1320,7 @@ LV2Plugin::file_dir() const
 const std::string
 LV2Plugin::state_dir(unsigned num) const
 {
-       return Glib::build_filename(plugin_dir(), string_compose("state%1", num));
+       return Glib::build_filename(plugin_dir(), string("state") + PBD::to_string (num));
 }
 
 /** Implementation of state:makePath for files created at instantiation time.
@@ -1287,26 +1354,26 @@ LV2Plugin::add_state(XMLNode* root) const
        assert(_insert_id != PBD::ID("0"));
 
        XMLNode*    child;
-       char        buf[32];
        LocaleGuard lg;
 
        for (uint32_t i = 0; i < parameter_count(); ++i) {
                if (parameter_is_input(i) && parameter_is_control(i)) {
                        child = new XMLNode("Port");
-                       child->add_property("symbol", port_symbol(i));
-                       snprintf(buf, sizeof(buf), "%+f", _shadow_data[i]);
-                       child->add_property("value", string(buf));
+                       child->set_property("symbol", port_symbol(i));
+                       child->set_property("value", _shadow_data[i]);
                        root->add_child_nocopy(*child);
                }
        }
 
        if (!_plugin_state_dir.empty()) {
-               root->add_property("template-dir", _plugin_state_dir);
+               root->set_property("template-dir", _plugin_state_dir);
        }
 
        if (_has_state_interface) {
                // Provisionally increment state version and create directory
                const std::string new_dir = state_dir(++_state_version);
+               // and keep track of it (for templates & archive)
+               unsigned int saved_state = _state_version;;
                g_mkdir_with_parents(new_dir.c_str(), 0744);
 
                LilvState* state = lilv_state_new_from_instance(
@@ -1352,9 +1419,10 @@ LV2Plugin::add_state(XMLNode* root) const
                        lilv_state_free(state);
                        PBD::remove_directory(new_dir);
                        --_state_version;
+                       saved_state = _state_version;
                }
 
-               root->add_property("state-dir", string_compose("state%1", _state_version));
+               root->set_property("state-dir", string("state") + PBD::to_string (saved_state));
        }
 }
 
@@ -1420,6 +1488,7 @@ set_port_value(const char* port_symbol,
        const uint32_t port_index = self->port_index(port_symbol);
        if (port_index != (uint32_t)-1) {
                self->set_parameter(port_index, *(const float*)value);
+               self->PresetPortSetValue (port_index, *(const float*)value); /* EMIT SIGNAL */
        }
 }
 
@@ -1479,9 +1548,28 @@ LV2Plugin::do_save_preset(string name)
        const string prefix    = legalize_for_uri(lilv_node_as_string(plug_name));
        const string base_name = legalize_for_uri(name);
        const string file_name = base_name + ".ttl";
+#ifdef PLATFORM_WINDOWS
+       /* http://lv2plug.in/pages/filesystem-hierarchy-standard.html */
+       std::string appdata = PBD::get_win_special_folder_path (CSIDL_APPDATA);
+       if (appdata.empty ()) {
+               // TODO consider a fallback location
+               return "";
+       }
+       const string bundle = Glib::build_filename (
+                       appdata, "LV2", prefix + "_" + base_name + ".lv2");
+#else
+       /* while macOS/OSX user-specific path is
+        *
+        *   $HOME/Library/Audio/Plug-Ins/LV2/
+        *
+        * liblilv's LV2 search path on all unices does include ~/.lv2/
+        * Ardour has been saving lv2 presets to ~/.lv2 for along time,
+        * so just keep them there.
+        */
        const string bundle    = Glib::build_filename(
                Glib::get_home_dir(),
                Glib::build_filename(".lv2", prefix + "_" + base_name + ".lv2"));
+#endif
 
 #ifdef HAVE_LILV_0_21_3
        /* delete reference to old preset (if any) */
@@ -1633,7 +1721,8 @@ LV2Plugin::write_from_ui(uint32_t       index,
                if (_atom_ev_buffers && _atom_ev_buffers[0]) {
                        bufsiz =  lv2_evbuf_get_capacity(_atom_ev_buffers[0]);
                }
-               rbs = max((size_t) bufsiz * 8, rbs);
+               int fact = ceilf(_session.frame_rate () / 3000.f);
+               rbs = max((size_t) bufsiz * std::max (8, fact), rbs);
                _from_ui = new RingBuffer<uint8_t>(rbs);
        }
 
@@ -1743,12 +1832,12 @@ LV2Plugin::set_property(uint32_t key, const Variant& value)
 
        // Serialize patch:Set message to set property
 #ifdef HAVE_LV2_1_10_0
-       lv2_atom_forge_object(forge, &frame, 1, _uri_map.urids.patch_Set);
+       lv2_atom_forge_object(forge, &frame, 0, _uri_map.urids.patch_Set);
        lv2_atom_forge_key(forge, _uri_map.urids.patch_property);
        lv2_atom_forge_urid(forge, key);
        lv2_atom_forge_key(forge, _uri_map.urids.patch_value);
 #else
-       lv2_atom_forge_blank(forge, &frame, 1, _uri_map.urids.patch_Set);
+       lv2_atom_forge_blank(forge, &frame, 0, _uri_map.urids.patch_Set);
        lv2_atom_forge_property_head(forge, _uri_map.urids.patch_property, 0);
        lv2_atom_forge_urid(forge, key);
        lv2_atom_forge_property_head(forge, _uri_map.urids.patch_value, 0);
@@ -1789,7 +1878,16 @@ load_parameter_descriptor_units(LilvWorld* lworld, ParameterDescriptor& desc, co
                LilvNode* render = get_value(lworld, unit, _world.units_render);
                if (render) {
                        desc.print_fmt = lilv_node_as_string(render);
-                       replace_all (desc.print_fmt, "%f", "%.2f");
+                       /* override lilv's default "%f" format */
+                       if (desc.integer_step) {
+                               replace_all (desc.print_fmt, "%f", "%.0f");
+                       } else if (desc.upper - desc.lower >= 1000) {
+                               replace_all (desc.print_fmt, "%f", "%.1f");
+                       } else if (desc.upper - desc.lower >= 100) {
+                               replace_all (desc.print_fmt, "%f", "%.2f");
+                       } else {
+                               replace_all (desc.print_fmt, "%f", "%.3f");
+                       }
                        lilv_node_free(render);
                }
        }
@@ -1810,14 +1908,26 @@ load_parameter_descriptor(LV2World&            world,
        if (label) {
                desc.label = lilv_node_as_string(label);
        }
-       if (def && lilv_node_is_float(def)) {
-               desc.normal = lilv_node_as_float(def);
+       if (def) {
+               if (lilv_node_is_float(def)) {
+                       desc.normal = lilv_node_as_float(def);
+               } else if (lilv_node_is_int(def)) {
+                       desc.normal = lilv_node_as_int(def);
+               }
        }
-       if (minimum && lilv_node_is_float(minimum)) {
-               desc.lower = lilv_node_as_float(minimum);
+       if (minimum) {
+               if (lilv_node_is_float(minimum)) {
+                       desc.lower = lilv_node_as_float(minimum);
+               } else if (lilv_node_is_int(minimum)) {
+                       desc.lower = lilv_node_as_int(minimum);
+               }
        }
-       if (maximum && lilv_node_is_float(maximum)) {
-               desc.upper = lilv_node_as_float(maximum);
+       if (maximum) {
+               if (lilv_node_is_float(maximum)) {
+                       desc.upper = lilv_node_as_float(maximum);
+               } else if (lilv_node_is_int(maximum)) {
+                       desc.upper = lilv_node_as_int(maximum);
+               }
        }
        load_parameter_descriptor_units(lworld, desc, units);
        desc.datatype      = datatype;
@@ -1885,9 +1995,9 @@ LV2Plugin::announce_property_values()
 
        // Serialize patch:Get message with no subject (implicitly plugin instance)
 #ifdef HAVE_LV2_1_10_0
-       lv2_atom_forge_object(forge, &frame, 1, _uri_map.urids.patch_Get);
+       lv2_atom_forge_object(forge, &frame, 0, _uri_map.urids.patch_Get);
 #else
-       lv2_atom_forge_blank(forge, &frame, 1, _uri_map.urids.patch_Get);
+       lv2_atom_forge_blank(forge, &frame, 0, _uri_map.urids.patch_Get);
 #endif
 
        // Write message to UI=>Plugin ring
@@ -1976,12 +2086,8 @@ int
 LV2Plugin::set_state(const XMLNode& node, int version)
 {
        XMLNodeList          nodes;
-       XMLProperty const * prop;
        XMLNodeConstIterator iter;
        XMLNode*             child;
-       const char*          sym;
-       const char*          value;
-       uint32_t             port_id;
        LocaleGuard          lg;
 
        if (node.name() != state_node_name()) {
@@ -2001,15 +2107,16 @@ LV2Plugin::set_state(const XMLNode& node, int version)
 
                child = *iter;
 
-               if ((prop = child->property("symbol")) != 0) {
-                       sym = prop->value().c_str();
-               } else {
+               std::string sym;
+               if (!child->get_property("symbol", sym)) {
                        warning << _("LV2: port has no symbol, ignored") << endmsg;
                        continue;
                }
 
                map<string, uint32_t>::iterator i = _port_indices.find(sym);
 
+               uint32_t port_id;
+
                if (i != _port_indices.end()) {
                        port_id = i->second;
                } else {
@@ -2017,31 +2124,32 @@ LV2Plugin::set_state(const XMLNode& node, int version)
                        continue;
                }
 
-               if ((prop = child->property("value")) != 0) {
-                       value = prop->value().c_str();
-               } else {
+               float val;
+               if (!child->get_property("value", val)) {
                        warning << _("LV2: port has no value, ignored") << endmsg;
                        continue;
                }
 
-               set_parameter(port_id, atof(value));
+               set_parameter(port_id, val);
        }
 
-       if ((prop = node.property("template-dir")) != 0) {
-               set_state_dir (prop->value ());
+       std::string template_dir;
+       if (node.get_property("template-dir", template_dir)) {
+               set_state_dir (template_dir);
        }
 
        _state_version = 0;
-       if ((prop = node.property("state-dir")) != 0) {
-               if (sscanf(prop->value().c_str(), "state%u", &_state_version) != 1) {
+       std::string state_dir;
+       if (node.get_property("state-dir", state_dir) != 0) {
+               if (sscanf(state_dir.c_str(), "state%u", &_state_version) != 1) {
                        error << string_compose(
                                "LV2: failed to parse state version from \"%1\"",
-                               prop->value()) << endmsg;
+                               state_dir) << endmsg;
                }
 
                std::string state_file = Glib::build_filename(
                        plugin_dir(),
-                       Glib::build_filename(prop->value(), "state.ttl"));
+                       Glib::build_filename(state_dir, "state.ttl"));
 
                LilvState* state = lilv_state_new_from_file(
                        _world.world, _uri_map.urid_map(), NULL, state_file.c_str());
@@ -2098,37 +2206,14 @@ LV2Plugin::get_parameter_descriptor(uint32_t which, ParameterDescriptor& desc) c
                desc.upper *= _session.frame_rate ();
        }
 
-       desc.min_unbound  = false; // TODO: LV2 extension required
-       desc.max_unbound  = false; // TODO: LV2 extension required
-
        desc.enumeration = lilv_port_has_property(_impl->plugin, port, _world.lv2_enumeration);
        desc.scale_points = get_scale_points(which);
 
-       desc.update_steps();
-
        if (steps) {
-               //override auto-calculated steps in update_steps()
-               float s = lilv_node_as_float (steps);
-               const float delta = desc.upper - desc.lower;
-
-               desc.step = desc.smallstep = (delta / s);
-               desc.largestep = std::min ((delta / 5.0f), 10.f * desc.smallstep);
-
-               if (desc.logarithmic) {
-                       // TODO marry AutomationControl::internal_to_interface () with
-                       // http://lv2plug.in/ns/ext/port-props/#rangeSteps
-                       desc.smallstep = desc.smallstep / logf(s);
-                       desc.step      = desc.step      / logf(s);
-                       desc.largestep = desc.largestep / logf(s);
-               } else if (desc.integer_step) {
-                       desc.smallstep = 1.0;
-                       desc.step      = std::max(1.f, rintf (desc.step));
-                       desc.largestep = std::max(1.f, rintf (desc.largestep));
-               }
-               DEBUG_TRACE(DEBUG::LV2, string_compose("parameter %1 small: %2, step: %3 largestep: %4\n",
-                                       which, desc.smallstep, desc.step, desc.largestep));
+               desc.rangesteps = lilv_node_as_float (steps);
        }
 
+       desc.update_steps();
 
        lilv_node_free(def);
        lilv_node_free(min);
@@ -2177,13 +2262,55 @@ LV2Plugin::describe_io_port (ARDOUR::DataType dt, bool input, uint32_t id) const
                return Plugin::IOPortDescription ("?");
        }
 
-       LilvNode* name = lilv_port_get_name(_impl->plugin,
-                       lilv_plugin_get_port_by_index(_impl->plugin, idx));
+       const LilvPort* pport = lilv_plugin_get_port_by_index (_impl->plugin, idx);
+
+       LilvNode* name = lilv_port_get_name(_impl->plugin, pport);
        Plugin::IOPortDescription iod (lilv_node_as_string (name));
        lilv_node_free(name);
 
-       if (lilv_port_has_property(_impl->plugin,
-                               lilv_plugin_get_port_by_index(_impl->plugin, idx), _world.lv2_isSideChain)) {
+       /* get the port's pg:group */
+       LilvNodes* groups = lilv_port_get_value (_impl->plugin, pport, _world.groups_group);
+       if (lilv_nodes_size (groups) > 0) {
+               const LilvNode* group = lilv_nodes_get_first (groups);
+               LilvNodes* grouplabel = lilv_world_find_nodes (_world.world, group, _world.rdfs_label, NULL);
+
+               /* get the name of the port-group */
+               if (lilv_nodes_size (grouplabel) > 0) {
+                       const LilvNode* grpname = lilv_nodes_get_first (grouplabel);
+                       iod.group_name = lilv_node_as_string (grpname);
+               }
+               lilv_nodes_free (grouplabel);
+
+               /* get all port designations.
+                * we're interested in e.g. lv2:designation pg:right */
+               LilvNodes* designations = lilv_port_get_value (_impl->plugin, pport, _world.lv2_designation);
+               if (lilv_nodes_size (designations) > 0) {
+                       /* get all pg:elements of the pg:group */
+                       LilvNodes* group_childs = lilv_world_find_nodes (_world.world, group, _world.groups_element, NULL);
+                       if (lilv_nodes_size (group_childs) > 0) {
+                               /* iterate over all port designations .. */
+                               LILV_FOREACH (nodes, i, designations) {
+                                       const LilvNode* designation = lilv_nodes_get (designations, i);
+                                       /* match the lv2:designation's element against the port-group's element */
+                                       LILV_FOREACH (nodes, j, group_childs) {
+                                               const LilvNode* group_element = lilv_nodes_get (group_childs, j);
+                                               LilvNodes* elem = lilv_world_find_nodes (_world.world, group_element, _world.lv2_designation, designation);
+                                               /* found it. Now look up the index (channel-number) of the pg:Element */
+                                               if (lilv_nodes_size (elem) > 0) {
+                                                       LilvNodes* idx = lilv_world_find_nodes (_world.world, lilv_nodes_get_first (elem), _world.lv2_index, NULL);
+                                                       if (lilv_node_is_int (lilv_nodes_get_first (idx))) {
+                                                               iod.group_channel = lilv_node_as_int(lilv_nodes_get_first (idx));
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+               lilv_nodes_free (groups);
+               lilv_nodes_free (designations);
+       }
+
+       if (lilv_port_has_property(_impl->plugin, pport, _world.lv2_isSideChain)) {
                iod.is_sidechain = true;
        }
        return iod;
@@ -2380,7 +2507,7 @@ write_position(LV2_Atom_Forge*     forge,
        lv2_atom_forge_set_buffer(forge, pos_buf, sizeof(pos_buf));
        LV2_Atom_Forge_Frame frame;
 #ifdef HAVE_LV2_1_10_0
-       lv2_atom_forge_object(forge, &frame, 1, urids.time_Position);
+       lv2_atom_forge_object(forge, &frame, 0, urids.time_Position);
        lv2_atom_forge_key(forge, urids.time_frame);
        lv2_atom_forge_long(forge, position);
        lv2_atom_forge_key(forge, urids.time_speed);
@@ -2441,7 +2568,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
        }
 
        if (_bpm_control_port) {
-               *_bpm_control_port = tmap.tempo_at_frame (start).beats_per_minute();
+               *_bpm_control_port = tmap.tempo_at_frame (start).note_types_per_minute();
        }
 
 #ifdef LV2_EXTENDED
@@ -2513,7 +2640,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                        if (valid && (flags & PORT_INPUT)) {
                                if ((flags & PORT_POSITION)) {
                                        Timecode::BBT_Time bbt (tmap.bbt_at_frame (start));
-                                       double bpm = tmap.tempo_at_frame (start).beats_per_minute();
+                                       double bpm = tmap.tempo_at_frame (start).note_types_per_minute();
                                        double beatpos = (bbt.bars - 1) * tmetric.meter().divisions_per_bar()
                                                       + (bbt.beats - 1)
                                                       + (bbt.ticks / Timecode::BBT_Time::ticks_per_beat);
@@ -2545,7 +2672,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                        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);
+                                               const Evoral::Event<framepos_t> ev(*m, false);
                                                if (ev.time() < nframes) {
                                                        LV2_Evbuf_Iterator eend = lv2_evbuf_end(_ev_buffers[port_index]);
                                                        lv2_evbuf_write(&eend, ev.time(), 0, type, ev.size(), ev.buffer());
@@ -2554,8 +2681,8 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                        } else {
                                                tmetric.set_metric(metric);
                                                Timecode::BBT_Time bbt;
-                                               bbt = tmap.bbt_at_pulse (metric->pulse());
-                                               double bpm = tmap.tempo_at_frame (start/*XXX*/).beats_per_minute();
+                                               bbt = tmap.bbt_at_frame (metric->frame());
+                                               double bpm = tmap.tempo_at_frame (start/*XXX*/).note_types_per_minute();
                                                write_position(&_impl->forge, _ev_buffers[port_index],
                                                               tmetric, bbt, speed, bpm,
                                                               metric->frame(),
@@ -2758,7 +2885,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                                                AutomationCtrlPtr c = get_automation_control (p);
                                                                DEBUG_TRACE(DEBUG::LV2Automate, string_compose ("End Touch p: %1\n", p));
                                                                if (c) {
-                                                                       c->ac->stop_touch (true, std::max ((framepos_t)0, start - _current_latency));
+                                                                       c->ac->stop_touch (std::max ((framepos_t)0, start - _current_latency));
                                                                }
                                                        }
                                                }
@@ -2771,7 +2898,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                                        if (atom->type == _uri_map.urids.atom_Blank ||
                                            atom->type == _uri_map.urids.atom_Object) {
                                                LV2_Atom_Object* obj = (LV2_Atom_Object*)atom;
-                                               if (obj->body.otype == _uri_map.urids.state_Changed) {
+                                               if (obj->body.otype == _uri_map.urids.state_StateChanged) {
                                                        _session.set_dirty ();
                                                }
                                        }
@@ -2828,7 +2955,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
                 * so it needs to be realative to that.
                 */
                TempoMetric t = tmap.metric_at(start);
-               _current_bpm = tmap.tempo_at_frame (start).beats_per_minute();
+               _current_bpm = tmap.tempo_at_frame (start).note_types_per_minute();
                Timecode::BBT_Time bbt (tmap.bbt_at_frame (start));
                double beatpos = (bbt.bars - 1) * t.meter().divisions_per_bar()
                               + (bbt.beats - 1)
@@ -3062,12 +3189,15 @@ LV2World::LV2World()
        ext_causesArtifacts= lilv_new_uri(world, LV2_PORT_PROPS__causesArtifacts);
        ext_notAutomatic   = lilv_new_uri(world, LV2_PORT_PROPS__notAutomatic);
        ext_rangeSteps     = lilv_new_uri(world, LV2_PORT_PROPS__rangeSteps);
+       groups_group       = lilv_new_uri(world, LV2_PORT_GROUPS__group);
+       groups_element     = lilv_new_uri(world, LV2_PORT_GROUPS__element);
        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_isSideChain    = lilv_new_uri(world, LV2_CORE_PREFIX "isSideChain");
+       lv2_index          = lilv_new_uri(world, LV2_CORE__index);
        lv2_integer        = lilv_new_uri(world, LV2_CORE__integer);
        lv2_default        = lilv_new_uri(world, LV2_CORE__default);
        lv2_minimum        = lilv_new_uri(world, LV2_CORE__minimum);
@@ -3075,6 +3205,7 @@ LV2World::LV2World()
        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_designation    = lilv_new_uri(world, LV2_CORE__designation);
        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);
@@ -3099,6 +3230,7 @@ LV2World::LV2World()
        auto_automation_control     = lilv_new_uri(world, LV2_AUTOMATE_URI__control);
        auto_automation_controlled  = lilv_new_uri(world, LV2_AUTOMATE_URI__controlled);
        auto_automation_controller  = lilv_new_uri(world, LV2_AUTOMATE_URI__controller);
+       inline_display_in_gui       = lilv_new_uri(world, LV2_INLINEDISPLAY__in_gui);
 #endif
 #ifdef HAVE_LV2_1_2_0
        bufz_powerOf2BlockLength = lilv_new_uri(world, LV2_BUF_SIZE__powerOf2BlockLength);
@@ -3143,11 +3275,13 @@ LV2World::~LV2World()
        lilv_node_free(rdfs_label);
        lilv_node_free(rdfs_range);
        lilv_node_free(midi_MidiEvent);
+       lilv_node_free(lv2_designation);
        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_index);
        lilv_node_free(lv2_integer);
        lilv_node_free(lv2_isSideChain);
        lilv_node_free(lv2_inPlaceBroken);
@@ -3155,6 +3289,8 @@ LV2World::~LV2World()
        lilv_node_free(lv2_InputPort);
        lilv_node_free(lv2_ControlPort);
        lilv_node_free(lv2_AudioPort);
+       lilv_node_free(groups_group);
+       lilv_node_free(groups_element);
        lilv_node_free(ext_rangeSteps);
        lilv_node_free(ext_notAutomatic);
        lilv_node_free(ext_causesArtifacts);
@@ -3278,10 +3414,7 @@ LV2PluginInfo::in_category (const std::string &c) const
 {
        // TODO use untranslated lilv_plugin_get_class()
        // match gtk2_ardour/plugin_selector.cc
-       if (category == c) {
-               return true;
-       }
-       return false;
+       return category == c;
 }
 
 bool