X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Ftypes.h;h=976c4924a794034dd1c143ba5aca9a12044db543;hb=74a604d261b1ecb0f20ee0c69aef7648da3a1d86;hp=ce284845191ac667cb05cbf296499f8e8a2a485a;hpb=da5119583aca2caec4082e3d13cfb1f687a5989d;p=ardour.git diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index ce28484519..976c4924a7 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -111,12 +111,12 @@ namespace ARDOUR { */ enum InsertMergePolicy { - InsertMergeReject, // no overlaps allowed - InsertMergeRelax, // we just don't care about overlaps - InsertMergeReplace, // replace old with new - InsertMergeTruncateExisting, // shorten existing to avoid overlap - InsertMergeTruncateAddition, // shorten new to avoid overlap - InsertMergeExtend // extend new (or old) to the range of old+new + InsertMergeReject, ///< no overlaps allowed + InsertMergeRelax, ///< we just don't care about overlaps + InsertMergeReplace, ///< replace old with new + InsertMergeTruncateExisting, ///< shorten existing to avoid overlap + InsertMergeTruncateAddition, ///< shorten new to avoid overlap + InsertMergeExtend ///< extend new (or old) to the range of old+new }; /** See evoral/Parameter.hpp @@ -146,6 +146,7 @@ namespace ARDOUR { MidiPgmChangeAutomation, MidiPitchBenderAutomation, MidiChannelPressureAutomation, + MidiNotePressureAutomation, MidiSystemExclusiveAutomation, FadeInAutomation, FadeOutAutomation,