X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=27e161176bd77a24ef81bf48992f31fa11e7804f;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=a01ec941be9a7bd5297a28839427498bd422c3d4;hpb=004990463ebf927a42083f5f92d2a00ba89ee360;p=ardour.git

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index a01ec941be..27e161176b 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -48,7 +48,7 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -178,13 +178,14 @@ RegionView::init (bool wfd)
 		_enable_display = true;
 	}
 
-	set_height (trackview.current_height());
+	/* derived class calls set_height () including RegionView::set_height() in ::init() */
+	//set_height (trackview.current_height());
 
 	_region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context());
 
-	set_colors ();
-
-	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler));
+	/* derived class calls set_colors () including RegionView::set_colors() in ::init() */
+	//set_colors ();
+	//UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler));
 
 	/* XXX sync mark drag? */
 }
@@ -381,10 +382,6 @@ RegionView::region_changed (const PropertyChange& what_changed)
 	if (what_changed.contains (ARDOUR::Properties::locked)) {
 		region_locked ();
 	}
-	if (what_changed.contains (ARDOUR::Properties::locked)) {
-		/* name will show locked status */
-		region_renamed ();
-	}
 }
 
 void
@@ -592,7 +589,6 @@ RegionView::region_renamed ()
 
 	set_item_name (str, this);
 	set_name_text (str);
-	reset_width_dependent_items (_pixel_width);
 }
 
 void
@@ -779,13 +775,13 @@ RegionView::update_coverage_frames (LayerDisplay d)
 	/* the color that will be used to show parts of regions that will not be heard */
 	uint32_t const non_playing_color = UIConfiguration::instance().color_mod ("covered region", "covered region base");
 
+
 	while (t < end) {
 
 		t++;
 
 		/* is this region is on top at time t? */
 		bool const new_me = (pl->top_unmuted_region_at (t) == _region);
-
 		/* finish off any old rect, if required */
 		if (cr && me != new_me) {
 			cr->set_x1 (trackview.editor().sample_to_pixel (t - position));
@@ -806,7 +802,6 @@ RegionView::update_coverage_frames (LayerDisplay d)
 				cr->set_fill_color (non_playing_color);
 			}
 		}
-
 		t = pl->find_next_region_boundary (t, 1);
 		if (t < 0) {
 			break;
@@ -814,6 +809,8 @@ RegionView::update_coverage_frames (LayerDisplay d)
 		me = new_me;
 	}
 
+	t = pl->find_next_region_boundary (t, 1);
+
 	if (cr) {
 		/* finish off the last rectangle */
 		cr->set_x1 (trackview.editor().sample_to_pixel (end - position));
@@ -837,7 +834,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
 }
 
 bool
-RegionView::trim_front (framepos_t new_bound, bool no_overlap)
+RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t sub_num)
 {
 	if (_region->locked()) {
 		return false;
@@ -848,7 +845,13 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap)
 
 	framepos_t const pre_trim_first_frame = _region->first_frame();
 
-	_region->trim_front ((framepos_t) (new_bound * speed));
+	const framepos_t speed_bound = (framepos_t) (new_bound * speed);
+
+	if (_region->position() == speed_bound) {
+		return false;
+	}
+
+	_region->trim_front (speed_bound, sub_num);
 
 	if (no_overlap) {
 		// Get the next region on the left of this region and shrink/expand it.
@@ -873,7 +876,7 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap)
 }
 
 bool
-RegionView::trim_end (framepos_t new_bound, bool no_overlap)
+RegionView::trim_end (framepos_t new_bound, bool no_overlap, const int32_t sub_num)
 {
 	if (_region->locked()) {
 		return false;
@@ -884,7 +887,7 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap)
 
 	framepos_t const pre_trim_last_frame = _region->last_frame();
 
-	_region->trim_end ((framepos_t) (new_bound * speed));
+	_region->trim_end ((framepos_t) (new_bound * speed), sub_num);
 
 	if (no_overlap) {
 		// Get the next region on the right of this region and shrink/expand it.
@@ -899,7 +902,7 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap)
 
 		// Only trim region on the right if the last frame has gone beyond the right region's first frame.
 		if (region_right != 0 && (region_right->first_frame() < _region->last_frame() || regions_touching)) {
-			region_right->trim_front (_region->last_frame() + 1);
+			region_right->trim_front (_region->last_frame() + 1, sub_num);
 		}
 
 		region_changed (ARDOUR::bounds_change);