diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-06-25 20:47:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-06-25 20:47:09 +0000 |
| commit | ecb0cd5d119d28092a8f48e4521ac5eba197bb54 (patch) | |
| tree | 57d7bcff09ab6d6382af929212ff4a4adeea2658 /libs/ardour/ardour/midi_model.h | |
| parent | ad81fd40d22f63f0f9e7a247164b6b367fabb2fd (diff) | |
Make MIDI region `automation' respect the automation mode so that it is
only played back if the automation mode is set to "Play". Munge AutoState
for AutomationRegionViews so that they reflect their AutomationTimeAxisView's
setting. Fixes #3135.
git-svn-id: svn://localhost/ardour2/branches/3.0@7304 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_model.h')
| -rw-r--r-- | libs/ardour/ardour/midi_model.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 9b2c66d5f0..f879c201ee 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -146,7 +146,7 @@ public: InsertMergePolicy insert_merge_policy () const; void set_insert_merge_policy (InsertMergePolicy); - + protected: int resolve_overlaps_unlocked (const NotePtr, void* arg = 0); |