Fairly major change to the way in which crossfades are handled;

they are now done with region fades, rather than separate objects.
After this commit, Ardour will try to convert your session files
to the new crossfade format, but will make a backup in your
session folder first.

If you have works in progress using Ardour 3 it is
***STRONGLY RECOMMENDED*** that you back up session files before
updating to this commit.


git-svn-id: svn://localhost/ardour2/branches/3.0@11986 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 13 deletions

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 3ebf5478e6..b3c1666dbb 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -36,6 +36,8 @@
 
 #include "pbd/id.h"
 
+#include "evoral/Range.hpp"
+
 #include "ardour/chan_count.h"
 
 #include <map>
@@ -101,17 +103,6 @@ namespace ARDOUR {
 		ARDOUR::ChanCount after;
 	};
 
-	enum OverlapType {
-		OverlapNone,      // no overlap
-		OverlapInternal,  // the overlap is 100% with the object
-		OverlapStart,     // overlap covers start, but ends within
-		OverlapEnd,       // overlap begins within and covers end
-		OverlapExternal   // overlap extends to (at least) begin+end
-	};
-
-	ARDOUR::OverlapType coverage (framepos_t sa, framepos_t ea,
-	                              framepos_t sb, framepos_t eb);
-
 	/* policies for inserting/pasting material where overlaps
 	   might be an issue.
 	*/
@@ -278,6 +269,9 @@ namespace ARDOUR {
 		}
 	};
 
+	/* XXX: slightly unfortunate that there is this and Evoral::Range<>,
+	   but this has a uint32_t id which Evoral::Range<> does not.
+	*/
 	struct AudioRange {
 		framepos_t start;
 		framepos_t end;
@@ -295,8 +289,8 @@ namespace ARDOUR {
 			return start == other.start && end == other.end;
 		}
 
-		OverlapType coverage (framepos_t s, framepos_t e) const {
-			return ARDOUR::coverage (start, end, s, e);
+		Evoral::OverlapType coverage (framepos_t s, framepos_t e) const {
+			return Evoral::coverage (start, end, s, e);
 		}
 	};