Tweak some naming slightly.

git-svn-id: svn://localhost/ardour2/branches/3.0@8210 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 13 insertions, 13 deletions

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index cc99e6d272..fb3ef58802 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -1538,7 +1538,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
 	} else {
 		/* These will get overridden for a point trim.*/
 		if (pf < (region_start + region_length/2)) {
-			/* closer to start */
+			/* closer to front */
 			_operation = StartTrim;
 			Drag::start_grab (event, _editor->cursors()->left_side_trim);
 		} else {
@@ -1552,7 +1552,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
 	case StartTrim:
 		_editor->show_verbose_time_cursor (region_start, 10);
 		for (list<DraggingView>::iterator i = _views.begin(); i != _views.end(); ++i) {
-			i->view->trim_start_starting ();
+			i->view->trim_front_starting ();
 		}
 		break;
 	case EndTrim:
@@ -1633,7 +1633,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
 	switch (_operation) {
 	case StartTrim:
 		for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
-			i->view->trim_start (i->initial_position + dt, non_overlap_trim);
+			i->view->trim_front (i->initial_position + dt, non_overlap_trim);
 		}
 		break;
 
@@ -1721,7 +1721,7 @@ TrimDrag::finished (GdkEvent* event, bool movement_occurred)
 
 	for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
 		if (_operation == StartTrim) {
-			i->view->trim_start_ending ();
+			i->view->trim_front_ending ();
 		}
 		i->view->region()->resume_property_changes ();
 	}
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 09262bdd19..cdfc1cbc3a 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -3230,7 +3230,7 @@ MidiRegionView::data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_pt
 }
 
 void
-MidiRegionView::trim_start_starting ()
+MidiRegionView::trim_front_starting ()
 {
 	/* Reparent the note group to the region view's parent, so that it doesn't change
 	   when the region view is trimmed.
@@ -3241,7 +3241,7 @@ MidiRegionView::trim_start_starting ()
 }
 
 void
-MidiRegionView::trim_start_ending ()
+MidiRegionView::trim_front_ending ()
 {
 	_note_group->reparent (*group);
 	delete _temporary_note_group;
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index de9851aa20..88fb431805 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -283,8 +283,8 @@ class MidiRegionView : public RegionView
 
 	void enable_display (bool);
 
-	void trim_start_starting ();
-	void trim_start_ending ();
+	void trim_front_starting ();
+	void trim_front_ending ();
         
   protected:
 	/** Allows derived types to specify their visibility requirements
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 51ec002931..a758b5d9bc 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -696,7 +696,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
 }
 
 void
-RegionView::trim_start (framepos_t new_bound, bool no_overlap)
+RegionView::trim_front (framepos_t new_bound, bool no_overlap)
 {
 	if (_region->locked()) {
 		return;
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 60de56d76f..d9e6f1292b 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -96,13 +96,13 @@ class RegionView : public TimeAxisViewItem
 		return _time_converter;
 	}
 
-	/** Called when a start trim is about to begin */
-	virtual void trim_start_starting () {}
+	/** Called when a front trim is about to begin */
+	virtual void trim_front_starting () {}
 
-	void trim_start (framepos_t, bool);
+	void trim_front (framepos_t, bool);
 
 	/** Called when a start trim has finished */
-	virtual void trim_start_ending () {}
+	virtual void trim_front_ending () {}
 	
 	void trim_end (framepos_t, bool);
 	void trim_contents (framepos_t, bool, bool);