smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix MIDI playback while looping (ignore events with out of range time stamps gracefully in MIDI ring buffer).

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3885 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-10-08 03:21:46 +00:00
parent e394f6ab17
commit 8c8b703e7f
1 changed files with 29 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

60
libs/ardour/ardour/midi_ring_buffer.h
View file

@ -131,24 +131,27 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t
//std::cerr << "MRB read " << start << " .. " << end << " + " << offset << std::endl; //std::cerr << "MRB read " << start << " .. " << end << " + " << offset << std::endl;
while (read_space() > sizeof(EventTime) + sizeof(EventType) + sizeof(uint32_t)) { while (read_space() > sizeof(EventTime) + sizeof(EventType) + sizeof(uint32_t)) {
full_peek(sizeof(EventTime), (uint8_t*)&ev_time); full_peek(sizeof(EventTime), (uint8_t*)&ev_time);
if (ev_time > end) { if (ev_time > end) {
//std::cerr << "MRB: PAST END (" << ev_time << " : " << end << ")" << std::endl; //std::cerr << "MRB: PAST END (" << ev_time << " : " << end << ")" << std::endl;
break; break;
} else if (ev_time < start) {
//std::cerr << "MRB (start " << start << ") - Skipping event at (too early) time " << ev_time << std::endl;
break;
} }
bool success = read_prefix(&ev_time, &ev_type, &ev_size); bool success = read_prefix(&ev_time, &ev_type, &ev_size);
if (!success) { if (!success) {
//std::cerr << "MRB: READ ERROR (time/type/size)" << std::endl; std::cerr << "WARNING: error reading event prefix from MIDI ring" << std::endl;
continue; continue;
} }
uint8_t status; uint8_t status;
success = full_peek(sizeof(uint8_t), &status); success = full_peek(sizeof(uint8_t), &status);
assert(success); // If this failed, buffer is corrupt, all hope is lost assert(success); // If this failed, buffer is corrupt, all hope is lost
// Ignore event if it doesn't match channel filter // Ignore event if it doesn't match channel filter
if (is_channel_event(status) && get_channel_mode() == FilterChannels) { if (is_channel_event(status) && get_channel_mode() == FilterChannels) {
const uint8_t channel = status & 0x0F; const uint8_t channel = status & 0x0F;
@ -159,34 +162,29 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t
} }
} }
if (ev_time >= start) { //std::cerr << "MRB " << this << " - Reading event, time = "
// << ev_time << " - " << start << " => " << ev_time - start
// << ", size = " << ev_size << std::endl;
//std::cerr << "MRB " << this << " - Reading event, time = " assert(ev_time >= start);
// << ev_time << " - " << start << " => " << ev_time - start ev_time -= start;
// << ", size = " << ev_size << std::endl;
uint8_t* write_loc = dst.reserve(ev_time, ev_size);
ev_time -= start; if (write_loc == NULL) {
//std::cerr << "MRB: Unable to reserve space in buffer, event skipped";
uint8_t* write_loc = dst.reserve(ev_time, ev_size); continue;
if (write_loc == NULL) { }
//std::cerr << "MRB: Unable to reserve space in buffer, event skipped";
continue; success = Evoral::EventRingBuffer::full_read(ev_size, write_loc);
if (success) {
if (is_channel_event(status) && get_channel_mode() == ForceChannel) {
write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F);
} }
++count;
success = Evoral::EventRingBuffer::full_read(ev_size, write_loc); //std::cerr << "MRB - read event at time " << ev_time << std::endl;
if (success) {
if (is_channel_event(status) && get_channel_mode() == ForceChannel) {
write_loc[0] = (write_loc[0] & 0xF0) | (get_channel_mask() & 0x0F);
}
++count;
//std::cerr << "MRB - read event at time " << ev_time << std::endl;
} else {
//std::cerr << "MRB: READ ERROR (data)" << std::endl;
}
} else { } else {
//std::cerr << "MRB (start " << start << ") - Skipping event at (too early) time " << ev_time << std::endl; std::cerr << "WARNING: error reading event contents from MIDI ring" << std::endl;
} }
} }