diff options
| author | David Robillard <d@drobilla.net> | 2012-02-23 02:32:44 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-02-23 02:32:44 +0000 |
| commit | c921a5bec946005c30b010d160b866c0751b5f8f (patch) | |
| tree | 8128921df901fd86e2166bf32b110aaa9ca31ee4 /src | |
| parent | 457c9d03595cc4726c3b0ed6daf5c1de312a248f (diff) | |
| download | jalv-c921a5bec946005c30b010d160b866c0751b5f8f.tar.gz jalv-c921a5bec946005c30b010d160b866c0751b5f8f.tar.bz2 jalv-c921a5bec946005c30b010d160b866c0751b5f8f.zip | |
Update for latest Atom extension.
git-svn-id: http://svn.drobilla.net/lad/trunk/jalv@3993 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/atom_rdf.c | 2 | ||||
| -rw-r--r-- | src/lv2_evbuf.c | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/atom_rdf.c b/src/atom_rdf.c index ad73eac..3db4cd3 100644 --- a/src/atom_rdf.c +++ b/src/atom_rdf.c @@ -90,7 +90,7 @@ atom_to_rdf(SerdWriter* writer, USTR(val ? "true" : "false")); } else if (!strcmp(type, LV2_ATOM__Blank)) { const LV2_Atom_Object* obj = (const LV2_Atom_Object*)atom; - SerdNode idnum = serd_node_new_integer(obj->id); + SerdNode idnum = serd_node_new_integer(obj->body.id); SerdNode id = serd_node_from_string(SERD_BLANK, idnum.buf); serd_writer_write_statement( writer, flags|SERD_ANON_O_BEGIN, NULL, diff --git a/src/lv2_evbuf.c b/src/lv2_evbuf.c index 96c077f..0a2fd31 100644 --- a/src/lv2_evbuf.c +++ b/src/lv2_evbuf.c @@ -188,8 +188,8 @@ lv2_evbuf_get(LV2_Evbuf_Iterator iter, aev = (LV2_Atom_Event*)( (char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, abuf->data) + iter.offset); - *frames = aev->time.audio.frames; - *subframes = aev->time.audio.subframes; + *frames = aev->time.frames; + *subframes = 0; *type = aev->body.type; *size = aev->body.size; *data = LV2_ATOM_BODY(&aev->body); @@ -239,10 +239,9 @@ lv2_evbuf_write(LV2_Evbuf_Iterator* iter, aev = (LV2_Atom_Event*)( (char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, abuf->data) + iter->offset); - aev->time.audio.frames = frames; - aev->time.audio.subframes = subframes; - aev->body.type = type; - aev->body.size = size; + aev->time.frames = frames; + aev->body.type = type; + aev->body.size = size; memcpy(LV2_ATOM_BODY(&aev->body), data, size); size = lv2_evbuf_pad_size(sizeof(LV2_Atom_Event) + size); |