X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=d94c1fae64591a2fa30ad6c60f1491e63ade07bf;hb=d3404f36848c040820deba3dabaeedb006bd329d;hp=b5ffc582ceadd05079529753ef0d9bd8f03faa46;hpb=601c317d70a03190257577bd867cefc2c70d3275;p=ardour.git

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index b5ffc582ce..d94c1fae64 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -377,6 +377,9 @@ RegionView::region_changed (const PropertyChange& what_changed)
 	if (what_changed.contains (ARDOUR::Properties::name)) {
 		region_renamed ();
 	}
+	if (what_changed.contains (ARDOUR::Properties::position_lock_style)) {
+		region_renamed ();
+	}
 	if (what_changed.contains (ARDOUR::Properties::sync_position)) {
 		region_sync_changed ();
 	}
@@ -559,21 +562,22 @@ RegionView::make_name () const
 	std::string str;
 
 	// XXX nice to have some good icons for this
+	if (_region->position_lock_style() == MusicTime) {
+		str += "\u266B"; // BEAMED EIGHTH NOTES
+	}
 
 	if (_region->locked()) {
-		str += '>';
+		str += "\u2629"; // CROSS OF JERUSALEM
 		str += _region->name();
-		str += '<';
 	} else if (_region->position_locked()) {
-		str += '{';
+		str += "\u21B9"; // LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR
 		str += _region->name();
-		str += '}';
 	} else if (_region->video_locked()) {
 		str += '[';
 		str += _region->name();
 		str += ']';
 	} else {
-		str = _region->name();
+		str += _region->name();
 	}
 
 	if (_region->muted()) {
@@ -841,18 +845,13 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t sub
 		return false;
 	}
 
-	RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
-	double const speed = rtv.track()->speed ();
-
 	framepos_t const pre_trim_first_frame = _region->first_frame();
 
-	const framepos_t speed_bound = (framepos_t) (new_bound * speed);
-
-	if (_region->position() == speed_bound) {
+	if (_region->position() == new_bound) {
 		return false;
 	}
 
-	_region->trim_front (speed_bound, sub_num);
+	_region->trim_front (new_bound, sub_num);
 
 	if (no_overlap) {
 		// Get the next region on the left of this region and shrink/expand it.
@@ -883,12 +882,9 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap, const int32_t sub_n
 		return false;
 	}
 
-	RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
-	double const speed = rtv.track()->speed ();
-
 	framepos_t const pre_trim_last_frame = _region->last_frame();
 
-	_region->trim_end ((framepos_t) (new_bound * speed), sub_num);
+	_region->trim_end (new_bound, sub_num);
 
 	if (no_overlap) {
 		// Get the next region on the right of this region and shrink/expand it.