diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-06-14 23:43:10 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-06-14 23:43:10 +0000 |
| commit | c158c44fab4d5cd0a6fade9213b262849d90dc31 (patch) | |
| tree | a2864a310340b2829e2df88915a9fcd07a741f97 /libs/evoral/src | |
| parent | f1fc47b0770ec7c1e6bd6de125dbe6627c567028 (diff) | |
make note overlap resolution store side effects in a DiffCommand, and add its changes to the DiffCommand being executed, so as to retain "internal" note property changes across undo
git-svn-id: svn://localhost/ardour2/branches/3.0@7256 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/src')
| -rw-r--r-- | libs/evoral/src/Sequence.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index dba79a556a..ddd978fefa 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -580,15 +580,14 @@ Sequence<Time>::end_write (bool delete_stuck) template<typename Time> bool -Sequence<Time>::add_note_unlocked(const NotePtr note, - set<NotePtr >* removed) +Sequence<Time>::add_note_unlocked(const NotePtr note, void* arg) { /* This is the core method to add notes to a Sequence */ DEBUG_TRACE (DEBUG::Sequence, string_compose ("%1 add note %2 @ %3\n", this, (int)note->note(), note->time())); - if (resolve_overlaps_unlocked (note, removed)) { + if (resolve_overlaps_unlocked (note, arg)) { return false; } |