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

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index a62d000abc..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;
@@ -775,27 +775,42 @@ 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");
 
-	t = pl->find_next_region_boundary (t, 1);
 
-	/* is this region is on top at time t? */
-	bool const new_me = (pl->top_unmuted_region_at (t) == _region);
+	while (t < end) {
 
-	/* start off any new rect, if required */
-	if (cr == 0 || me != new_me) {
-		cr = new ArdourCanvas::Rectangle (group);
-		_coverage_frames.push_back (cr);
-		cr->set_x0 (trackview.editor().sample_to_pixel (t - position));
-		cr->set_y0 (1);
-		cr->set_y1 (_height + 1);
-		cr->set_outline (false);
-		cr->set_ignore_events (true);
-		if (new_me) {
-			cr->set_fill_color (UINT_RGBA_CHANGE_A (non_playing_color, 0));
-		} else {
-			cr->set_fill_color (non_playing_color);
+		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));
 		}
+
+		/* start off any new rect, if required */
+		if (cr == 0 || me != new_me) {
+			cr = new ArdourCanvas::Rectangle (group);
+			_coverage_frames.push_back (cr);
+			cr->set_x0 (trackview.editor().sample_to_pixel (t - position));
+			cr->set_y0 (1);
+			cr->set_y1 (_height + 1);
+			cr->set_outline (false);
+			cr->set_ignore_events (true);
+			if (new_me) {
+				cr->set_fill_color (UINT_RGBA_CHANGE_A (non_playing_color, 0));
+			} else {
+				cr->set_fill_color (non_playing_color);
+			}
+		}
+		t = pl->find_next_region_boundary (t, 1);
+		if (t < 0) {
+			break;
+		}
+		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));
@@ -819,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;
@@ -836,7 +851,7 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap)
 		return false;
 	}
 
-	_region->trim_front (speed_bound);
+	_region->trim_front (speed_bound, sub_num);
 
 	if (no_overlap) {
 		// Get the next region on the left of this region and shrink/expand it.
@@ -861,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;
@@ -872,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.
@@ -887,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);