From f0f9e67865ff9beb323ad1acab4d0136ea08c38f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 12 Apr 2012 02:39:05 +0000 Subject: Make all atom/util.h functions start with lv2_atom. --- plugins/eg-sampler.lv2/sampler.c | 3 +-- plugins/eg-sampler.lv2/uris.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c index d279ee4..e837517 100644 --- a/plugins/eg-sampler.lv2/sampler.c +++ b/plugins/eg-sampler.lv2/sampler.c @@ -356,8 +356,7 @@ run(LV2_Handle instance, lv2_atom_forge_sequence_head(&self->forge, &self->notify_frame, 0); /* Read incoming events */ - LV2_SEQUENCE_FOREACH(self->control_port, i) { - LV2_Atom_Event* const ev = lv2_sequence_iter_get(i); + LV2_ATOM_SEQUENCE_FOREACH(self->control_port, ev) { self->frame_offset = ev->time.frames; if (ev->body.type == uris->midi_Event) { uint8_t* const data = (uint8_t* const)(ev + 1); diff --git a/plugins/eg-sampler.lv2/uris.h b/plugins/eg-sampler.lv2/uris.h index 3f080ef..f983516 100644 --- a/plugins/eg-sampler.lv2/uris.h +++ b/plugins/eg-sampler.lv2/uris.h @@ -121,7 +121,7 @@ read_set_file(const SamplerURIs* uris, /* Get body of message. */ const LV2_Atom_Object* body = NULL; - lv2_object_get(obj, uris->patch_body, &body, 0); + lv2_atom_object_get(obj, uris->patch_body, &body, 0); if (!body) { fprintf(stderr, "Malformed set message has no body.\n"); return NULL; @@ -133,7 +133,7 @@ read_set_file(const SamplerURIs* uris, /* Get file path from body. */ const LV2_Atom* file_path = NULL; - lv2_object_get(body, uris->eg_file, &file_path, 0); + lv2_atom_object_get(body, uris->eg_file, &file_path, 0); if (!file_path) { fprintf(stderr, "Ignored set message with no file PATH.\n"); return NULL; -- cgit v1.2.1