Add 'midi_scene_change' sources to ardour.vcproj

[ardour.git] / libs / ardour / lv2_evbuf.c

diff --git a/libs/ardour/lv2_evbuf.c b/libs/ardour/lv2_evbuf.c
index f3aea8d7993be516a7a4c49eaeb33e5c51b397fd..2802ab8c816fd14e9274b1b2cc585a7b13da7e8f 100644 (file)
--- a/libs/ardour/lv2_evbuf.c
+++ b/libs/ardour/lv2_evbuf.c
@@ -14,6 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -89,7 +90,7 @@ lv2_evbuf_reset(LV2_Evbuf* evbuf, bool input)
                break;
        case LV2_EVBUF_ATOM:
                if (input) {
-                       evbuf->buf.atom.atom.size = 0;
+                       evbuf->buf.atom.atom.size = sizeof(LV2_Atom_Sequence_Body);
                        evbuf->buf.atom.atom.type = evbuf->atom_Sequence;
                } else {
                        evbuf->buf.atom.atom.size = evbuf->capacity;
@@ -105,13 +106,21 @@ lv2_evbuf_get_size(LV2_Evbuf* evbuf)
        case LV2_EVBUF_EVENT:
                return evbuf->buf.event.size;
        case LV2_EVBUF_ATOM:
+               assert(evbuf->buf.atom.atom.type != evbuf->atom_Sequence
+                      || evbuf->buf.atom.atom.size >= sizeof(LV2_Atom_Sequence_Body));
                return evbuf->buf.atom.atom.type == evbuf->atom_Sequence
-                       ? evbuf->buf.atom.atom.size
+                       ? evbuf->buf.atom.atom.size - sizeof(LV2_Atom_Sequence_Body)
                        : 0;
        }
        return 0;
 }
 
+uint32_t
+lv2_evbuf_get_capacity(LV2_Evbuf* evbuf)
+{
+       return evbuf->capacity;
+}
+
 void*
 lv2_evbuf_get_buffer(LV2_Evbuf* evbuf)
 {
@@ -134,7 +143,7 @@ lv2_evbuf_begin(LV2_Evbuf* evbuf)
 LV2_Evbuf_Iterator
 lv2_evbuf_end(LV2_Evbuf* evbuf)
 {
-       const size_t             size = lv2_evbuf_get_size(evbuf);
+       const uint32_t           size = lv2_evbuf_get_size(evbuf);
        const LV2_Evbuf_Iterator iter = { evbuf, lv2_evbuf_pad_size(size) };
        return iter;
 }
@@ -194,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*)ebuf->data + iter.offset;
+               ev = (LV2_Event*)((char*)ebuf->data + iter.offset);
                *frames    = ev->frames;
                *subframes = ev->subframes;
                *type      = ev->type;
@@ -210,7 +219,7 @@ lv2_evbuf_get(LV2_Evbuf_Iterator iter,
                *subframes = 0;
                *type      = aev->body.type;
                *size      = aev->body.size;
-               *data      = LV2_ATOM_BODY(&aev->body);
+               *data      = (uint8_t*)LV2_ATOM_BODY(&aev->body);
                break;
        }
 
@@ -267,6 +276,8 @@ lv2_evbuf_write(LV2_Evbuf_Iterator* iter,
                aseq->atom.size += size;
                iter->offset    += size;
                break;
+       default:
+               return false;
        }
 
        return true;