X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=ac16a28bf4a2d5b5a6644ba54970a07dbda2adf5;hb=e827bb2bff271f99abd3531ddd0e5a01c8ac5014;hp=1debfd6a07679fbbde5df444f6c9e26aefec41e1;hpb=2c72f58aa19c169752e6c09310c7d7917b63c3eb;p=ardour.git

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 1debfd6a07..ac16a28bf4 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -28,7 +28,6 @@
 #include "ardour/playlist.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiosource.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/session.h"
 
 #include "ardour_ui.h"
@@ -83,7 +82,8 @@ RegionView::RegionView (ArdourCanvas::Group*              parent,
 	, in_destructor(false)
 	, wait_for_data(false)
         , _silence_text (0)
-	, _time_converter(r->session().tempo_map(), r->position())
+	, _region_relative_time_converter(r->session().tempo_map(), r->position())
+	, _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start())
 {
 	GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
@@ -92,7 +92,8 @@ RegionView::RegionView (const RegionView& other)
 	: sigc::trackable(other)
 	, TimeAxisViewItem (other)
         , _silence_text (0)
-	, _time_converter(other._time_converter)
+	, _region_relative_time_converter(other.region_relative_time_converter())
+	, _source_relative_time_converter(other.source_relative_time_converter())
 {
 	/* derived concrete type will call init () */
 
@@ -108,7 +109,8 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other
 	: sigc::trackable(other)
 	, TimeAxisViewItem (other)
         , _silence_text (0)
-	, _time_converter(other._time_converter)
+	, _region_relative_time_converter(other_region->session().tempo_map(), other_region->position())
+	, _source_relative_time_converter(other_region->session().tempo_map(), other_region->position() - other_region->start())
 {
 	/* this is a pseudo-copy constructor used when dragging regions
 	   around on the canvas.
@@ -143,7 +145,8 @@ RegionView::RegionView (ArdourCanvas::Group*         parent,
 	, in_destructor(false)
 	, wait_for_data(false)
         , _silence_text (0)
-	, _time_converter(r->session().tempo_map(), r->position())
+	, _region_relative_time_converter(r->session().tempo_map(), r->position())
+	, _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start())
 {
 }
 
@@ -192,7 +195,7 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd)
 	set_height (trackview.current_height());
 
 	_region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context());
-	
+
 	group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this));
 
 	set_colors ();
@@ -220,7 +223,7 @@ RegionView::~RegionView ()
 }
 
 void
-RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold)
+RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/)
 {
         framecnt_t shortest = max_framecnt;
 
@@ -239,7 +242,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
 		_silent_frames.push_back (cr);
 
 		/* coordinates for the rect are relative to the regionview origin */
-                
+
 		cr->property_x1() = trackview.editor().frame_to_pixel (i->first - _region->start());
 		cr->property_x2() = trackview.editor().frame_to_pixel (i->second - _region->start());
 		cr->property_y1() = 1;
@@ -252,7 +255,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
 
 	/* Find shortest audible segment */
         framecnt_t shortest_audible = max_framecnt;
-	
+
 	framecnt_t s = _region->start();
 	for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
 		framecnt_t const dur = i->first - s;
@@ -269,21 +272,21 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
 	}
 
         _silence_text = new ArdourCanvas::NoEventText (*group);
-        _silence_text->property_font_desc() = *(get_font_for_style (N_("SilenceText")));
-        _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get();                                                
+        _silence_text->property_font_desc() = get_font_for_style (N_("SilenceText"));
+        _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get();
         _silence_text->property_anchor() = ANCHOR_NW;
-        
+
         /* both positions are relative to the region start offset in source */
-        
+
         _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0;
         _silence_text->property_y() = 20.0;
-        
+
         double ms = (float) shortest/_region->session().frame_rate();
-        
+
         /* ms are now in seconds */
 
         char const * sunits;
-        
+
         if (ms >= 60.0) {
                 sunits = _("minutes");
                 ms /= 60.0;
@@ -302,7 +305,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
                 /* ms are now in seconds */
                 double ma = (float) shortest_audible / _region->session().frame_rate();
                 char const * aunits;
-                
+
                 if (ma >= 60.0) {
                         aunits = _("minutes");
                         ma /= 60.0;
@@ -317,7 +320,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
 	}
 
 	_silence_text->property_text() = text.c_str ();
-} 
+}
 
 void
 RegionView::hide_silent_frames ()
@@ -400,7 +403,11 @@ RegionView::region_resized (const PropertyChange& what_changed)
 
 	if (what_changed.contains (ARDOUR::Properties::position)) {
 		set_position (_region->position(), 0);
-		_time_converter.set_origin_b (_region->position());
+		_region_relative_time_converter.set_origin_b (_region->position());
+	}
+
+	if (what_changed.contains (ARDOUR::Properties::start) || what_changed.contains (ARDOUR::Properties::position)) {
+		_source_relative_time_converter.set_origin_b (_region->position() - _region->start());
 	}
 
 	PropertyChange s_and_l;
@@ -618,7 +625,7 @@ RegionView::region_sync_changed ()
 		sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;			// FIXME make a themeable colour
 
 		sync_line = new ArdourCanvas::Line (*group);
-		sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;			// FIXME make a themeable colour	
+		sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255);     // fill_color;			// FIXME make a themeable colour
 		sync_line->property_width_pixels() = 1;
 	}
 
@@ -841,7 +848,7 @@ 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), this);
+	_region->trim_front ((framepos_t) (new_bound * speed));
 
 	if (no_overlap) {
 		// Get the next region on the left of this region and shrink/expand it.
@@ -856,7 +863,7 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap)
 
 		// Only trim region on the left if the first frame has gone beyond the left region's last frame.
 		if (region_left != 0 &&	(region_left->last_frame() > _region->first_frame() || regions_touching)) {
-			region_left->trim_end (_region->first_frame() - 1, this);
+			region_left->trim_end (_region->first_frame() - 1);
 		}
 	}
 
@@ -875,7 +882,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), this);
+	_region->trim_end ((framepos_t) (new_bound * speed));
 
 	if (no_overlap) {
 		// Get the next region on the right of this region and shrink/expand it.
@@ -890,11 +897,11 @@ 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, this);
+			region_right->trim_front (_region->last_frame() + 1);
 		}
 
 		region_changed (ARDOUR::bounds_change);
-			
+
 	} else {
 		region_changed (PropertyChange (ARDOUR::Properties::length));
 	}
@@ -938,7 +945,32 @@ RegionView::trim_contents (framepos_t frame_delta, bool left_direction, bool swa
 		}
 	}
 
-	_region->trim_start ((framepos_t) (new_bound * speed), this);
+	_region->trim_start ((framepos_t) (new_bound * speed));
 	region_changed (PropertyChange (ARDOUR::Properties::start));
 }
 
+/** Snap a frame offset within our region using the current snap settings.
+ *  @param x Frame offset from this region's position.
+ *  @return Snapped frame offset from this region's position.
+ */
+frameoffset_t
+RegionView::snap_frame_to_frame (frameoffset_t x) const
+{
+	PublicEditor& editor = trackview.editor();
+
+	/* x is region relative, convert it to global absolute frames */
+	framepos_t const session_frame = x + _region->position();
+
+	/* try a snap in either direction */
+	framepos_t frame = session_frame;
+	editor.snap_to (frame, 0);
+
+	/* if we went off the beginning of the region, snap forwards */
+	if (frame < _region->position ()) {
+		frame = session_frame;
+		editor.snap_to (frame, 1);
+	}
+
+	/* back to region relative */
+	return frame - _region->position();
+}