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

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 127908613d..27e161176b 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -35,8 +35,6 @@
 #include "canvas/utils.h"
 #include "canvas/colors.h"
 
-#include "ardour_ui.h"
-#include "global_signals.h"
 #include "streamview.h"
 #include "region_view.h"
 #include "automation_region_view.h"
@@ -50,7 +48,7 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -86,7 +84,6 @@ RegionView::RegionView (ArdourCanvas::Container*          parent,
 	, wait_for_data(false)
 	, _silence_text (0)
 {
-	GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (const RegionView& other)
@@ -100,8 +97,6 @@ RegionView::RegionView (const RegionView& other)
 	current_visible_sync_position = other.current_visible_sync_position;
 	valid = false;
 	_pixel_width = other._pixel_width;
-
-	GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region)
@@ -119,8 +114,6 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other
 	current_visible_sync_position = other.current_visible_sync_position;
 	valid = false;
 	_pixel_width = other._pixel_width;
-
-	GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (ArdourCanvas::Container*          parent,
@@ -161,14 +154,14 @@ RegionView::init (bool wfd)
 		name_highlight->set_data ("regionview", this);
 		name_highlight->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
 	}
-	
+
 	if (frame_handle_start) {
 		frame_handle_start->set_data ("regionview", this);
 		frame_handle_start->set_data ("isleft", (void*) 1);
 		frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this));
 		frame_handle_start->raise_to_top();
 	}
-	
+
 	if (frame_handle_end) {
 		frame_handle_end->set_data ("regionview", this);
 		frame_handle_end->set_data ("isleft", (void*) 0);
@@ -185,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 ();
-
-	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? */
 }
@@ -234,11 +228,11 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
                 return;
         }
 
-        uint32_t const color = ARDOUR_UI::config()->color_mod ("silence", "silence");
+        uint32_t const color = UIConfiguration::instance().color_mod ("silence", "silence");
 
 	for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
 
-		ArdourCanvas::Rectangle* cr = new ArdourCanvas::TimeRectangle (group);
+		ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group);
 		cr->set_ignore_events (true);
 		_silent_frames.push_back (cr);
 
@@ -275,7 +269,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
         _silence_text = new ArdourCanvas::Text (group);
 	_silence_text->set_ignore_events (true);
         _silence_text->set_font_description (get_font_for_style (N_("SilenceText")));
-        _silence_text->set_color (ARDOUR_UI::config()->color ("silence text"));
+        _silence_text->set_color (UIConfiguration::instance().color ("silence text"));
 
         /* both positions are relative to the region start offset in source */
 
@@ -388,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
@@ -521,7 +511,7 @@ void
 RegionView::set_sync_mark_color ()
 {
 	if (sync_mark) {
-		ArdourCanvas::Color c = ARDOUR_UI::config()->color ("sync mark");
+		ArdourCanvas::Color c = UIConfiguration::instance().color ("sync mark");
 		sync_mark->set_fill_color (c);
 		sync_mark->set_outline_color (c);
 		sync_line->set_outline_color (c);
@@ -533,14 +523,14 @@ RegionView::get_fill_color () const
 {
 	ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color();
 	char const *modname;
-	
+
 	if (_region->opaque()) {
 		modname = "opaque region base";
 	} else {
 		modname = "transparent region base";
 	}
 
-	return HSV(f).mod (ARDOUR_UI::config()->modifier (modname)).color ();
+	return HSV(f).mod (UIConfiguration::instance().modifier (modname)).color ();
 }
 
 void
@@ -599,7 +589,6 @@ RegionView::region_renamed ()
 
 	set_item_name (str, this);
 	set_name_text (str);
-	reset_width_dependent_items (_pixel_width);
 }
 
 void
@@ -686,7 +675,7 @@ RegionView::move (double x_delta, double y_delta)
 	 */
 
 	ArdourCanvas::Item *item = get_canvas_group ();
-	
+
 	if (item->position().x + x_delta < 0) {
 		x_delta = -item->position().x; /* move it to zero */
 	}
@@ -784,7 +773,8 @@ RegionView::update_coverage_frames (LayerDisplay d)
 	bool me = false;
 
 	/* the color that will be used to show parts of regions that will not be heard */
-	uint32_t const non_playing_color = ARDOUR_UI::config()->color_mod ("covered region", "region base");
+	uint32_t const non_playing_color = UIConfiguration::instance().color_mod ("covered region", "covered region base");
+
 
 	while (t < end) {
 
@@ -792,7 +782,6 @@ RegionView::update_coverage_frames (LayerDisplay d)
 
 		/* 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));
@@ -800,7 +789,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
 
 		/* start off any new rect, if required */
 		if (cr == 0 || me != new_me) {
-			cr = new ArdourCanvas::TimeRectangle (group);
+			cr = new ArdourCanvas::Rectangle (group);
 			_coverage_frames.push_back (cr);
 			cr->set_x0 (trackview.editor().sample_to_pixel (t - position));
 			cr->set_y0 (1);
@@ -813,11 +802,15 @@ 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;
+		}
 		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));
@@ -841,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;
@@ -852,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.
@@ -877,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;
@@ -888,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.
@@ -903,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);
@@ -939,10 +938,12 @@ RegionView::move_contents (frameoffset_t distance)
 
 /** Snap a frame offset within our region using the current snap settings.
  *  @param x Frame offset from this region's position.
+ *  @param ensure_snap whether to ignore snap_mode (in the case of SnapOff) and magnetic snap.
+ *  Used when inverting snap mode logic with key modifiers, or snap distance calculation.
  *  @return Snapped frame offset from this region's position.
  */
 frameoffset_t
-RegionView::snap_frame_to_frame (frameoffset_t x) const
+RegionView::snap_frame_to_frame (frameoffset_t x, bool ensure_snap) const
 {
 	PublicEditor& editor = trackview.editor();
 
@@ -951,12 +952,12 @@ RegionView::snap_frame_to_frame (frameoffset_t x) const
 
 	/* try a snap in either direction */
 	framepos_t frame = session_frame;
-	editor.snap_to (frame, RoundNearest);
+	editor.snap_to (frame, RoundNearest, false, ensure_snap);
 
 	/* if we went off the beginning of the region, snap forwards */
 	if (frame < _region->position ()) {
 		frame = session_frame;
-		editor.snap_to (frame, RoundUpAlways);
+		editor.snap_to (frame, RoundUpAlways, false, ensure_snap);
 	}
 
 	/* back to region relative */