X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmidi_buffer.h;h=781396a598778fc6977e97c005e1840e4f2c17e5;hb=848e75aaeaa04a81883ed30bcd04abd862f9d1fd;hp=8ea5e32e81a404a09d18d1bbb010e9ee73287d9c;hpb=5a48f99f72c2e2f3ed313e00446dfdaa05dc5d56;p=ardour.git diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index 8ea5e32e81..781396a598 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -1,17 +1,17 @@ /* - Copyright (C) 2006-2009 Paul Davis - Author: Dave Robillard - + Copyright (C) 2006-2009 Paul Davis + Author: David Robillard + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -20,10 +20,10 @@ #ifndef __ardour_midi_buffer_h__ #define __ardour_midi_buffer_h__ -#include -#include -#include -#include +#include "evoral/midi_util.h" +#include "midi++/event.h" +#include "ardour/buffer.h" +#include "ardour/event_type_map.h" namespace ARDOUR { @@ -32,51 +32,75 @@ namespace ARDOUR { class MidiBuffer : public Buffer { public: - typedef nframes_t TimeType; + typedef framepos_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 (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 copy(const MidiBuffer& copy); bool push_back(const Evoral::MIDIEvent& event); - bool push_back(const jack_midi_event_t& 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); - bool merge(const MidiBuffer& a, const MidiBuffer& b); bool merge_in_place(const MidiBuffer &other); - - template - struct iterator_base { - iterator_base(BufferType& b, size_t o) : buffer(b), offset(o) {} - inline MIDIEventType operator*() const { - uint8_t* ev_start = buffer._data + offset + sizeof(TimeType); + + template + 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) { + if (&o != this) { + buffer = o.buffer; + offset = o.offset; + } + return *this; + } + + 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), - *((TimeType*)(buffer._data + offset)), + return EventType(EventTypeMap::instance().midi_event_type(*ev_start), + *((TimeType*)(buffer->_data + offset)), event_size, ev_start); } - inline iterator_base& operator++() { - uint8_t* ev_start = buffer._data + offset + sizeof(TimeType); + + inline iterator_base& 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& other) const { - return (&buffer != &other.buffer) || (offset != other.offset); + 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; + BufferType* buffer; size_t offset; }; - + typedef iterator_base< MidiBuffer, Evoral::MIDIEvent > iterator; typedef iterator_base< const MidiBuffer, const Evoral::MIDIEvent > const_iterator; @@ -86,11 +110,54 @@ public: const_iterator begin() const { return const_iterator(*this, 0); } const_iterator end() const { return const_iterator(*this, _size); } + 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); + + if (event_size < 0) { + /* unknown size, sysex: return end() */ + return end(); + } + + size_t total_data_deleted = sizeof(TimeType) + event_size; + + if (i.offset + total_data_deleted >= _size) { + _size = 0; + return end(); + } + + /* we need to avoid the temporary malloc that memmove would do, + so copy by hand. remember: this is small amounts of data ... + */ + size_t a, b; + for (a = i.offset, b = i.offset + total_data_deleted; b < _size; ++b, ++a) { + _data[a] = _data[b]; + } + + _size -= total_data_deleted; + + /* all subsequent iterators are now invalid, and the one we + * return should refer to the event we copied, which was after + * the one we just erased. + */ + + 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 >; - - size_t _size; ///< Size in bytes of used portion of _data + uint8_t* _data; ///< timestamp, event, timestamp, event, ... };