projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix mis-ordering of MIDI events when merging MidiBuffers in-place
[ardour.git]
/
libs
/
ardour
/
midi_buffer.cc
diff --git
a/libs/ardour/midi_buffer.cc
b/libs/ardour/midi_buffer.cc
index f62a3b4c39a926489535294be36c982e50903896..7138d5258911ae24aad497fc06dc0d7b411eb6b8 100644
(file)
--- 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;
}