From 64ee11103444b93dedb09b3d5367e6cf30643d89 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 26 Mar 2012 20:06:46 +0000 Subject: [PATCH] Update LV2 special port stuff for latest LV2/Lilv. git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@11761 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 2 +- libs/ardour/lv2_plugin.cc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 75f341c741..8a15a0bb1b 100644 --- a/SConstruct +++ b/SConstruct @@ -559,7 +559,7 @@ if env['LV2']: libraries['lilv'] = LibraryInfo() libraries['lilv'].ParseConfig('pkg-config --cflags --libs lilv-0') env.Append (CCFLAGS="-DHAVE_LV2") - if conf.CheckPKGVersion('lilv-0', '0.10.0'): + if conf.CheckPKGVersion('lilv-0', '0.14.0'): env.Append (CCFLAGS="-DHAVE_NEW_LILV") else: diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 2bc6a41b4c..612a5e396d 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -649,9 +649,10 @@ LV2Plugin::parameter_input (const char* uri, void** bufptrs[], void** bufptr) { LilvPort* port = NULL; #ifdef HAVE_NEW_LILV - LilvNode* param = lilv_new_uri(_world.world, uri); - port = lilv_plugin_get_port_by_parameter(_plugin, _world.input_class, param); - lilv_node_free(param); + LilvNode* designation = lilv_new_uri(_world.world, uri); + port = lilv_plugin_get_port_by_designation( + _plugin, _world.input_class, designation); + lilv_node_free(designation); if (port) { bufptrs[lilv_port_get_index(_plugin, port)] = bufptr; }