summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-08-16 00:22:49 +0200
committerRobin Gareus <robin@gareus.org>2016-08-16 00:26:06 +0200
commit7b993ef1380ea294b18b4a8bf92709044a093ca6 (patch)
treeba18aa336da66068817242c0b0b0c0c8cca3bfe4 /libs/ardour/ardour
parentbc0bb6cae90744edc048c2f7e49b0839e9263cb6 (diff)
turn comments into doxygen doc
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/types.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index ce28484519..e818ea707e 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