X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_buffer.h;h=cc48e28d618fa5b8ee2446a2155b4cbdfa51f618;hb=e0a83a75;hp=0a799c41ab7d79e9166772d8e25b99a5a5defc84;hpb=658bb3ccd43658de18fbd43cd91a8e66650e27a7;p=ardour.git diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index 0a799c41ab..cc48e28d61 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -20,16 +20,20 @@ #ifndef __ardour_midi_buffer_h__ #define __ardour_midi_buffer_h__ +#include "evoral/EventSink.hpp" #include "evoral/midi_util.h" +#include "evoral/types.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 { public: typedef framepos_t TimeType; @@ -38,28 +42,38 @@ public: ~MidiBuffer(); void silence (framecnt_t nframes, framecnt_t offset = 0); - void read_from (const Buffer& src, framecnt_t nframes, framecnt_t dst_offset = 0, framecnt_t src_offset = 0); - void merge_from (const Buffer& src, framecnt_t nframes, framecnt_t dst_offset = 0, framecnt_t src_offset = 0); + void read_from (const Buffer& src, framecnt_t nframes, frameoffset_t dst_offset = 0, frameoffset_t src_offset = 0); + void merge_from (const Buffer& src, framecnt_t nframes, frameoffset_t dst_offset = 0, frameoffset_t src_offset = 0); void copy(const MidiBuffer& copy); + void copy(MidiBuffer const * const); - bool push_back(const Evoral::MIDIEvent& event); + bool push_back(const Evoral::Event& event); bool push_back(TimeType time, size_t size, const uint8_t* data); + uint8_t* reserve(TimeType time, size_t size); void resize(size_t); + size_t size() const { return _size; } + bool empty() const { return _size == 0; } + bool insert_event(const Evoral::Event& 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 - class iterator_base { + class iterator_base + { public: - iterator_base(BufferType& b, framecnt_t o) - : buffer(&b), offset(o) {} - iterator_base(const iterator_base& o) - : buffer (o.buffer), offset(o.offset) {} - - inline iterator_base operator= (const iterator_base& o) { + iterator_base(BufferType& b, framecnt_t o) + : buffer(&b), offset(o) {} + + iterator_base(const iterator_base& o) + : buffer (o.buffer), offset(o.offset) {} + + inline iterator_base operator= (const iterator_base& o) { if (&o != this) { buffer = o.buffer; offset = o.offset; @@ -71,19 +85,24 @@ public: 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); } + 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)), + return EventType(Evoral::MIDI_EVENT, + *(reinterpret_cast((uintptr_t)(buffer->_data + offset))), event_size, ev_start); } + inline TimeType * timeptr() { + return reinterpret_cast((uintptr_t)(buffer->_data + offset)); + } + inline iterator_base& operator++() { uint8_t* ev_start = buffer->_data + offset + sizeof(TimeType); int event_size = Evoral::midi_event_size(ev_start); @@ -91,18 +110,21 @@ public: offset += sizeof(TimeType) + event_size; return *this; } + inline bool operator!=(const iterator_base& other) const { return (buffer != other.buffer) || (offset != other.offset); } + inline bool operator==(const iterator_base& other) const { return (buffer == other.buffer) && (offset == other.offset); } + BufferType* buffer; size_t offset; }; - typedef iterator_base< MidiBuffer, Evoral::MIDIEvent > iterator; - typedef iterator_base< const MidiBuffer, const Evoral::MIDIEvent > const_iterator; + typedef iterator_base< MidiBuffer, Evoral::Event > iterator; + typedef iterator_base< const MidiBuffer, const Evoral::Event > const_iterator; iterator begin() { return iterator(*this, 0); } iterator end() { return iterator(*this, _size); } @@ -110,7 +132,7 @@ public: const_iterator begin() const { return const_iterator(*this, 0); } const_iterator end() const { return const_iterator(*this, _size); } - iterator erase(const iterator& i) { + iterator erase(const iterator& i) { assert (i.buffer == this); uint8_t* ev_start = _data + i.offset + sizeof (TimeType); int event_size = Evoral::midi_event_size (ev_start); @@ -122,7 +144,7 @@ public: size_t total_data_deleted = sizeof(TimeType) + event_size; - if (i.offset + total_data_deleted >= _size) { + if (i.offset + total_data_deleted > _size) { _size = 0; return end(); } @@ -145,23 +167,21 @@ public: return iterator (*this, i.offset); } - uint8_t* data() const { return _data; } - /** * returns true if the message with the second argument as its MIDI * status byte should preceed the message with the first argument as * its MIDI status byte. */ static bool second_simultaneous_midi_byte_is_first (uint8_t, uint8_t); - + private: - friend class iterator_base< MidiBuffer, Evoral::MIDIEvent >; - friend class iterator_base< const MidiBuffer, const Evoral::MIDIEvent >; + friend class iterator_base< MidiBuffer, Evoral::Event >; + friend class iterator_base< const MidiBuffer, const Evoral::Event >; uint8_t* _data; ///< timestamp, event, timestamp, event, ... + pframes_t _size; }; - } // namespace ARDOUR #endif // __ardour_midi_buffer_h__