forward port 2.X changes up to and including rev 6714

git-svn-id: svn://localhost/ardour2/branches/3.0@7635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-16 19:58:34 +00:00
parent 0b2f156c58
commit a4d9d09af5
35 changed files with 217 additions and 69 deletions
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -599,6 +599,7 @@ Sequence<Time>::add_note_unlocked(const NotePtr note, void* arg)
 	DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 add note %2 @ %3\n", this, (int)note->note(), note->time()));

        if (resolve_overlaps_unlocked (note, arg)) {
+                DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 DISALLOWED: note %2 @ %3\n", this, (int)note->note(), note->time()));
                return false;
 	}