diff options
author | Carl Hetherington <carl@carlh.net> | 2010-11-15 22:55:39 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-11-15 22:55:39 +0000 |
commit | ee76685f8d3cd04ffa5905def8f760aeda8faa10 (patch) | |
tree | 4e16f6fb54a03064c06bb8d2d1de43e8ef774400 /libs | |
parent | 90172686b92b53cc5ab1d60c0e6daecb65d17d3d (diff) |
Modify region trim cursor if a region can only be trimmed in one direction.
git-svn-id: svn://localhost/ardour2/branches/3.0@8045 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/trimmable.h | 16 | ||||
-rw-r--r-- | libs/ardour/region.cc | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libs/ardour/ardour/trimmable.h b/libs/ardour/ardour/trimmable.h index e053a2deed..28bb9da095 100644 --- a/libs/ardour/ardour/trimmable.h +++ b/libs/ardour/ardour/trimmable.h @@ -9,14 +9,14 @@ class Trimmable { virtual ~Trimmable() {} enum CanTrim { - FrontTrimEarlier, - FrontTrimLater, - EndTrimEarlier, - EndTrimLater, - TopTrimUp, - TopTrimDown, - BottomTrimUp, - BottomTrimDown + FrontTrimEarlier = 0x1, + FrontTrimLater = 0x2, + EndTrimEarlier = 0x4, + EndTrimLater = 0x8, + TopTrimUp = 0x10, + TopTrimDown = 0x20, + BottomTrimUp = 0x40, + BottomTrimDown = 0x80 } ; virtual CanTrim can_trim() const { diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 6d4be37b6d..33338e52ea 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -1607,7 +1607,7 @@ Region::can_trim () const } if (!_sources.empty()) { - if (last_frame() < _sources.front()->length (0)) { + if ((start() + length()) < _sources.front()->length (0)) { ct = CanTrim (ct | EndTrimLater); } } |