ardour/livetrax
13
0
Fork 0
Code

fix incorrect use of MidiBuffer::reserve() and MidiBuffer::write() if channel mask discards a MIDI event (fixes #4138)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9811 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-07-08 17:50:02 +00:00
parent 67ad5fe2b7
commit 0f7e423422
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/ardour/midi_ring_buffer.cc
View File

@ -17,6 +17,7 @@
*/
#include "pbd/compose.h"
#include "pbd/error.h"
#include "ardour/debug.h"
#include "ardour/midi_ring_buffer.h"
@ -119,19 +120,6 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
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;
}
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
*/
@ -146,12 +134,26 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame
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);