aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-01-24 00:57:48 +0000
committerDavid Robillard <d@drobilla.net>2014-01-24 00:57:48 +0000
commit86b07163a7c40c7dfd795a34f70efe9c56014475 (patch)
tree045f167f0d657724743a107c7a773dcf05863257
parented8fafd54456dab18154c4ff9b54d0c8c9ce4a1b (diff)
downloadjalv-86b07163a7c40c7dfd795a34f70efe9c56014475.tar.gz
jalv-86b07163a7c40c7dfd795a34f70efe9c56014475.tar.bz2
jalv-86b07163a7c40c7dfd795a34f70efe9c56014475.zip
Update for latest LV2 Atom Object simplifications.
git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@5319 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/jalv.c16
-rw-r--r--src/jalv_gtk.c6
-rw-r--r--wscript2
3 files changed, 12 insertions, 12 deletions
diff --git a/src/jalv.c b/src/jalv.c
index e80f9f9..0708577 100644
--- a/src/jalv.c
+++ b/src/jalv.c
@@ -417,22 +417,22 @@ jack_process_cb(jack_nframes_t nframes, void* data)
lv2_atom_forge_set_buffer(&jalv->forge, pos_buf, sizeof(pos_buf));
LV2_Atom_Forge* forge = &jalv->forge;
LV2_Atom_Forge_Frame frame;
- lv2_atom_forge_blank(forge, &frame, 1, jalv->urids.time_Position);
- lv2_atom_forge_property_head(forge, jalv->urids.time_frame, 0);
+ lv2_atom_forge_object(forge, &frame, 0, jalv->urids.time_Position);
+ lv2_atom_forge_key(forge, jalv->urids.time_frame);
lv2_atom_forge_long(forge, pos.frame);
- lv2_atom_forge_property_head(forge, jalv->urids.time_speed, 0);
+ lv2_atom_forge_key(forge, jalv->urids.time_speed);
lv2_atom_forge_float(forge, rolling ? 1.0 : 0.0);
if (pos.valid & JackPositionBBT) {
- lv2_atom_forge_property_head(forge, jalv->urids.time_barBeat, 0);
+ lv2_atom_forge_key(forge, jalv->urids.time_barBeat);
lv2_atom_forge_float(
forge, pos.beat - 1 + (pos.tick / pos.ticks_per_beat));
- lv2_atom_forge_property_head(forge, jalv->urids.time_bar, 0);
+ lv2_atom_forge_key(forge, jalv->urids.time_bar);
lv2_atom_forge_long(forge, pos.bar - 1);
- lv2_atom_forge_property_head(forge, jalv->urids.time_beatUnit, 0);
+ lv2_atom_forge_key(forge, jalv->urids.time_beatUnit);
lv2_atom_forge_int(forge, pos.beat_type);
- lv2_atom_forge_property_head(forge, jalv->urids.time_beatsPerBar, 0);
+ lv2_atom_forge_key(forge, jalv->urids.time_beatsPerBar);
lv2_atom_forge_float(forge, pos.beats_per_bar);
- lv2_atom_forge_property_head(forge, jalv->urids.time_beatsPerMinute, 0);
+ lv2_atom_forge_key(forge, jalv->urids.time_beatsPerMinute);
lv2_atom_forge_float(forge, pos.beats_per_minute);
}
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c
index f6a104b..76d9106 100644
--- a/src/jalv_gtk.c
+++ b/src/jalv_gtk.c
@@ -405,10 +405,10 @@ file_changed(GtkFileChooserButton* widget,
uint8_t buf[1024];
lv2_atom_forge_set_buffer(&forge, buf, sizeof(buf));
- lv2_atom_forge_blank(&forge, &frame, 1, jalv->urids.patch_Set);
- lv2_atom_forge_property_head(&forge, jalv->urids.patch_property, 0);
+ lv2_atom_forge_object(&forge, &frame, 0, jalv->urids.patch_Set);
+ lv2_atom_forge_key(&forge, jalv->urids.patch_property);
lv2_atom_forge_urid(&forge, jalv->map.map(jalv, property));
- lv2_atom_forge_property_head(&forge, jalv->urids.patch_value, 0);
+ lv2_atom_forge_key(&forge, jalv->urids.patch_value);
lv2_atom_forge_path(&forge, filename, strlen(filename));
const LV2_Atom* atom = lv2_atom_forge_deref(&forge, frame.ref);
diff --git a/wscript b/wscript
index 3ea3355..20d8f24 100644
--- a/wscript
+++ b/wscript
@@ -33,7 +33,7 @@ def configure(conf):
autowaf.set_c99_mode(conf)
autowaf.display_header('Jalv Configuration')
- autowaf.check_pkg(conf, 'lv2', atleast_version='1.6.0', uselib_store='LV2')
+ autowaf.check_pkg(conf, 'lv2', atleast_version='1.8.1', uselib_store='LV2')
autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
atleast_version='0.15.1', mandatory=True)
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',