From 86b07163a7c40c7dfd795a34f70efe9c56014475 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 24 Jan 2014 00:57:48 +0000 Subject: Update for latest LV2 Atom Object simplifications. git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@5319 a436a847-0d15-0410-975c-d299462d15a1 --- src/jalv.c | 16 ++++++++-------- src/jalv_gtk.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') 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); -- cgit v1.2.1