smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 04:09:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix MIDI thru, though why this is any different from audio (monitoring) I don't know.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5837 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-21 00:53:26 +00:00
parent e1980eb495
commit 20f7592fab
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/ardour/midi_buffer.cc
View file

@ -268,16 +268,14 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
Evoral::MIDIEvent<TimeType> ev_other (*them);
size_t sz = 0;
size_t src;
ssize_t src = -1;
/* gather up total size of events that are earlier than
the event referenced by "us"
*/
src = 0;
while (them != other.end() && ev_other.time() < (*us).time()) {
if (!src) {
if (src == -1) {
src = them.offset;
}
sz += sizeof (TimeType) + ev_other.size();
@ -285,10 +283,12 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
}
if (sz) {
assert(src >= 0);
/* move existing */
memmove (_data + us.offset + sz, _data + us.offset , _size - us.offset);
memmove (_data + us.offset + sz, _data + us.offset, _size - us.offset);
/* increase _size */
_size += sz;
assert(_size <= _capacity);
/* insert new stuff */
memcpy (_data + us.offset, other._data + src, sz);
/* update iterator to our own events. this is a miserable hack */