summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_model.cc
diff options
context:
space:
mode:
authorNil Geisweiller <ngeiswei@gmail.com>2015-12-05 10:14:26 +0200
committerRobin Gareus <robin@gareus.org>2015-12-22 04:52:50 +0100
commit742d1764796c51d74a1b8294e83f315f4850f452 (patch)
tree434c156c7ad6e79eaede92e93fce8ca3c5dd8fa1 /libs/ardour/midi_model.cc
parent3a6f62d238d13970c0ec26fba116005c277ffca7 (diff)
Fix overlapping resolution (see issue #177)
It assumes that a note ending at the same time of another one starting is not considered overlapping.
Diffstat (limited to 'libs/ardour/midi_model.cc')
-rw-r--r--libs/ardour/midi_model.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index d9f6e802cf..1950fbeb19 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -1665,9 +1665,9 @@ MidiModel::resolve_overlaps_unlocked (const NotePtr note, void* arg)
if ((sb > sa) && (eb <= ea)) {
overlap = OverlapInternal;
- } else if ((eb >= sa) && (eb <= ea)) {
+ } else if ((eb > sa) && (eb <= ea)) {
overlap = OverlapStart;
- } else if ((sb > sa) && (sb <= ea)) {
+ } else if ((sb > sa) && (sb < ea)) {
overlap = OverlapEnd;
} else if ((sa >= sb) && (sa <= eb) && (ea <= eb)) {
overlap = OverlapExternal;