From ee76685f8d3cd04ffa5905def8f760aeda8faa10 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Mon, 15 Nov 2010 22:55:39 +0000
Subject: 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
---
 libs/ardour/ardour/trimmable.h | 16 ++++++++--------
 libs/ardour/region.cc          |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'libs')

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);
                 }
         }
-- 
cgit v1.2.3