diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-29 12:27:27 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-29 12:27:27 +0000 |
| commit | 8d2666e157a7d31f8edc3b7a8c8173a47596e519 (patch) | |
| tree | 508f8c11e7c4fd851ec77eef47bbd65c1cf73946 /libs/ardour/midi_buffer.cc | |
| parent | a9a288b6a82620f11cd693d6418c3b8eb3aa12c1 (diff) | |
temporarily revert change that might be causing an endless loop while MIDI monitoring/recording
git-svn-id: svn://localhost/ardour2/branches/3.0@10836 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 7138d52589..f62a3b4c39 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; } |