From ab5a0fbb947729ef7fade2449912fb70a075d8d3 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 29 Aug 2012 20:20:17 +0000 Subject: Update for latest options extension. git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@4761 a436a847-0d15-0410-975c-d299462d15a1 --- src/jalv.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'src/jalv.c') diff --git a/src/jalv.c b/src/jalv.c index 012c5ba..d3eea35 100644 --- a/src/jalv.c +++ b/src/jalv.c @@ -935,6 +935,7 @@ main(int argc, char** argv) jalv.midi_buf_size = 4096; fprintf(stderr, "warning: No jack_port_type_get_buffer_size.\n"); #endif + printf("Block length: %u frames\n", jalv.block_length); printf("MIDI buffers: %zu bytes\n", jalv.midi_buf_size); if (jalv.opts.buffer_size == 0) { @@ -947,22 +948,18 @@ main(int argc, char** argv) jalv.opts.buffer_size = jalv.midi_buf_size * 4; } - printf("Block length: %u frames\n", jalv.block_length); - /* Initialize options to pass to plugin */ - const LV2_Atom_Float sample_rate_option = - { { sizeof(float), jalv.urids.atom_Float }, jalv.sample_rate }; - const LV2_Atom_Int min_length_option = - { { sizeof(float), jalv.urids.atom_Int }, jalv.block_length }; - const LV2_Atom_Int max_length_option = - { { sizeof(float), jalv.urids.atom_Int }, jalv.block_length }; - const LV2_Atom_Int seq_size_option = - { { sizeof(float), jalv.urids.atom_Int }, jalv.midi_buf_size }; - LV2_Options_Option options[] = { - { jalv.urids.param_sampleRate, &sample_rate_option.atom }, - { jalv.urids.bufsz_minBlockLength, &min_length_option.atom }, - { jalv.urids.bufsz_maxBlockLength, &max_length_option.atom }, - { jalv.urids.bufsz_sequenceSize, &seq_size_option.atom }, - { 0, NULL } }; + /* 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 } + }; options_feature.data = &options; -- cgit v1.2.1