Support latest options extension.

git-svn-id: svn://localhost/ardour2/branches/3.0@13191 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 24e9653a1d10b91ab67ae37cb0c8f182f470c1e1..c7d363e512948bd07f81cdf3320c4a7227f9ee44 100644 (file)
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -298,13 +298,13 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 #ifdef HAVE_NEW_LV2
        LV2_URID atom_Int = _uri_map.uri_to_id(LV2_ATOM__Int);
        LV2_Options_Option options[] = {
-               { _uri_map.uri_to_id(LV2_BUF_SIZE__minBlockLength),
+               { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__minBlockLength),
                  sizeof(int32_t), atom_Int, &_block_length },
-               { _uri_map.uri_to_id(LV2_BUF_SIZE__maxBlockLength),
+               { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__maxBlockLength),
                  sizeof(int32_t), atom_Int, &_block_length },
-               { _uri_map.uri_to_id(LV2_BUF_SIZE__sequenceSize),
+               { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__sequenceSize),
                  sizeof(int32_t), atom_Int, &_seq_size },
-               { 0, 0, 0, NULL }
+               { LV2_OPTIONS_INSTANCE, 0, 0, 0, 0, NULL }
        };
 
        _options_feature.URI    = LV2_OPTIONS__options;

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index e01de3e764accb71438f29efe042571c23dc1631..fd572c6a2efd17cc979adb3a2f7780cbc5707444 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -259,7 +259,7 @@ def configure(conf):
         autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
                           atleast_version='1.0.0', mandatory=True)
         autowaf.check_pkg(conf, 'lv2', uselib_store='NEW_LV2',
-                          atleast_version='1.0.13', mandatory=False)
+                          atleast_version='1.0.15', mandatory=False)
         autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
                           atleast_version='0.14.0', mandatory=True)
         autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',