diff options
author | Carl Hetherington <carl@carlh.net> | 2012-04-16 16:32:22 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2012-04-16 16:32:22 +0000 |
commit | a2897ecef6da6a458aa1de8c2d9973a1e809dca2 (patch) | |
tree | 189e34b829823fc73d11fba249f283e00336d44d /gtk2_ardour/time_selection.cc | |
parent | 02c498a8fa1c2e47988a256321bdcf5e9e869de1 (diff) |
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
Diffstat (limited to 'gtk2_ardour/time_selection.cc')
-rw-r--r-- | gtk2_ardour/time_selection.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc index 064e654cff..4bc0e2a96a 100644 --- a/gtk2_ardour/time_selection.cc +++ b/gtk2_ardour/time_selection.cc @@ -55,9 +55,9 @@ TimeSelection::consolidate () continue; } - if ((*a).coverage ((*b).start, (*b).end) != OverlapNone) { - (*a).start = std::min ((*a).start, (*b).start); - (*a).end = std::max ((*a).end, (*b).end); + if (a->coverage (b->start, b->end) != Evoral::OverlapNone) { + a->start = std::min (a->start, b->start); + a->end = std::max (a->end, b->end); erase (b); changed = true; goto restart; |