diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-21 21:29:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-21 21:29:22 +0000 |
| commit | be614d0538ddd78b13b236f760afbd94af540202 (patch) | |
| tree | f437fc23359b43969d369e867146e67244c72ad7 /libs/ardour/ardour/session_configuration_vars.h | |
| parent | 500aaa0deeb386df94fddc4474aa6de43331becb (diff) | |
change default overlapping note strategy to "relax" (i.e. do nothing); fix crash when looping with MIDI data; add back note-off resolution at loop point (if it was actually there) so that notes are turned off (but don't forget Ye Olde Sustain Pedal/Controller) when looping; minor other non-functional tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@9753 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/session_configuration_vars.h')
| -rw-r--r-- | libs/ardour/ardour/session_configuration_vars.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index 336e694e6a..5924adcc86 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -58,6 +58,6 @@ CONFIG_VARIABLE (bool, show_summary, "show-summary", true) CONFIG_VARIABLE (bool, show_group_tabs, "show-group-tabs", true) CONFIG_VARIABLE (bool, external_sync, "external-sync", false) CONFIG_VARIABLE (SyncSource, sync_source, "sync-source", JACK) -CONFIG_VARIABLE (InsertMergePolicy, insert_merge_policy, "insert-merge-policy", InsertMergeReject) +CONFIG_VARIABLE (InsertMergePolicy, insert_merge_policy, "insert-merge-policy", InsertMergeRelax) CONFIG_VARIABLE (framecnt_t, timecode_offset, "timecode-offset", 0) CONFIG_VARIABLE (bool, timecode_offset_negative, "timecode-offset-negative", true) |