#define __ardour_midi_buffer_h__
#include "evoral/midi_util.h"
+#include "evoral/EventSink.hpp"
+
#include "midi++/event.h"
+
#include "ardour/buffer.h"
-#include "ardour/event_type_map.h"
+#include "ardour/parameter_types.h"
namespace ARDOUR {
/** Buffer containing 8-bit unsigned char (MIDI) data. */
-class LIBARDOUR_API MidiBuffer : public Buffer
+class LIBARDOUR_API MidiBuffer : public Buffer, public Evoral::EventSink<framepos_t>
{
public:
typedef framepos_t TimeType;
bool insert_event(const Evoral::MIDIEvent<TimeType>& event);
bool merge_in_place(const MidiBuffer &other);
+ /** EventSink interface for non-RT use (export, bounce). */
+ uint32_t write(TimeType time, Evoral::EventType type, uint32_t size, const uint8_t* buf);
+
template<typename BufferType, typename EventType>
class iterator_base
{
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),
+ return EventType(midi_parameter_type(*ev_start),
*((TimeType*)(buffer->_data + offset)),
event_size, ev_start);
}
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),
+ return EventType(midi_parameter_type(*ev_start),
*(reinterpret_cast<TimeType*>((uintptr_t)(buffer->_data + offset))),
event_size, ev_start);
}
inline TimeType * timeptr() {
- return ((TimeType*)(buffer->_data + offset));
+ return reinterpret_cast<TimeType*>((uintptr_t)(buffer->_data + offset));
}
inline iterator_base<BufferType, EventType>& operator++() {