X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_model.cc;h=b5e93ae494e829a719a9b4e0a48496c5920ded1f;hb=a4935eca6dcd4e66d24fe0aee04efc4beab1a059;hp=d9f6e802cfa4609a5c9b55636c21c75b1ad3953c;hpb=a958770abd3e73d3465f914e06b45a1dca80d778;p=ardour.git

diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index d9f6e802cf..b5e93ae494 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -491,7 +491,7 @@ Evoral::Sequence<MidiModel::TimeType>::NotePtr
 MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note)
 {
 	unsigned int note;
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	unsigned int channel;
 	MidiModel::TimeType time;
 	MidiModel::TimeType length;
@@ -599,7 +599,7 @@ MidiModel::NoteDiffCommand::marshal_change (const NoteChange& change)
 MidiModel::NoteDiffCommand::NoteChange
 MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	NoteChange change;
 	change.note_id = 0;
 
@@ -876,7 +876,7 @@ MidiModel::SysExDiffCommand::marshal_change (const Change& change)
 MidiModel::SysExDiffCommand::Change
 MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
 {
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	Change change;
 
 	if ((prop = xml_change->property ("property")) != 0) {
@@ -1235,8 +1235,8 @@ MidiModel::PatchChangeDiffCommand::marshal_change (const Change& c)
 MidiModel::PatchChangePtr
 MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 {
-	XMLProperty* prop;
-	XMLProperty* prop_id;
+	XMLProperty const * prop;
+	XMLProperty const * prop_id;
 	Evoral::event_id_t id = 0;
 	Evoral::Beats time = Evoral::Beats();
 	int channel = 0;
@@ -1277,7 +1277,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
 MidiModel::PatchChangeDiffCommand::Change
 MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
 {
-	XMLProperty* prop;
+	XMLProperty const * prop;
 	Change c;
 	int an_int;
 
@@ -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;