diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-22 20:29:12 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-22 20:29:12 +0000 |
| commit | b27200688b1520fbcba7e6e5b555ae95f1fc4bf1 (patch) | |
| tree | af31320ad06c2a3b6956123dca7481c69967f75f /libs/ardour/midi_buffer.cc | |
| parent | d1cfe482a86f3b6b1e0b26310cc2ece3f177e4a4 (diff) | |
fix mis-ordering of MIDI events when merging MidiBuffers in-place
git-svn-id: svn://localhost/ardour2/branches/3.0@10779 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_buffer.cc')
| -rw-r--r-- | libs/ardour/midi_buffer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index f62a3b4c39..7138d52589 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -318,7 +318,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other) the event referenced by "us" */ - while (them != other.end() && (*them).time() <= (*us).time()) { + while (them != other.end() && (*them).time() < (*us).time()) { if (src == -1) { src = them.offset; } |