From 72886d138d8365d3ccd68e7dc0cec9ebd6ce8533 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 16 Sep 2012 16:59:35 +0000 Subject: Support latest options and morph extensions. git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@4776 a436a847-0d15-0410-975c-d299462d15a1 --- src/jalv.c | 18 +++++++++--------- wscript | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/jalv.c b/src/jalv.c index d3eea35..f4bb680 100644 --- a/src/jalv.c +++ b/src/jalv.c @@ -950,15 +950,15 @@ main(int argc, char** argv) /* Build options array to pass to plugin */ const LV2_Options_Option options[] = { - { jalv.urids.param_sampleRate, sizeof(float), jalv.urids.atom_Float, - &jalv.sample_rate }, - { jalv.urids.bufsz_minBlockLength, sizeof(int32_t), jalv.urids.atom_Int, - &jalv.block_length }, - { jalv.urids.bufsz_maxBlockLength, sizeof(int32_t), jalv.urids.atom_Int, - &jalv.block_length }, - { jalv.urids.bufsz_sequenceSize, sizeof(int32_t), jalv.urids.atom_Int, - &jalv.midi_buf_size }, - { 0, 0, 0, NULL } + { LV2_OPTIONS_INSTANCE, 0, jalv.urids.param_sampleRate, + sizeof(float), jalv.urids.atom_Float, &jalv.sample_rate }, + { LV2_OPTIONS_INSTANCE, 0, jalv.urids.bufsz_minBlockLength, + sizeof(int32_t), jalv.urids.atom_Int, &jalv.block_length }, + { LV2_OPTIONS_INSTANCE, 0, jalv.urids.bufsz_maxBlockLength, + sizeof(int32_t), jalv.urids.atom_Int, &jalv.block_length }, + { LV2_OPTIONS_INSTANCE, 0, jalv.urids.bufsz_sequenceSize, + sizeof(int32_t), jalv.urids.atom_Int, &jalv.midi_buf_size }, + { LV2_OPTIONS_INSTANCE, 0, 0, 0, 0, NULL } }; options_feature.data = &options; diff --git a/wscript b/wscript index 16dcdb1..412e771 100644 --- a/wscript +++ b/wscript @@ -30,7 +30,7 @@ def configure(conf): autowaf.set_c99_mode(conf) autowaf.display_header('Jalv Configuration') - autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.13', uselib_store='LV2') + autowaf.check_pkg(conf, 'lv2', atleast_version='1.0.15', uselib_store='LV2') autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV', atleast_version='0.14.0', mandatory=True) autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', -- cgit v1.2.1