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 f90cbfd8e35e82ad2c3774083c47a3d7002ea96e..d5f15fb6212ba98af4a232e87d664939a88afb35 100644 (file)
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -20,10 +20,10 @@
 #ifndef __ardour_midi_buffer_h__
 #define __ardour_midi_buffer_h__
 
-#include <evoral/midi_util.h>
-#include <midi++/event.h>
-#include <ardour/buffer.h>
-#include <ardour/event_type_map.h>
+#include "evoral/midi_util.h"
+#include "midi++/event.h"
+#include "ardour/buffer.h"
+#include "ardour/event_type_map.h"
 
 namespace ARDOUR {
 
@@ -32,45 +32,55 @@ namespace ARDOUR {
 class MidiBuffer : public Buffer
 {
 public:
-       typedef double TimeType;
+       typedef nframes_t TimeType;
 
        MidiBuffer(size_t capacity);
        ~MidiBuffer();
 
-       void silence(nframes_t dur, nframes_t offset=0);
-       
-       void read_from(const Buffer& src, nframes_t nframes, nframes_t offset);
+       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);
 
        bool     push_back(const Evoral::MIDIEvent<TimeType>& event);
        bool     push_back(const jack_midi_event_t& event);
-       uint8_t* reserve(double time, size_t size);
+       bool     push_back(TimeType time, size_t size, const uint8_t* data);
+       uint8_t* reserve(TimeType time, size_t size);
 
        void resize(size_t);
 
        bool merge(const MidiBuffer& a, const MidiBuffer& b);
        bool merge_in_place(const MidiBuffer &other);
        
-       template<typename BufferType, typename MIDIEventType>
+       template<typename BufferType, typename EventType>
        struct iterator_base {
-               iterator_base<BufferType, MIDIEventType>(BufferType& b, size_t o) : buffer(b), offset(o) {}
-               inline MIDIEventType operator*() const {
+           iterator_base<BufferType, EventType>(BufferType& b, nframes_t o) : buffer(b), offset(o) {}
+               inline EventType operator*() const {
+                       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 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 MIDIEventType(EventTypeMap::instance().midi_event_type(*ev_start),
+                       return EventType(EventTypeMap::instance().midi_event_type(*ev_start),
                                        *((TimeType*)(buffer._data + offset)),
                                        event_size, ev_start);
                }
-               inline iterator_base<BufferType, MIDIEventType>& operator++() {
+
+               inline iterator_base<BufferType, EventType>& operator++() {
                        uint8_t* ev_start = buffer._data + offset + sizeof(TimeType);
                        int event_size = Evoral::midi_event_size(ev_start);
                        assert(event_size >= 0);
                        offset += sizeof(TimeType) + event_size;
                        return *this;
                }
-               inline bool operator!=(const iterator_base<BufferType, MIDIEventType>& other) const {
+               inline bool operator!=(const iterator_base<BufferType, EventType>& other) const {
                        return (&buffer != &other.buffer) || (offset != other.offset);
                }
                BufferType&     buffer;
@@ -90,7 +100,6 @@ private:
        friend class iterator_base< MidiBuffer, Evoral::MIDIEvent<TimeType> >;
        friend class iterator_base< const MidiBuffer, const Evoral::MIDIEvent<TimeType> >;
        
-       size_t   _size; ///< Size in bytes of used portion of _data
        uint8_t* _data; ///< timestamp, event, timestamp, event, ...
 };