allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

* disabled some debugging output

Browse Source 
* fixed (my) bugs in MidiRingBuffer: aborted reading on corrupted events and event does not match channel mask


git-svn-id: svn://localhost/ardour2/branches/3.0@3333 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier
2008-05-11 21:03:27 +00:00
parent ddaaff4483
commit a76e2128ef
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/midi_ring_buffer.h
View File

@@ -393,7 +393,7 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t
if(is_channel_event(first_event_byte) && (g_atomic_int_get(&_force_channel) < 0)) {
Byte channel_nr = first_event_byte & 0x0F;
if( !(g_atomic_int_get(&_channel_mask) & (1L << channel_nr)) ) {
return 0;
continue;
}
}
@@ -403,7 +403,7 @@ MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t
if(!ev.buffer()) {
std::cerr << "MidiRingBuffer::read WARNING: Skipping MIDI Event with NULL buffer pointer "
<< " and length " << int(ev.size()) << std::endl;
return 0;
continue;
}
Byte* write_loc = dst.reserve(ev.time(), ev.size());

8
libs/ardour/midi_model.cc
View File

@@ -316,14 +316,12 @@ size_t MidiModel::read(MidiRingBuffer& dst, nframes_t start, nframes_t nframes,
dst.write(_read_iter->time() + stamp_offset - negative_stamp_offset,
_read_iter->size(), _read_iter->buffer());
cerr << this << " MidiModel::read event @ " << _read_iter->time()
<< " type: " << hex << int(_read_iter->type()) << dec
//cerr << this << " MidiModel::read event @ " << _read_iter->time()
//<< " type: " << hex << int(_read_iter->type()) << dec
//<< " note: " << int(_read_iter->note())
//<< " velocity: " << int(_read_iter->velocity())
<< endl;
//<< endl;
++_read_iter;
++read_events;
}