summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/lv2_plugin.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-27 23:05:45 +0000
committerDavid Robillard <d@drobilla.net>2012-05-27 23:05:45 +0000
commit3696f98e6f1ac44f8ebfe975405cf82f6d0f8a72 (patch)
treef9730df592b31d3660aecf7639643921f6c315a1 /libs/ardour/ardour/lv2_plugin.h
parent0b210042525b216acbbef2d10be99ffe5600c7c1 (diff)
Re-implement URIMap to tolerate broken plugins that use the wrong context to
map MIDI event types (fix #4889). All uri-map contexts are now just ignored, and equivalent to urid (which is equivalent to uri-map with context NULL). We now just hope that no event types are mapped after UINT16_MAX URIs have been mapped, and die horribly otherwise. This is exceedingly unlikely to happen any time in the next several years, if ever. git-svn-id: svn://localhost/ardour2/branches/3.0@12462 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/lv2_plugin.h')
-rw-r--r--libs/ardour/ardour/lv2_plugin.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index a4de7c4ae1..27e002ca66 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -104,10 +104,7 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
boost::shared_ptr<Plugin::ScalePoints>
get_scale_points(uint32_t port_index) const;
- /// Return the URID of midi:MidiEvent
- static uint32_t midi_event_type (bool event_api) {
- return event_api ? _midi_event_type_ev : _midi_event_type;
- }
+ static uint32_t midi_event_type() { return _midi_event_type; }
void set_insert_info(const PluginInsert* insert);
@@ -140,7 +137,6 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
static URIMap _uri_map;
- static uint32_t _midi_event_type_ev;
static uint32_t _midi_event_type;
static uint32_t _chunk_type;
static uint32_t _sequence_type;