diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-23 05:11:10 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-23 05:31:40 +0200 |
| commit | 730e09ce65860d951d0edd9b5471278125915f0a (patch) | |
| tree | 1f56e3208541994dc5e0aff55e789b233676b50e /libs/ardour/lv2_evbuf.c | |
| parent | ca48fffd72df21d7298bf00d1e73b1381d0ec0e3 (diff) | |
another round of compiler warning fixes
Diffstat (limited to 'libs/ardour/lv2_evbuf.c')
| -rw-r--r-- | libs/ardour/lv2_evbuf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/ardour/lv2_evbuf.c b/libs/ardour/lv2_evbuf.c index 2802ab8c81..ae6d869b5f 100644 --- a/libs/ardour/lv2_evbuf.c +++ b/libs/ardour/lv2_evbuf.c @@ -166,13 +166,13 @@ lv2_evbuf_next(LV2_Evbuf_Iterator iter) uint32_t size; switch (evbuf->type) { case LV2_EVBUF_EVENT: - size = ((LV2_Event*)(evbuf->buf.event.data + offset))->size; + size = ((LV2_Event*)((uintptr_t)(evbuf->buf.event.data + offset)))->size; offset += lv2_evbuf_pad_size(sizeof(LV2_Event) + size); break; case LV2_EVBUF_ATOM: - size = ((LV2_Atom_Event*) + size = ((LV2_Atom_Event*)((uintptr_t) ((char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, &evbuf->buf.atom) - + offset))->body.size; + + offset)))->body.size; offset += lv2_evbuf_pad_size(sizeof(LV2_Atom_Event) + size); break; } @@ -203,7 +203,7 @@ lv2_evbuf_get(LV2_Evbuf_Iterator iter, switch (iter.evbuf->type) { case LV2_EVBUF_EVENT: ebuf = &iter.evbuf->buf.event; - ev = (LV2_Event*)((char*)ebuf->data + iter.offset); + ev = (LV2_Event*)((uintptr_t)((char*)ebuf->data + iter.offset)); *frames = ev->frames; *subframes = ev->subframes; *type = ev->type; @@ -212,9 +212,9 @@ lv2_evbuf_get(LV2_Evbuf_Iterator iter, break; case LV2_EVBUF_ATOM: aseq = (LV2_Atom_Sequence*)&iter.evbuf->buf.atom; - aev = (LV2_Atom_Event*)( + aev = (LV2_Atom_Event*)((uintptr_t)( (char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, aseq) - + iter.offset); + + iter.offset)); *frames = aev->time.frames; *subframes = 0; *type = aev->body.type; @@ -245,7 +245,7 @@ lv2_evbuf_write(LV2_Evbuf_Iterator* iter, return false; } - ev = (LV2_Event*)(ebuf->data + iter->offset); + ev = (LV2_Event*)((uintptr_t)(ebuf->data + iter->offset)); ev->frames = frames; ev->subframes = subframes; ev->type = type; @@ -264,9 +264,9 @@ lv2_evbuf_write(LV2_Evbuf_Iterator* iter, return false; } - aev = (LV2_Atom_Event*)( + aev = (LV2_Atom_Event*)((uintptr_t)( (char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, aseq) - + iter->offset); + + iter->offset)); aev->time.frames = frames; aev->body.type = type; aev->body.size = size; |