aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-09-16 16:59:35 +0000
committerDavid Robillard <d@drobilla.net>2012-09-16 16:59:35 +0000
commit72886d138d8365d3ccd68e7dc0cec9ebd6ce8533 (patch)
tree6a39989c3564013ac352a028a0ef023d3bb3af1d
parent7ad79af75eee9a3e4377abb1db3ae9f71dc8af5d (diff)
downloadjalv-72886d138d8365d3ccd68e7dc0cec9ebd6ce8533.tar.gz
jalv-72886d138d8365d3ccd68e7dc0cec9ebd6ce8533.tar.bz2
jalv-72886d138d8365d3ccd68e7dc0cec9ebd6ce8533.zip
Support latest options and morph extensions.
git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@4776 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/jalv.c18
-rw-r--r--wscript2
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',