make i18n build work ; add mackie dir back to build ; token work on amp for MIDI...

[ardour.git] / libs / ardour / ardour / midi_buffer.h

diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index 64417cae2686bfb0c8a45e08a5ac2b85e7c56bae..d5f15fb6212ba98af4a232e87d664939a88afb35 100644 (file)
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -39,6 +39,7 @@ public:
 
        void silence (nframes_t nframes, nframes_t offset = 0);
        void read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset = 0, nframes_t src_offset = 0);
+       void merge_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset = 0, nframes_t src_offset = 0);
        
        void copy(const MidiBuffer& copy);
 
@@ -63,6 +64,15 @@ public:
                                        *((TimeType*)(buffer._data + offset)),
                                        event_size, ev_start);
                }
+               inline EventType operator*() {
+                       uint8_t* ev_start = buffer._data + offset + sizeof(TimeType);
+                       int event_size = Evoral::midi_event_size(ev_start);
+                       assert(event_size >= 0);
+                       return EventType(EventTypeMap::instance().midi_event_type(*ev_start),
+                                       *((TimeType*)(buffer._data + offset)),
+                                       event_size, ev_start);
+               }
+
                inline iterator_base<BufferType, EventType>& operator++() {
                        uint8_t* ev_start = buffer._data + offset + sizeof(TimeType);
                        int event_size = Evoral::midi_event_size(ev_start);