X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_ring_buffer.cc;h=db3a4cb1090f8c414503d9a673d7c1e4643aee13;hb=07112b55e0bb7ceb9e5c05ab4df167ecaf7edd9b;hp=824d3bad8436f829a567d0ae738c01256bea783f;hpb=0a9f5423f5b3faede68fe7c384c5fe32db2e23bf;p=ardour.git diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc index 824d3bad84..db3a4cb109 100644 --- a/libs/ardour/midi_ring_buffer.cc +++ b/libs/ardour/midi_ring_buffer.cc @@ -17,6 +17,7 @@ */ #include "pbd/compose.h" +#include "pbd/error.h" #include "ardour/debug.h" #include "ardour/midi_ring_buffer.h" @@ -24,9 +25,10 @@ #include "ardour/event_type_map.h" using namespace std; -using namespace ARDOUR; using namespace PBD; +namespace ARDOUR { + /** Read a block of MIDI events from this buffer into a MidiBuffer. * * Timestamps of events returned are relative to start (i.e. event with stamp 0 @@ -41,120 +43,70 @@ MidiRingBuffer::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame } T ev_time; - Evoral::EventType ev_type; uint32_t ev_size; - - /* If we see the end of a loop during this read, we must write the events after it - to the MidiBuffer with adjusted times. The situation is as follows: - - session frames-----------------------------> - - | | | - start_of_loop start end_of_loop - - The MidiDiskstream::read method which will have happened before this checks for - loops ending, and helpfully inserts a magic LoopEvent into the ringbuffer. After this, - the MidiDiskstream continues to write events with their proper session frame times, - so after the LoopEvent event times will go backwards (ie non-monotonically). - - Once we hit end_of_loop, we need to fake it to make it look as though the loop has been - immediately repeated. Say that an event E after the end_of_loop in the ringbuffer - has time E_t, which is a time in session frames. Its offset from the start - of the loop will be E_t - start_of_loop. Its `faked' time will therefore be - end_of_loop + E_t - start_of_loop. And so its port-buffer-relative time (for - writing to the MidiBuffer) will be end_of_loop + E_t - start_of_loop - start. - - The subtraction of start is already taken care of, so if we see a LoopEvent, we'll - set up loop_offset to equal end_of_loop - start_of_loop, so that given an event - time E_t in the ringbuffer we can get the port-buffer-relative time as - E_t + offset - start. - */ - - frameoffset_t loop_offset = 0; - - size_t count = 0; - - const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t); + size_t count = 0; + const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t); while (this->read_space() >= prefix_size) { uint8_t peekbuf[prefix_size]; - bool success; - success = this->peek (peekbuf, prefix_size); /* this cannot fail, because we've already verified that there is prefix_space to read */ - assert (success); + this->peek (peekbuf, prefix_size); ev_time = *((T*) peekbuf); - ev_type = *((Evoral::EventType*)(peekbuf + sizeof (T))); ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType))); - if (ev_time + loop_offset >= end) { + if (ev_time >= end) { DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 past end @ %2\n", ev_time, end)); break; - } else if (ev_time + loop_offset < start) { + } else if (ev_time < start) { DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 before start @ %2\n", ev_time, start)); break; } else { DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB event @ %1 in range %2 .. %3\n", ev_time, start, end)); } - - /* lets see if we are going to be able to write this event into dst. - */ - assert(ev_time >= start); - ev_time -= start; ev_time += offset; - // write the timestamp to address (write_loc - 1) - uint8_t* write_loc = dst.reserve(ev_time, ev_size); - if (write_loc == NULL) { - if (stop_on_overflow_in_dst) { - DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count)); - break; - } - cerr << "MRB: Unable to reserve space in buffer, event skipped"; - this->increment_read_ptr (prefix_size + ev_size); // Advance read pointer to next event - continue; - } - /* we're good to go ahead and read the data now but since we * have the prefix data already, just skip over that */ - this->increment_read_ptr (prefix_size); - // This event marks a loop end (i.e. the next event's timestamp will be non-monotonic) - if (ev_type == LoopEventType) { - assert (ev_size == sizeof (framepos_t)); - framepos_t loop_start; - read_contents (ev_size, (uint8_t *) &loop_start); - - loop_offset = ev_time - loop_start; - continue; - } - - ev_time += loop_offset; - uint8_t status; - success = this->peek (&status, sizeof(uint8_t)); - assert(success); // If this failed, buffer is corrupt, all hope is lost + bool r = this->peek (&status, sizeof(uint8_t)); + assert (r); // If this failed, buffer is corrupt, all hope is lost // Ignore event if it doesn't match channel filter if (is_channel_event(status) && get_channel_mode() == FilterChannels) { const uint8_t channel = status & 0x0F; if (!(get_channel_mask() & (1L << channel))) { - // cerr << "MRB skipping event due to channel mask" << endl; + DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MRB skipping event (%3 bytes) due to channel mask (mask = %1 chn = %2)\n", + get_channel_mask(), (int) channel, ev_size)); this->increment_read_ptr (ev_size); // Advance read pointer to next event continue; } } + /* lets see if we are going to be able to write this event into dst. + */ + uint8_t* write_loc = dst.reserve (ev_time, ev_size); + if (write_loc == 0) { + if (stop_on_overflow_in_dst) { + DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("MidiRingBuffer: overflow in destination MIDI buffer, stopped after %1 events\n", count)); + break; + } + error << "MRB: Unable to reserve space in buffer, event skipped" << endmsg; + this->increment_read_ptr (ev_size); // Advance read pointer to next event + continue; + } + // write MIDI buffer contents - success = read_contents (ev_size, write_loc); + bool success = read_contents (ev_size, write_loc); #ifndef NDEBUG if (DEBUG::MidiDiskstreamIO && PBD::debug_bits) { @@ -172,6 +124,13 @@ MidiRingBuffer::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame #endif if (success) { + + if (is_note_on(write_loc[0]) ) { + _tracker.add (write_loc[1], write_loc[0] & 0xf); + } else if (is_note_off(write_loc[0])) { + _tracker.remove (write_loc[1], write_loc[0] & 0xf); + } + if (is_channel_event(status) && get_channel_mode() == ForceChannel) { write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F); } @@ -184,6 +143,36 @@ MidiRingBuffer::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame return count; } +template +void +MidiRingBuffer::flush (framepos_t /*start*/, framepos_t end) +{ + const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t); + + while (this->read_space() >= prefix_size) { + uint8_t peekbuf[prefix_size]; + bool success; + uint32_t ev_size; + T ev_time; + + success = this->peek (peekbuf, prefix_size); + /* this cannot fail, because we've already verified that there + is prefix_space to read + */ + assert (success); + + ev_time = *((T*) peekbuf); + + if (ev_time >= end) { + break; + } + + ev_size = *((uint32_t*)(peekbuf + sizeof(T) + sizeof (Evoral::EventType))); + this->increment_read_ptr (prefix_size); + this->increment_read_ptr (ev_size); + } +} + template void MidiRingBuffer::dump(ostream& str) @@ -206,8 +195,8 @@ MidiRingBuffer::dump(ostream& str) return; } - str << this << ": Dump size = " << vec.len[0] + vec.len[1] - << " r@ " << RingBufferNPT::get_read_ptr() + str << this << ": Dump size = " << vec.len[0] + vec.len[1] + << " r@ " << RingBufferNPT::get_read_ptr() << " w@" << RingBufferNPT::get_write_ptr() << endl; @@ -222,7 +211,7 @@ MidiRingBuffer::dump(ostream& str) const uint8_t* end = buf + vec.len[0] + vec.len[1]; while (data < end) { - + memcpy (&ev_time, data, sizeof (T)); data += sizeof (T); str << "\ttime " << ev_time; @@ -262,5 +251,20 @@ MidiRingBuffer::dump(ostream& str) delete [] buf; } +template +void +MidiRingBuffer::reset_tracker () +{ + _tracker.reset (); +} + +template +void +MidiRingBuffer::loop_resolve (MidiBuffer& dst, framepos_t t) +{ + _tracker.resolve_notes (dst, t); +} + template class MidiRingBuffer; +} // namespace ARDOUR