diff options
| author | David Robillard <d@drobilla.net> | 2012-02-19 03:29:47 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-02-19 03:29:47 +0000 |
| commit | 35a3120672f78c13a58ea5c947becd5bbd362caf (patch) | |
| tree | 1615e2093bcc8c6192aacea14ee97de64de2eb9d | |
| parent | 98f78110c6663913d25a9f58f1b45a2198bdefcf (diff) | |
| download | lv2-35a3120672f78c13a58ea5c947becd5bbd362caf.tar.xz | |
Rename LV2_Atom_Object::type => LV2_Atom_Object::otype to avoid confusion with LV2_Atom::type.
| -rw-r--r-- | lv2/lv2plug.in/ns/ext/atom/atom.h | 2 | ||||
| -rw-r--r-- | plugins/eg-sampler.lv2/sampler.c | 4 | ||||
| -rw-r--r-- | plugins/eg-sampler.lv2/uris.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.h b/lv2/lv2plug.in/ns/ext/atom/atom.h index 5583ddb..a8ec72d 100644 --- a/lv2/lv2plug.in/ns/ext/atom/atom.h +++ b/lv2/lv2plug.in/ns/ext/atom/atom.h @@ -169,7 +169,7 @@ typedef struct { typedef struct { LV2_Atom atom; /**< Atom header. */ uint32_t id; /**< URID for atom:Resource, or blank ID for atom:Blank. */ - uint32_t type; /**< Type URID (same as rdf:type, for fast dispatch). */ + uint32_t otype; /**< Type URID (same as rdf:type, for fast dispatch). */ /* Contents (a series of property bodies) follow here. */ } LV2_Atom_Object; diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c index 34ea5e0..6ac5a38 100644 --- a/plugins/eg-sampler.lv2/sampler.c +++ b/plugins/eg-sampler.lv2/sampler.c @@ -341,7 +341,7 @@ run(LV2_Handle instance, } } else if (is_object_type(uris, ev->body.type)) { const LV2_Atom_Object* obj = (LV2_Atom_Object*)&ev->body; - if (obj->type == uris->msg_Set) { + if (obj->otype == uris->msg_Set) { /* Received a set message, send it to the worker thread. */ fprintf(stderr, "Queueing set message\n"); zix_ring_write(plugin->to_worker, @@ -350,7 +350,7 @@ run(LV2_Handle instance, lv2_atom_total_size(&obj->atom))); zix_sem_post(&plugin->signal); } else { - fprintf(stderr, "Unknown object type %d\n", obj->type); + fprintf(stderr, "Unknown object type %d\n", obj->otype); } } else { fprintf(stderr, "Unknown event type %d\n", ev->body.type); diff --git a/plugins/eg-sampler.lv2/uris.h b/plugins/eg-sampler.lv2/uris.h index 5ef0b9c..820b585 100644 --- a/plugins/eg-sampler.lv2/uris.h +++ b/plugins/eg-sampler.lv2/uris.h @@ -107,8 +107,8 @@ static inline const LV2_Atom* read_set_file(const SamplerURIs* uris, const LV2_Atom_Object* obj) { - if (obj->type != uris->msg_Set) { - fprintf(stderr, "Ignoring unknown message type %d\n", obj->type); + if (obj->otype != uris->msg_Set) { + fprintf(stderr, "Ignoring unknown message type %d\n", obj->otype); return NULL; } |