X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=2d26a90a86ce5362886b06cff6c1a450dc38860a;hb=e6b4c9f610c94cb72cb0003f0c751871b30c513e;hp=54be3c857f4da23527cc4d03c367899c13a60469;hpb=a3c378cf62939c85bcfa3b4c55b68c9163c5e21e;p=ardour.git

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 54be3c857f..2d26a90a86 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -24,6 +24,7 @@
 #include <cstdlib>
 #include <cmath>
 #include <string>
+#include <limits>
 #include <map>
 #include <set>
 
@@ -47,7 +48,9 @@
 #include "ardour/midi_track.h"
 #include "ardour/operations.h"
 #include "ardour/playlist_factory.h"
+#include "ardour/profile.h"
 #include "ardour/quantize.h"
+#include "ardour/legatize.h"
 #include "ardour/region_factory.h"
 #include "ardour/reverse.h"
 #include "ardour/session.h"
@@ -62,6 +65,7 @@
 #include "audio_region_view.h"
 #include "audio_streamview.h"
 #include "audio_time_axis.h"
+#include "automation_region_view.h"
 #include "automation_time_axis.h"
 #include "control_point.h"
 #include "debug.h"
@@ -72,12 +76,16 @@
 #include "editor_regions.h"
 #include "editor_routes.h"
 #include "gui_thread.h"
-#include "insert_time_dialog.h"
+#include "insert_remove_time_dialog.h"
 #include "interthread_progress_window.h"
+#include "item_counts.h"
 #include "keyboard.h"
 #include "midi_region_view.h"
+#include "mixer_strip.h"
 #include "mouse_cursors.h"
 #include "normalize_dialog.h"
+#include "note.h"
+#include "paste_context.h"
 #include "patch_change_dialog.h"
 #include "quantize_dialog.h"
 #include "region_gain_line.h"
@@ -89,6 +97,7 @@
 #include "strip_silence_dialog.h"
 #include "time_axis_view.h"
 #include "transpose_dialog.h"
+#include "transform_dialog.h"
 
 #include "i18n.h"
 
@@ -113,6 +122,11 @@ Editor::undo (uint32_t n)
 	
 	if (_session) {
 		_session->undo (n);
+		if (_session->undo_depth() == 0) {
+			undo_action->set_sensitive(false);
+		}
+		redo_action->set_sensitive(true);
+		begin_selection_op_history ();
 	}
 }
 
@@ -125,6 +139,11 @@ Editor::redo (uint32_t n)
 	
 	if (_session) {
 		_session->redo (n);
+		if (_session->redo_depth() == 0) {
+			redo_action->set_sensitive(false);
+		}
+		undo_action->set_sensitive(true);
+		begin_selection_op_history ();
 	}
 }
 
@@ -133,7 +152,11 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 {
 	bool frozen = false;
 
-	list <boost::shared_ptr<Playlist > > used_playlists;
+	RegionSelection pre_selected_regions = selection->regions;
+	bool working_on_selection = !pre_selected_regions.empty();
+
+	list<boost::shared_ptr<Playlist> > used_playlists;
+	list<RouteTimeAxisView*> used_trackviews;
 
 	if (regions.empty()) {
 		return;
@@ -188,9 +211,16 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 
 			/* remember used playlists so we can thaw them later */
 			used_playlists.push_back(pl);
+
+			TimeAxisView& tv = (*a)->get_time_axis_view();
+			RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+			if (rtv) {
+				used_trackviews.push_back (rtv);
+			}
 			pl->freeze();
 		}
 
+
 		if (pl) {
 			pl->clear_changes ();
 			pl->split_region ((*a)->region(), where);
@@ -200,17 +230,68 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 		a = tmp;
 	}
 
+	latest_regionviews.clear ();
+
+	vector<sigc::connection> region_added_connections;
+
+	for (list<RouteTimeAxisView*>::iterator i = used_trackviews.begin(); i != used_trackviews.end(); ++i) {
+		region_added_connections.push_back ((*i)->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)));
+	}
+	
 	while (used_playlists.size() > 0) {
 		list <boost::shared_ptr<Playlist > >::iterator i = used_playlists.begin();
 		(*i)->thaw();
 		used_playlists.pop_front();
 	}
 
-	commit_reversible_command ();
+	for (vector<sigc::connection>::iterator c = region_added_connections.begin(); c != region_added_connections.end(); ++c) {
+		(*c).disconnect ();
+	}
 
 	if (frozen){
 		EditorThaw(); /* Emit Signal */
 	}
+
+	if (working_on_selection) {
+		// IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw.
+
+		_ignore_follow_edits = true;  // a split will change the region selection in mysterious ways;  it's not practical or wanted to follow this edit
+		RegionSelectionAfterSplit rsas = Config->get_region_selection_after_split();
+		/* There are three classes of regions that we might want selected after
+		   splitting selected regions:
+		    - regions selected before the split operation, and unaffected by it
+		    - newly-created regions before the split
+		    - newly-created regions after the split
+		 */
+
+		if (rsas & Existing) {
+			// region selections that existed before the split.
+			selection->add ( pre_selected_regions );
+		}
+
+		for (RegionSelection::iterator ri = latest_regionviews.begin(); ri != latest_regionviews.end(); ri++) {
+			if ((*ri)->region()->position() < where) {
+				// new regions created before the split
+				if (rsas & NewlyCreatedLeft) {
+					selection->add (*ri);
+				}
+			} else {
+				// new regions created after the split
+				if (rsas & NewlyCreatedRight) {
+					selection->add (*ri);
+				}
+			}
+		}
+		_ignore_follow_edits = false;
+	} else {
+		_ignore_follow_edits = true;
+		if( working_on_selection ) {
+			selection->add (latest_regionviews);  //these are the new regions created after the split
+		}
+		_ignore_follow_edits = false;
+	}
+
+	commit_reversible_command ();
 }
 
 /** Move one extreme of the current range selection.  If more than one range is selected,
@@ -611,7 +692,7 @@ Editor::build_region_boundary_cache ()
 		break;
 	default:
 		fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), _snap_type) << endmsg;
-		/*NOTREACHED*/
+		abort(); /*NOTREACHED*/
 		return;
 	}
 
@@ -1330,34 +1411,70 @@ Editor::scroll_tracks_up_line ()
 }
 
 bool
-Editor::scroll_down_one_track ()
+Editor::scroll_down_one_track (bool skip_child_views)
 {
 	TrackViewList::reverse_iterator next = track_views.rend();
-	std::pair<TimeAxisView*,double> res;
-	const double bottom_of_trackviews = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - 1;
+	const double top_of_trackviews = vertical_adjustment.get_value();
 
 	for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) {
 		if ((*t)->hidden()) {
 			continue;
 		}
-		
-		/* If this is the bottom visible trackview, we want to display
-		   the next one.
-		*/
 
-		res = (*t)->covers_y_position (bottom_of_trackviews);
+		/* If this is the upper-most visible trackview, we want to display
+		 * the one above it (next)
+		 *
+		 * Note that covers_y_position() is recursive and includes child views
+		 */
+		std::pair<TimeAxisView*,double> res = (*t)->covers_y_position (top_of_trackviews);
 
 		if (res.first) {
+			if (skip_child_views) {
+				break;
+			}
+			/* automation lane (one level, non-recursive)
+			 *
+			 * - if no automation lane exists -> move to next tack
+			 * - if the first (here: bottom-most) matches -> move to next tack
+			 * - if no y-axis match is found -> the current track is at the top
+			 *     -> move to last (here: top-most) automation lane
+			 */
+			TimeAxisView::Children kids = (*t)->get_child_list();
+			TimeAxisView::Children::reverse_iterator nkid = kids.rend();
+
+			for (TimeAxisView::Children::reverse_iterator ci = kids.rbegin(); ci != kids.rend(); ++ci) {
+				if ((*ci)->hidden()) {
+					continue;
+				}
+
+				std::pair<TimeAxisView*,double> dev;
+				dev = (*ci)->covers_y_position (top_of_trackviews);
+				if (dev.first) {
+					/* some automation lane is currently at the top */
+					if (ci == kids.rbegin()) {
+						/* first (bottom-most) autmation lane is at the top.
+						 * -> move to next track
+						 */
+						nkid = kids.rend();
+					}
+					break;
+				}
+				nkid = ci;
+			}
+
+			if (nkid != kids.rend()) {
+				ensure_time_axis_view_is_visible (**nkid, true);
+				return true;
+			}
 			break;
 		}
-
-		++next; // moves "next" towards the "front" since it is a reverse iterator
+		next = t;
 	}
 
 	/* move to the track below the first one that covers the */
 	
 	if (next != track_views.rend()) {
-		ensure_track_visible (*next);
+		ensure_time_axis_view_is_visible (**next, true);
 		return true;
 	}
 
@@ -1365,24 +1482,66 @@ Editor::scroll_down_one_track ()
 }	
 
 bool
-Editor::scroll_up_one_track ()
+Editor::scroll_up_one_track (bool skip_child_views)
 {
-	double vertical_pos = vertical_adjustment.get_value ();
-
 	TrackViewList::iterator prev = track_views.end();
-	std::pair<TimeAxisView*,double> res;
-
+	double top_of_trackviews = vertical_adjustment.get_value ();
+	
 	for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
 
 		if ((*t)->hidden()) {
 			continue;
 		}
 
-		/* find the trackview at the top of the trackview group */
-		res = (*t)->covers_y_position (vertical_pos);
+		/* find the trackview at the top of the trackview group 
+		 *
+		 * Note that covers_y_position() is recursive and includes child views
+		 */
+		std::pair<TimeAxisView*,double> res = (*t)->covers_y_position (top_of_trackviews);
 		
 		if (res.first) {
-			cerr << res.first->name() << " covers the top\n";
+			if (skip_child_views) {
+				break;
+			}
+			/* automation lane (one level, non-recursive)
+			 *
+			 * - if no automation lane exists -> move to prev tack
+			 * - if no y-axis match is found -> the current track is at the top -> move to prev track 
+			 *     (actually last automation lane of previous track, see below)
+			 * - if first (top-most) lane is at the top -> move to this track
+			 * - else move up one lane
+			 */
+			TimeAxisView::Children kids = (*t)->get_child_list();
+			TimeAxisView::Children::iterator pkid = kids.end();
+
+			for (TimeAxisView::Children::iterator ci = kids.begin(); ci != kids.end(); ++ci) {
+				if ((*ci)->hidden()) {
+					continue;
+				}
+
+				std::pair<TimeAxisView*,double> dev;
+				dev = (*ci)->covers_y_position (top_of_trackviews);
+				if (dev.first) {
+					/* some automation lane is currently at the top */
+					if (ci == kids.begin()) {
+						/* first (top-most) autmation lane is at the top.
+						 * jump directly to this track's top
+						 */
+						ensure_time_axis_view_is_visible (**t, true);
+						return true;
+					}
+					else if (pkid != kids.end()) {
+						/* some other automation lane is at the top.
+						 * move up to prev automation lane.
+						 */
+						ensure_time_axis_view_is_visible (**pkid, true);
+						return true;
+					}
+					assert(0); // not reached
+					break;
+				}
+				pkid = ci;
+			}
 			break;
 		}
 
@@ -1390,7 +1549,23 @@ Editor::scroll_up_one_track ()
 	}
 	
 	if (prev != track_views.end()) {
-		ensure_track_visible (*prev);
+		// move to bottom-most automation-lane of the previous track
+		TimeAxisView::Children kids = (*prev)->get_child_list();
+		TimeAxisView::Children::reverse_iterator pkid = kids.rend();
+		if (!skip_child_views) {
+			// find the last visible lane
+			for (TimeAxisView::Children::reverse_iterator ci = kids.rbegin(); ci != kids.rend(); ++ci) {
+				if (!(*ci)->hidden()) {
+					pkid = ci;
+					break;
+				}
+			}
+		}
+		if (pkid != kids.rend()) {
+			ensure_time_axis_view_is_visible (**pkid, true);
+		} else  {
+			ensure_time_axis_view_is_visible (**prev, true);
+		}
 		return true;
 	}
 
@@ -1402,7 +1577,7 @@ Editor::scroll_up_one_track ()
 void
 Editor::tav_zoom_step (bool coarser)
 {
-	_routes->suspend_redisplay ();
+	DisplaySuspender ds;
 
 	TrackViewList* ts;
 
@@ -1416,14 +1591,12 @@ Editor::tav_zoom_step (bool coarser)
 		TimeAxisView *tv = (static_cast<TimeAxisView*>(*i));
 			tv->step_height (coarser);
 	}
-
-	_routes->resume_redisplay ();
 }
 
 void
 Editor::tav_zoom_smooth (bool coarser, bool force_all)
 {
-	_routes->suspend_redisplay ();
+	DisplaySuspender ds;
 
 	TrackViewList* ts;
 
@@ -1448,42 +1621,8 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all)
 			tv->set_height (h + 5);
 		}
 	}
-
-	_routes->resume_redisplay ();
 }
 
-bool
-Editor::clamp_samples_per_pixel (framecnt_t& fpp) const
-{
-	bool clamped = false;
-	
-	if (fpp < 1) {
-		fpp = 1;
-		clamped = true;
-	}
-
-	framecnt_t sr;
-
-	if (_session) {
-		sr = _session->frame_rate ();
-	} else {
-		sr = 48000;
-	}
-
-	const framecnt_t three_days = 3 * 24 * 60 * 60 * sr;
-	const framecnt_t lots_of_pixels = 4000;
-
-	/* if the zoom level is greater than what you'd get trying to display 3
-	 * days of audio on a really big screen, scale it down.
-	 */
-
-	if (fpp * lots_of_pixels > three_days) {
-		fpp = three_days / _track_canvas->width();
-		clamped = true;
-	}
-
-	return clamped;
-}
 
 void
 Editor::temporal_zoom_step (bool coarser)
@@ -1520,7 +1659,6 @@ Editor::temporal_zoom (framecnt_t fpp)
 	framecnt_t nfpp;
 	double l;
 
-	clamp_samples_per_pixel (fpp);
 	if (fpp == samples_per_pixel) {
 		return;
 	}
@@ -1534,7 +1672,7 @@ Editor::temporal_zoom (framecnt_t fpp)
 	// would be 4147200000 samples, so 2592000 samples per pixel.
 
 	nfpp = min (fpp, (framecnt_t) 2592000);
-	nfpp = max ((framecnt_t) 1, fpp);
+	nfpp = max ((framecnt_t) 1, nfpp);
 
 	new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp);
 	half_page_size = new_page_size / 2;
@@ -1633,49 +1771,22 @@ Editor::temporal_zoom (framecnt_t fpp)
 }
 
 void
-Editor::temporal_zoom_region (bool both_axes)
+Editor::calc_extra_zoom_edges(framepos_t &start, framepos_t &end)
 {
-	framepos_t start = max_framepos;
-	framepos_t end = 0;
-	set<TimeAxisView*> tracks;
-
-	RegionSelection rs = get_regions_from_selection_and_entered ();
-
-	if (rs.empty()) {
-		return;
-	}
-
-	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
-
-		if ((*i)->region()->position() < start) {
-			start = (*i)->region()->position();
-		}
-
-		if ((*i)->region()->last_frame() + 1 > end) {
-			end = (*i)->region()->last_frame() + 1;
-		}
-
-		tracks.insert (&((*i)->get_time_axis_view()));
-	}
-
-	/* now comes an "interesting" hack ... make sure we leave a little space
+	/* this func helps make sure we leave a little space
 	   at each end of the editor so that the zoom doesn't fit the region
 	   precisely to the screen.
 	*/
 
 	GdkScreen* screen = gdk_screen_get_default ();
-	gint pixwidth = gdk_screen_get_width (screen);
-	gint mmwidth = gdk_screen_get_width_mm (screen);
-	double pix_per_mm = (double) pixwidth/ (double) mmwidth;
-	double one_centimeter_in_pixels = pix_per_mm * 10.0;
-
-	if ((start == 0 && end == 0) || end < start) {
-		return;
-	}
+	const gint pixwidth = gdk_screen_get_width (screen);
+	const gint mmwidth = gdk_screen_get_width_mm (screen);
+	const double pix_per_mm = (double) pixwidth/ (double) mmwidth;
+	const double one_centimeter_in_pixels = pix_per_mm * 10.0;
 
-	framepos_t range = end - start;
-	double new_fpp = (double) range / (double) _visible_canvas_width;
-	framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp);
+	const framepos_t range = end - start;
+	const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width);
+	const framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp);
 
 	if (start > extra_samples) {
 		start -= extra_samples;
@@ -1688,6 +1799,19 @@ Editor::temporal_zoom_region (bool both_axes)
 	} else {
 		end = max_framepos;
 	}
+}
+
+void
+Editor::temporal_zoom_region (bool both_axes)
+{
+	framepos_t start = max_framepos;
+	framepos_t end = 0;
+	set<TimeAxisView*> tracks;
+
+	if ( !get_selection_extents(start, end) )
+		return;
+	
+	calc_extra_zoom_edges (start, end);
 
 	/* if we're zooming on both axes we need to save track heights etc.
 	 */
@@ -1709,7 +1833,7 @@ Editor::temporal_zoom_region (bool both_axes)
 
 		/* hide irrelevant tracks */
 
-		_routes->suspend_redisplay ();
+		DisplaySuspender ds;
 
 		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
 			if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) {
@@ -1717,33 +1841,79 @@ Editor::temporal_zoom_region (bool both_axes)
 			}
 		}
 
-		_routes->resume_redisplay ();
-
 		vertical_adjustment.set_value (0.0);
 	}
 
 	redo_visual_stack.push_back (current_visual_state (both_axes));
 }
 
-void
-Editor::zoom_to_region (bool both_axes)
+
+bool
+Editor::get_selection_extents ( framepos_t &start, framepos_t &end )
 {
-	temporal_zoom_region (both_axes);
+	start = max_framepos;
+	end = 0;
+	bool ret = true;
+	
+	//ToDo:  if notes are selected, set extents to that selection
+
+	//ToDo:  if control points are selected, set extents to that selection
+
+	if ( !selection->regions.empty() ) {
+		RegionSelection rs = get_regions_from_selection_and_entered ();
+
+		for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+
+			if ((*i)->region()->position() < start) {
+				start = (*i)->region()->position();
+			}
+
+			if ((*i)->region()->last_frame() + 1 > end) {
+				end = (*i)->region()->last_frame() + 1;
+			}
+		}
+
+	} else if (!selection->time.empty()) {
+		start = selection->time.start();
+		end = selection->time.end_frame();
+	} else 
+		ret = false;  //no selection found
+
+	//range check
+	if ((start == 0 && end == 0) || end < start) {
+		ret = false;
+	}
+	
+	return ret;	
 }
 
+
 void
-Editor::temporal_zoom_selection ()
+Editor::temporal_zoom_selection (bool both_axes)
 {
 	if (!selection) return;
 
-	if (selection->time.empty()) {
-		return;
-	}
+	//ToDo:  if notes are selected, zoom to that
 
-	framepos_t start = selection->time[clicked_selection].start;
-	framepos_t end = selection->time[clicked_selection].end;
+	//ToDo:  if control points are selected, zoom to that
+
+	//if region(s) are selected, zoom to that
+	if ( !selection->regions.empty() )
+		temporal_zoom_region (both_axes);
+
+	//if a range is selected, zoom to that
+	if (!selection->time.empty()) {
+
+		framepos_t start,  end;
+		if (get_selection_extents (start, end)) {
+			calc_extra_zoom_edges(start, end);
+			temporal_zoom_by_frame (start, end);
+		}
+		
+		if (both_axes)
+			fit_selection();
+	}
 
-	temporal_zoom_by_frame (start, end);
 }
 
 void
@@ -1752,13 +1922,28 @@ Editor::temporal_zoom_session ()
 	ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_session)
 
 	if (_session) {
-		framecnt_t const l = _session->current_end_frame() - _session->current_start_frame();
-		double s = _session->current_start_frame() - l * 0.01;
-		if (s < 0) {
-			s = 0;
+		framecnt_t start = _session->current_start_frame();
+		framecnt_t end = _session->current_end_frame();
+
+		if (_session->actively_recording () ) {
+			framepos_t cur = playhead_cursor->current_frame ();
+			if (cur > end) {
+				/* recording beyond the end marker; zoom out
+				 * by 5 seconds more so that if 'follow
+				 * playhead' is active we don't immediately
+				 * scroll.
+				 */
+				end = cur + _session->frame_rate() * 5;
+			}
 		}
-		framecnt_t const e = _session->current_end_frame() + l * 0.01;
-		temporal_zoom_by_frame (framecnt_t (s), e);
+
+		if ((start == 0 && end == 0) || end < start) {
+			return;
+		}
+
+		calc_extra_zoom_edges(start, end);
+
+		temporal_zoom_by_frame (start, end);
 	}
 }
 
@@ -1773,9 +1958,9 @@ Editor::temporal_zoom_by_frame (framepos_t start, framepos_t end)
 
 	framepos_t range = end - start;
 
-	double const new_fpp = (double) range / (double) _visible_canvas_width;
-
-	framepos_t new_page = (framepos_t) floor (_visible_canvas_width * new_fpp);
+	const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width);
+	
+	framepos_t new_page = range;
 	framepos_t middle = (framepos_t) floor ((double) start + ((double) range / 2.0f));
 	framepos_t new_leftmost = (framepos_t) floor ((double) middle - ((double) new_page / 2.0f));
 
@@ -1812,8 +1997,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
 			new_spp = samples_per_pixel - (samples_per_pixel/2);
 		} else {
 			/* could bail out here since we cannot zoom any finer,
-			   but leave that to the clamp_samples_per_pixel() and
-			   equality test below
+			   but leave that to the equality test below
 			*/
 			new_spp = samples_per_pixel;
 		}
@@ -1821,8 +2005,6 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
 		range_before -= range_before/2;
 	}
 
-	clamp_samples_per_pixel (new_spp);
-
 	if (new_spp == samples_per_pixel)  {
 		return;
 	}
@@ -1848,7 +2030,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
 bool
 Editor::choose_new_marker_name(string &name) {
 
-	if (!Config->get_name_new_markers()) {
+	if (!ARDOUR_UI::config()->get_name_new_markers()) {
 		/* don't prompt user for a new name */
 		return true;
 	}
@@ -1900,12 +2082,14 @@ Editor::add_location_from_selection ()
 	_session->locations()->next_available_name(rangename,"selection");
 	Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker);
 
-	_session->begin_reversible_command (_("add marker"));
+	begin_reversible_command (_("add marker"));
+	
 	XMLNode &before = _session->locations()->get_state();
 	_session->locations()->add (location, true);
 	XMLNode &after = _session->locations()->get_state();
 	_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -1920,12 +2104,62 @@ Editor::add_location_mark (framepos_t where)
 		return;
 	}
 	Location *location = new Location (*_session, where, where, markername, Location::IsMark);
-	_session->begin_reversible_command (_("add marker"));
+	begin_reversible_command (_("add marker"));
+	
 	XMLNode &before = _session->locations()->get_state();
 	_session->locations()->add (location, true);
 	XMLNode &after = _session->locations()->get_state();
 	_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
+}
+
+void
+Editor::set_session_start_from_playhead ()
+{
+	if (!_session)
+		return;
+	
+	Location* loc;
+	if ((loc = _session->locations()->session_range_location()) == 0) {  //should never happen
+		_session->set_session_extents ( _session->audible_frame(), _session->audible_frame() );
+	} else {
+		XMLNode &before = loc->get_state();
+
+		_session->set_session_extents ( _session->audible_frame(), loc->end() );
+
+		XMLNode &after = loc->get_state();
+
+		begin_reversible_command (_("Set session start"));
+		
+		_session->add_command (new MementoCommand<Location>(*loc, &before, &after));
+
+		commit_reversible_command ();
+	}
+}
+
+void
+Editor::set_session_end_from_playhead ()
+{
+	if (!_session)
+		return;
+	
+	Location* loc;
+	if ((loc = _session->locations()->session_range_location()) == 0) {  //should never happen
+		_session->set_session_extents ( _session->audible_frame(), _session->audible_frame() );
+	} else {
+		XMLNode &before = loc->get_state();
+
+		_session->set_session_extents ( loc->start(), _session->audible_frame() );
+
+		XMLNode &after = loc->get_state();
+
+		begin_reversible_command (_("Set session start"));
+
+		_session->add_command (new MementoCommand<Location>(*loc, &before, &after));
+
+		commit_reversible_command ();
+	}
 }
 
 void
@@ -1934,6 +2168,37 @@ Editor::add_location_from_playhead_cursor ()
 	add_location_mark (_session->audible_frame());
 }
 
+void
+Editor::remove_location_at_playhead_cursor ()
+{
+	if (_session) {
+
+		//set up for undo
+		begin_reversible_command (_("remove marker"));
+		
+		XMLNode &before = _session->locations()->get_state();
+		bool removed = false;
+
+		//find location(s) at this time
+		Locations::LocationList locs;
+		_session->locations()->find_all_between (_session->audible_frame(), _session->audible_frame()+1, locs, Location::Flags(0));
+		for (Locations::LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+			if ((*i)->is_mark()) {
+				_session->locations()->remove (*i);
+				removed = true;
+			}
+		}
+		
+		//store undo
+		if (removed) {
+			XMLNode &after = _session->locations()->get_state();
+			_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
+			
+			commit_reversible_command ();
+		}
+	}
+}
+
 /** Add a range marker around each selected region */
 void
 Editor::add_locations_from_region ()
@@ -1944,7 +2209,8 @@ Editor::add_locations_from_region ()
 		return;
 	}
 
-	_session->begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker"));
+	begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker"));
+	
 	XMLNode &before = _session->locations()->get_state();
 
 	for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) {
@@ -1958,7 +2224,8 @@ Editor::add_locations_from_region ()
 
 	XMLNode &after = _session->locations()->get_state();
 	_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 /** Add a single range marker around all selected regions */
@@ -1971,7 +2238,8 @@ Editor::add_location_from_region ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("add marker"));
+	begin_reversible_command (_("add marker"));
+	
 	XMLNode &before = _session->locations()->get_state();
 
 	string markername;
@@ -1994,7 +2262,8 @@ Editor::add_location_from_region ()
 
 	XMLNode &after = _session->locations()->get_state();
 	_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 /* MARKS */
@@ -2050,12 +2319,14 @@ void
 Editor::clear_markers ()
 {
 	if (_session) {
-		_session->begin_reversible_command (_("clear markers"));
+		begin_reversible_command (_("clear markers"));
+		
 		XMLNode &before = _session->locations()->get_state();
 		_session->locations()->clear_markers ();
 		XMLNode &after = _session->locations()->get_state();
 		_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-		_session->commit_reversible_command ();
+		
+		commit_reversible_command ();
 	}
 }
 
@@ -2063,35 +2334,30 @@ void
 Editor::clear_ranges ()
 {
 	if (_session) {
-		_session->begin_reversible_command (_("clear ranges"));
+		begin_reversible_command (_("clear ranges"));
+		
 		XMLNode &before = _session->locations()->get_state();
 
-		Location * looploc = _session->locations()->auto_loop_location();
-		Location * punchloc = _session->locations()->auto_punch_location();
-		Location * sessionloc = _session->locations()->session_range_location();
-
 		_session->locations()->clear_ranges ();
-		// re-add these
-		if (looploc) _session->locations()->add (looploc);
-		if (punchloc) _session->locations()->add (punchloc);
-		if (sessionloc) _session->locations()->add (sessionloc);
 
 		XMLNode &after = _session->locations()->get_state();
 		_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-		_session->commit_reversible_command ();
+		
+		commit_reversible_command ();
 	}
 }
 
 void
 Editor::clear_locations ()
 {
-	_session->begin_reversible_command (_("clear locations"));
+	begin_reversible_command (_("clear locations"));
+	
 	XMLNode &before = _session->locations()->get_state();
 	_session->locations()->clear ();
 	XMLNode &after = _session->locations()->get_state();
 	_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-	_session->commit_reversible_command ();
-	_session->locations()->clear ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -2116,6 +2382,8 @@ Editor::unhide_ranges ()
 	}
 }
 
+/* INSERT/REPLACE */
+
 void
 Editor::insert_region_list_selection (float times)
 {
@@ -2148,6 +2416,9 @@ Editor::insert_region_list_selection (float times)
 	begin_reversible_command (_("insert region"));
 	playlist->clear_changes ();
 	playlist->add_region ((RegionFactory::create (region, true)), get_preferred_edit_position(), times);
+	if (Config->get_edit_mode() == Ripple)
+		playlist->ripple (get_preferred_edit_position(), region->length() * times, boost::shared_ptr<Region>());
+
 	_session->add_command(new StatefulDiffCommand (playlist));
 	commit_reversible_command ();
 }
@@ -2212,7 +2483,7 @@ Editor::play_from_edit_point_and_return ()
 	framepos_t start_frame;
 	framepos_t return_frame;
 
-	start_frame = get_preferred_edit_position (true);
+	start_frame = get_preferred_edit_position ( EDIT_IGNORE_PHEAD );
 
 	if (_session->transport_rolling()) {
 		_session->request_locate (start_frame, false);
@@ -2233,11 +2504,15 @@ Editor::play_from_edit_point_and_return ()
 void
 Editor::play_selection ()
 {
-	if (selection->time.empty()) {
+ 	framepos_t start, end;
+	if (!get_selection_extents ( start, end))
 		return;
-	}
 
-	_session->request_play_range (&selection->time, true);
+	AudioRange ar (start, end, 0);
+	list<AudioRange> lar;
+	lar.push_back (ar);
+
+	_session->request_play_range (&lar, true);
 }
 
 framepos_t
@@ -2250,7 +2525,7 @@ Editor::get_preroll ()
 void
 Editor::maybe_locate_with_edit_preroll ( framepos_t location )
 {
-	if ( _session->transport_rolling() || !Config->get_always_play_range() )
+	if ( _session->transport_rolling() || !ARDOUR_UI::config()->get_follow_edits() || _ignore_follow_edits )
 		return;
 
 	location -= get_preroll();
@@ -2270,16 +2545,17 @@ Editor::maybe_locate_with_edit_preroll ( framepos_t location )
 void
 Editor::play_with_preroll ()
 {
-	if (selection->time.empty()) {
-		return;
-	} else {
+	{
 		framepos_t preroll = get_preroll();
 		
-		framepos_t start = 0;
-		if (selection->time[clicked_selection].start > preroll)
-			start = selection->time[clicked_selection].start - preroll;
+		framepos_t start, end;
+		if (!get_selection_extents ( start, end))
+			return;
+
+		if (start > preroll)
+			start = start - preroll;
 		
-		framepos_t end = selection->time[clicked_selection].end + preroll;
+		end = end + preroll;  //"post-roll"
 		
 		AudioRange ar (start, end, 0);
 		list<AudioRange> lar;
@@ -2312,8 +2588,8 @@ Editor::loop_location (Location& location)
 		tll->set (location.start(), location.end());
 
 		// enable looping, reposition and start rolling
-		_session->request_play_loop (true);
 		_session->request_locate (tll->start(), true);
+		_session->request_play_loop (true);
 	}
 }
 
@@ -2592,8 +2868,14 @@ Editor::create_region_from_selection (vector<boost::shared_ptr<Region> >& new_re
 		return;
 	}
 
-	framepos_t start = selection->time[clicked_selection].start;
-	framepos_t end = selection->time[clicked_selection].end;
+	framepos_t start, end;
+	if (clicked_selection) {
+		start = selection->time[clicked_selection].start;
+		end = selection->time[clicked_selection].end;
+	} else {
+		start = selection->time.start();
+		end = selection->time.end_frame();
+	}
 
 	TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
 	sort_track_selection (ts);
@@ -2652,6 +2934,7 @@ static void
 add_if_covered (RegionView* rv, const AudioRange* ar, RegionSelection* rs)
 {
 	switch (rv->region()->coverage (ar->start, ar->end - 1)) {
+	// n.b. -1 because AudioRange::end is one past the end, but coverage expects inclusive ranges
 	case Evoral::OverlapNone:
 		break;
 	default:
@@ -2771,8 +3054,7 @@ Editor::separate_regions_between (const TimeSelection& ts)
 	}
 
 	if (in_command)	{
-		selection->set (new_selection);
-		set_mouse_mode (MouseObject);
+//		selection->set (new_selection);
 
 		commit_reversible_command ();
 	}
@@ -3591,14 +3873,13 @@ Editor::freeze_route ()
 
 	pthread_create_and_store (X_("freezer"), &itt.thread, _freeze_thread, this);
 
-	set_canvas_cursor (_cursors->wait);
+	CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
 
 	while (!itt.done && !itt.cancel) {
 		gtk_main_iteration ();
 	}
 
 	current_interthread_info = 0;
-	set_canvas_cursor (current_canvas_cursor);
 }
 
 void
@@ -3687,7 +3968,14 @@ Editor::bounce_range_selection (bool replace, bool enable_processing)
 void
 Editor::delete_ ()
 {
-	cut_copy (Delete);
+	//special case: if the user is pointing in the editor/mixer strip, they may be trying to delete a plugin.
+	//we need this because the editor-mixer strip is in the editor window, so it doesn't get the bindings from the mix window
+	bool deleted = false;
+	if ( current_mixer_strip && current_mixer_strip == MixerStrip::entered_mixer_strip() )
+		deleted = current_mixer_strip->delete_processors ();
+
+	if (!deleted)
+		cut_copy (Delete);
 }
 
 /** Cut selected regions, automation points or a time range */
@@ -3709,30 +3997,15 @@ Editor::copy ()
 bool
 Editor::can_cut_copy () const
 {
-	switch (effective_mouse_mode()) {
+	if (!selection->time.empty() || !selection->regions.empty() || !selection->points.empty())
+		return true;
 
-	case MouseObject:
-		if (!selection->regions.empty() || !selection->points.empty()) {
-			return true;
-		}
-		break;
-
-	case MouseRange:
-		if (!selection->time.empty()) {
-			return true;
-		}
-		break;
-
-	default:
-		break;
-	}
-
-	return false;
-}
+	return false;
+}
 
 
 /** Cut, copy or clear selected regions, automation points or a time range.
- * @param op Operation (Cut, Copy or Clear)
+ * @param op Operation (Delete, Cut, Copy or Clear)
  */
 void
 Editor::cut_copy (CutCopyOp op)
@@ -3768,7 +4041,7 @@ Editor::cut_copy (CutCopyOp op)
 		}
 	}
 
-	if ( op != Clear )  //"Delete" doesn't change copy/paste buf
+	if ( op != Delete )  //"Delete" doesn't change copy/paste buf
 		cut_buffer->clear ();
 
 	if (entered_marker) {
@@ -3786,98 +4059,61 @@ Editor::cut_copy (CutCopyOp op)
 		return;
 	}
 
-	if (internal_editing()) {
-
-		switch (effective_mouse_mode()) {
-		case MouseObject:
-		case MouseRange:
-			begin_reversible_command (opname + ' ' + X_("MIDI"));
-			cut_copy_midi (op);
-			commit_reversible_command ();
-			break;
-		default:
-			break;
-		}
-
+	switch (mouse_mode) {
+	case MouseDraw:
+	case MouseContent:
+		begin_reversible_command (opname + ' ' + X_("MIDI"));
+		cut_copy_midi (op);
+		commit_reversible_command ();
 		return;
+	default:
+		break;
 	}
 
 	bool did_edit = false;
 
-	switch (effective_mouse_mode()) {
-	case MouseGain:
-		if (!selection->points.empty()) {
-			begin_reversible_command (opname + _(" points"));
-			did_edit = true;
-			cut_copy_points (op);
-			if (op == Cut || op == Delete) {
-				selection->clear_points ();
-			}
-		}
-		break;
-		
-	case MouseObject: 
+	if (!selection->regions.empty() || !selection->points.empty()) {
+		begin_reversible_command (opname + ' ' + _("objects"));
+		did_edit = true;
 
-		if (!selection->regions.empty() || !selection->points.empty()) {
-
-			string thing_name;
-
-			if (selection->regions.empty()) {
-				thing_name = _("points");
-			} else if (selection->points.empty()) {
-				thing_name = _("regions");
-			} else {
-				thing_name = _("objects");
-			}
-		
-			begin_reversible_command (opname + ' ' + thing_name);
-			did_edit = true;
-
-			if (!selection->regions.empty()) {
-				cut_copy_regions (op, selection->regions);
-				
-				if (op == Cut || op == Delete) {
-					selection->clear_regions ();
-				}
-			}
-			
-			if (!selection->points.empty()) {
-				cut_copy_points (op);
-				
-				if (op == Cut || op == Delete) {
-					selection->clear_points ();
-				}
-			}
-		} 
-		break;
+		if (!selection->regions.empty()) {
+			cut_copy_regions (op, selection->regions);
 			
-	case MouseRange:
-		if (selection->time.empty()) {
-			framepos_t start, end;
-			/* no time selection, see if we can get an edit range
-			   and use that.
-			*/
-			if (get_edit_op_range (start, end)) {
-				selection->set (start, end);
+			if (op == Cut || op == Delete) {
+				selection->clear_regions ();
 			}
 		}
-		if (!selection->time.empty()) {
-			begin_reversible_command (opname + _(" range"));
-
-			did_edit = true;
-			cut_copy_ranges (op);
+		
+		if (!selection->points.empty()) {
+			cut_copy_points (op);
 			
 			if (op == Cut || op == Delete) {
-				selection->clear_time ();
+				selection->clear_points ();
 			}
 		}
-		break;
+	} else if (selection->time.empty()) {
+		framepos_t start, end;
+		/* no time selection, see if we can get an edit range
+		   and use that.
+		*/
+		if (get_edit_op_range (start, end)) {
+			selection->set (start, end);
+		}
+	} else if (!selection->time.empty()) {
+		begin_reversible_command (opname + ' ' + _("range"));
+
+		did_edit = true;
+		cut_copy_ranges (op);
 		
-	default:
-		break;
+		if (op == Cut || op == Delete) {
+			selection->clear_time ();
+		}
 	}
 	
 	if (did_edit) {
+		/* reset repeated paste state */
+		paste_count    = 0;
+		last_paste_pos = 0;
 		commit_reversible_command ();	
 	}
 	
@@ -3887,10 +4123,11 @@ Editor::cut_copy (CutCopyOp op)
 }
 
 struct AutomationRecord {
-	AutomationRecord () : state (0) {}
-	AutomationRecord (XMLNode* s) : state (s) {}
+	AutomationRecord () : state (0) , line(NULL) {}
+	AutomationRecord (XMLNode* s, const AutomationLine* l) : state (s) , line (l) {}
 	
 	XMLNode* state; ///< state before any operation
+	const AutomationLine* line; ///< line this came from
 	boost::shared_ptr<Evoral::ControlList> copy; ///< copied events for the cut buffer
 };
 
@@ -3898,7 +4135,7 @@ struct AutomationRecord {
  *  @param op Operation (Cut, Copy or Clear)
  */
 void
-Editor::cut_copy_points (CutCopyOp op)
+Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool midi)
 {
 	if (selection->points.empty ()) {
 		return;
@@ -3913,12 +4150,13 @@ Editor::cut_copy_points (CutCopyOp op)
 
 	/* Go through all selected points, making an AutomationRecord for each distinct AutomationList */
 	for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) {
-		boost::shared_ptr<AutomationList> al = (*i)->line().the_list();
+		const AutomationLine&                   line = (*i)->line();
+		const boost::shared_ptr<AutomationList> al   = line.the_list();
 		if (lists.find (al) == lists.end ()) {
 			/* We haven't seen this list yet, so make a record for it.  This includes
 			   taking a copy of its current state, in case this is needed for undo later.
 			*/
-			lists[al] = AutomationRecord (&al->get_state ());
+			lists[al] = AutomationRecord (&al->get_state (), &line);
 		}
 	}
 
@@ -3927,21 +4165,46 @@ Editor::cut_copy_points (CutCopyOp op)
 		   ControlList for each of our source lists to put the cut buffer data in.
 		*/
 		for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) {
-			i->second.copy = i->first->create (i->first->parameter ());
+			i->second.copy = i->first->create (i->first->parameter (), i->first->descriptor());
 		}
 
 		/* Add all selected points to the relevant copy ControlLists */
+		framepos_t start = std::numeric_limits<framepos_t>::max();
 		for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) {
 			boost::shared_ptr<AutomationList> al = (*i)->line().the_list();
-			AutomationList::const_iterator j = (*i)->model ();
-			lists[al].copy->add ((*j)->when, (*j)->value);
+			AutomationList::const_iterator    j  = (*i)->model();
+
+			lists[al].copy->fast_simple_add ((*j)->when, (*j)->value);
+			if (midi) {
+				/* Update earliest MIDI start time in beats */
+				earliest = std::min(earliest, Evoral::Beats((*j)->when));
+			} else {
+				/* Update earliest session start time in frames */
+				start = std::min(start, (*i)->line().session_position(j));
+			}
+		}
+
+		/* Snap start time backwards, so copy/paste is snap aligned. */
+		if (midi) {
+			if (earliest == Evoral::Beats::max()) {
+				earliest = Evoral::Beats();  // Weird... don't offset
+			}
+			earliest.round_down_to_beat();
+		} else {
+			if (start == std::numeric_limits<double>::max()) {
+				start = 0;  // Weird... don't offset
+			}
+			snap_to(start, RoundDownMaybe);
 		}
 
+		const double line_offset = midi ? earliest.to_double() : start;
 		for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) {
-			/* Correct this copy list so that it starts at time 0 */
-			double const start = i->second.copy->front()->when;
+			/* Correct this copy list so that it is relative to the earliest
+			   start time, so relative ordering between points is preserved
+			   when copying from several lists and the paste starts at the
+			   earliest copied piece of data. */
 			for (AutomationList::iterator j = i->second.copy->begin(); j != i->second.copy->end(); ++j) {
-				(*j)->when -= start;
+				(*j)->when -= line_offset;
 			}
 
 			/* And add it to the cut buffer */
@@ -3977,13 +4240,27 @@ Editor::cut_copy_points (CutCopyOp op)
 void
 Editor::cut_copy_midi (CutCopyOp op)
 {
+	Evoral::Beats earliest = Evoral::Beats::max();
 	for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) {
-		MidiRegionView* mrv = *i;
-		mrv->cut_copy_clear (op);
-	}
-}
+		MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+		if (mrv) {
+			if (!mrv->selection().empty()) {
+				earliest = std::min(earliest, (*mrv->selection().begin())->note()->time());
+			}
+			mrv->cut_copy_clear (op);
 
+			/* XXX: not ideal, as there may be more than one track involved in the selection */
+			_last_cut_copy_source_track = &mrv->get_time_axis_view();
+		}
+	}
 
+	if (!selection->points.empty()) {
+		cut_copy_points (op, earliest, true);
+		if (op == Cut || op == Delete) {
+			selection->clear_points ();
+		}
+	}
+}
 
 struct lt_playlist {
     bool operator () (const PlaylistState& a, const PlaylistState& b) {
@@ -4006,12 +4283,15 @@ Editor::remove_clicked_region ()
 		return;
 	}
 
+	begin_reversible_command (_("remove region"));
+
 	boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
 
-	begin_reversible_command (_("remove region"));
 	playlist->clear_changes ();
 	playlist->clear_owned_changes ();
 	playlist->remove_region (clicked_regionview->region());
+	if (Config->get_edit_mode() == Ripple)
+		playlist->ripple (clicked_regionview->region()->position(), -clicked_regionview->region()->length(), boost::shared_ptr<Region>());
 
 	/* We might have removed regions, which alters other regions' layering_index,
 	   so we need to do a recursive diff here.
@@ -4074,6 +4354,9 @@ Editor::remove_selected_regions ()
 		playlist->clear_owned_changes ();
 		playlist->freeze ();
 		playlist->remove_region (*rl);
+		if (Config->get_edit_mode() == Ripple)
+			playlist->ripple ((*rl)->position(), -(*rl)->length(), boost::shared_ptr<Region>());
+
 	}
 
 	vector<boost::shared_ptr<Playlist> >::iterator pl;
@@ -4203,12 +4486,16 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
 		switch (op) {
 		case Delete:
 			pl->remove_region (r);
+			if (Config->get_edit_mode() == Ripple)
+				pl->ripple (r->position(), -r->length(), boost::shared_ptr<Region>());
 			break;
 			
 		case Cut:
 			_xx = RegionFactory::create (r);
 			npl->add_region (_xx, r->position() - first_position);
 			pl->remove_region (r);
+			if (Config->get_edit_mode() == Ripple)
+				pl->ripple (r->position(), -r->length(), boost::shared_ptr<Region>());
 			break;
 
 		case Copy:
@@ -4217,7 +4504,9 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
 			break;
 
 		case Clear:
-			pl->remove_region (r);	
+			pl->remove_region (r);
+			if (Config->get_edit_mode() == Ripple)
+				pl->ripple (r->position(), -r->length(), boost::shared_ptr<Region>());
 			break;
 		}
 
@@ -4292,7 +4581,7 @@ Editor::paste (float times, bool from_context)
 {
         DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n");
 
-	paste_internal (get_preferred_edit_position (false, from_context), times);
+	paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times);
 }
 
 void
@@ -4314,14 +4603,8 @@ Editor::paste_internal (framepos_t position, float times)
 {
         DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("apparent paste position is %1\n", position));
 
-	if (internal_editing()) {
-		if (cut_buffer->midi_notes.empty()) {
-			return;
-		}
-	} else {
-		if (cut_buffer->empty()) {
-			return;
-		}
+	if (cut_buffer->empty(internal_editing())) {
+		return;
 	}
 
 	if (position == max_framepos) {
@@ -4329,60 +4612,99 @@ Editor::paste_internal (framepos_t position, float times)
                 DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("preferred edit position is %1\n", position));
 	}
 
-	TrackViewList ts;
-	TrackViewList::iterator i;
-	size_t nth;
+	if (position == last_paste_pos) {
+		/* repeated paste in the same position */
+		++paste_count;
+	} else {
+		/* paste in new location, reset repeated paste state */
+		paste_count = 0;
+		last_paste_pos = position;
+	}
 
 	/* get everything in the correct order */
 
-	if (_edit_point == Editing::EditAtMouse && entered_track) {
-		/* With the mouse edit point, paste onto the track under the mouse */
-		ts.push_back (entered_track);
-	} else if (!selection->tracks.empty()) {
-		/* Otherwise, if there are some selected tracks, paste to them */
+	TrackViewList ts;
+	if (!selection->tracks.empty()) {
+		/* If there is a track selection, paste into exactly those tracks and
+		   only those tracks.  This allows the user to be explicit and override
+		   the below "do the reasonable thing" logic. */
 		ts = selection->tracks.filter_to_unique_playlists ();
 		sort_track_selection (ts);
-	} else if (_last_cut_copy_source_track) {
-		/* Otherwise paste to the track that the cut/copy came from;
-		   see discussion in mantis #3333.
-		*/
-		ts.push_back (_last_cut_copy_source_track);
-	}
-
-	if (internal_editing ()) {
+	} else {
+		/* Figure out which track to base the paste at. */
+		TimeAxisView* base_track = NULL;
+		if (_edit_point == Editing::EditAtMouse && entered_track) {
+			/* With the mouse edit point, paste onto the track under the mouse. */
+			base_track = entered_track;
+		} else if (_edit_point == Editing::EditAtMouse && entered_regionview) {
+			/* With the mouse edit point, paste onto the track of the region under the mouse. */
+			base_track = &entered_regionview->get_time_axis_view();
+		} else if (_last_cut_copy_source_track) {
+			/* Paste to the track that the cut/copy came from (see mantis #333). */
+			base_track = _last_cut_copy_source_track;
+		} else {
+			/* This is "impossible" since we've copied... well, do nothing. */
+			return;
+		}
 
-		/* undo/redo is handled by individual tracks/regions */
+		/* Walk up to parent if necessary, so base track is a route. */
+		while (base_track->get_parent()) {
+			base_track = base_track->get_parent();
+		}
 
-		for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) {
+		/* Add base track and all tracks below it.  The paste logic will select
+		   the appropriate object types from the cut buffer in relative order. */
+		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+			if ((*i)->order() >= base_track->order()) {
+				ts.push_back(*i);
+			}
+		}
 
-			RegionSelection rs;
-			RegionSelection::iterator r;
-			MidiNoteSelection::iterator cb;
+		/* Sort tracks so the nth track of type T will pick the nth object of type T. */
+		sort_track_selection (ts);
 
-			get_regions_at (rs, position, ts);
+		/* Add automation children of each track in order, for pasting several lines. */
+		for (TrackViewList::iterator i = ts.begin(); i != ts.end();) {
+			/* Add any automation children for pasting several lines */
+			RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*i++);
+			if (!rtv) {
+				continue;
+			}
 
-			for (cb = cut_buffer->midi_notes.begin(), r = rs.begin();
-			     cb != cut_buffer->midi_notes.end() && r != rs.end(); ++r) {
-				MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*r);
-				if (mrv) {
-					mrv->paste (position, times, **cb);
-					++cb;
-				}
+			typedef RouteTimeAxisView::AutomationTracks ATracks;
+			const ATracks& atracks = rtv->automation_tracks();
+			for (ATracks::const_iterator a = atracks.begin(); a != atracks.end(); ++a) {
+				i = ts.insert(i, a->second.get());
+				++i;
 			}
 		}
 
-	} else {
+		/* We now have a list of trackviews starting at base_track, including
+		   automation children, in the order shown in the editor, e.g. R1,
+		   R1.A1, R1.A2, R2, R2.A1, ... */
+	}
 
-		/* we do redo (do you do voodoo?) */
+	begin_reversible_command (Operations::paste);
 
-		begin_reversible_command (Operations::paste);
+	if (ts.size() == 1 && cut_buffer->lines.size() == 1 &&
+	    dynamic_cast<AutomationTimeAxisView*>(ts.front())) {
+	    /* Only one line copied, and one automation track selected.  Do a
+	       "greedy" paste from one automation type to another. */
 
-		for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) {
-			(*i)->paste (position, times, *cut_buffer, nth);
-		}
+	    PasteContext ctx(paste_count, times, ItemCounts(), true);
+	    ts.front()->paste (position, *cut_buffer, ctx);
 
-		commit_reversible_command ();
+	} else {
+
+		/* Paste into tracks */
+
+		PasteContext ctx(paste_count, times, ItemCounts(), false);
+		for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
+			(*i)->paste (position, *cut_buffer, ctx);
+		}
 	}
+
+	commit_reversible_command ();
 }
 
 void
@@ -4418,11 +4740,11 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
 		foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end());
 	}
 
-	commit_reversible_command ();
-
 	if (!foo.empty()) {
 		selection->set (foo);
 	}
+
+	commit_reversible_command ();
 }
 
 void
@@ -4453,7 +4775,13 @@ Editor::duplicate_selection (float times)
 			continue;
 		}
 		playlist->clear_changes ();
-		playlist->duplicate (*ri, selection->time[clicked_selection].end, times);
+		framepos_t end;
+		if (clicked_selection) {
+			end = selection->time[clicked_selection].end;
+		} else {
+			end = selection->time.end_frame();
+		}
+		playlist->duplicate (*ri, end, times);
 		_session->add_command (new StatefulDiffCommand (playlist));
 
 		++ri;
@@ -4595,7 +4923,7 @@ Editor::normalize_region ()
 		return;
 	}
 
-	set_canvas_cursor (_cursors->wait);
+	CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
 	gdk_flush ();
 
 	/* XXX: should really only count audio regions here */
@@ -4614,7 +4942,6 @@ Editor::normalize_region ()
 
 			if (a == -1) {
 				/* the user cancelled the operation */
-				set_canvas_cursor (current_canvas_cursor);
 				return;
 			}
 
@@ -4645,7 +4972,6 @@ Editor::normalize_region ()
 	}
 
 	commit_reversible_command ();
-	set_canvas_cursor (current_canvas_cursor);
 }
 
 
@@ -4760,39 +5086,35 @@ Editor::strip_region_silence ()
 Command*
 Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv)
 {
-	Evoral::Sequence<Evoral::MusicalTime>::Notes selected;
+	Evoral::Sequence<Evoral::Beats>::Notes selected;
 	mrv.selection_as_notelist (selected, true);
 
-	vector<Evoral::Sequence<Evoral::MusicalTime>::Notes> v;
+	vector<Evoral::Sequence<Evoral::Beats>::Notes> v;
 	v.push_back (selected);
 
-	framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
-	double     pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
+	framepos_t    pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
+	Evoral::Beats pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
 
 	return op (mrv.midi_region()->model(), pos_beats, v);
 }
 
 void
-Editor::apply_midi_note_edit_op (MidiOperator& op)
+Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs)
 {
-	Command* cmd;
-
-	RegionSelection rs = get_regions_from_selection_and_entered ();
-
 	if (rs.empty()) {
 		return;
 	}
 
 	begin_reversible_command (op.name ());
 
-	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) {
-		RegionSelection::iterator tmp = r;
+	for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ) {
+		RegionSelection::const_iterator tmp = r;
 		++tmp;
 
 		MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r);
 
 		if (mrv) {
-			cmd = apply_midi_note_edit_op_to_region (op, *mrv);
+			Command* cmd = apply_midi_note_edit_op_to_region (op, *mrv);
 			if (cmd) {
 				(*cmd)();
 				_session->add_command (cmd);
@@ -4816,7 +5138,7 @@ Editor::fork_region ()
 
 	begin_reversible_command (_("Fork Region(s)"));
 
-	set_canvas_cursor (_cursors->wait);
+	CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
 	gdk_flush ();
 
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) {
@@ -4843,48 +5165,87 @@ Editor::fork_region ()
 	}
 
 	commit_reversible_command ();
-
-	set_canvas_cursor (current_canvas_cursor);
 }
 
 void
 Editor::quantize_region ()
 {
-	int selected_midi_region_cnt = 0;
+	if (_session) {
+		quantize_regions(get_regions_from_selection_and_entered ());
+	}
+}
 
-	if (!_session) {
+void
+Editor::quantize_regions (const RegionSelection& rs)
+{
+	if (rs.n_midi_regions() == 0) {
 		return;
 	}
 
-	RegionSelection rs = get_regions_from_selection_and_entered ();
+	if (!quantize_dialog) {
+		quantize_dialog = new QuantizeDialog (*this);
+	}
 
-	if (rs.empty()) {
+	quantize_dialog->present ();
+	const int r = quantize_dialog->run ();
+	quantize_dialog->hide ();
+
+	if (r == Gtk::RESPONSE_OK) {
+		Quantize quant (quantize_dialog->snap_start(),
+		                quantize_dialog->snap_end(),
+				quantize_dialog->start_grid_size(),
+		                quantize_dialog->end_grid_size(),
+				quantize_dialog->strength(),
+		                quantize_dialog->swing(),
+		                quantize_dialog->threshold());
+
+		apply_midi_note_edit_op (quant, rs);
+	}
+}
+
+void
+Editor::legatize_region (bool shrink_only)
+{
+	if (_session) {
+		legatize_regions(get_regions_from_selection_and_entered (), shrink_only);
+	}
+}
+
+void
+Editor::legatize_regions (const RegionSelection& rs, bool shrink_only)
+{
+	if (rs.n_midi_regions() == 0) {
 		return;
 	}
 
-	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
-		MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r);
-		if (mrv) {
-			selected_midi_region_cnt++;
-		}
+	Legatize legatize(shrink_only);
+	apply_midi_note_edit_op (legatize, rs);
+}
+
+void
+Editor::transform_region ()
+{
+	if (_session) {
+		transform_regions(get_regions_from_selection_and_entered ());
 	}
+}
 
-	if (selected_midi_region_cnt == 0) {
+void
+Editor::transform_regions (const RegionSelection& rs)
+{
+	if (rs.n_midi_regions() == 0) {
 		return;
 	}
 
-	QuantizeDialog* qd = new QuantizeDialog (*this);
+	TransformDialog* td = new TransformDialog();
 
-	qd->present ();
-	const int r = qd->run ();
-	qd->hide ();
+	td->present();
+	const int r = td->run();
+	td->hide();
 
 	if (r == Gtk::RESPONSE_OK) {
-		Quantize quant (*_session, qd->snap_start(), qd->snap_end(),
-				qd->start_grid_size(), qd->end_grid_size(),
-				qd->strength(), qd->swing(), qd->threshold());
-
-		apply_midi_note_edit_op (quant);
+		Transform transform(td->get());
+		apply_midi_note_edit_op(transform, rs);
 	}
 }
 
@@ -4897,7 +5258,7 @@ Editor::insert_patch_change (bool from_context)
 		return;
 	}
 
-	const framepos_t p = get_preferred_edit_position (false, from_context);
+	const framepos_t p = get_preferred_edit_position (EDIT_IGNORE_NONE, from_context);
 
 	/* XXX: bit of a hack; use the MIDNAM from the first selected region;
 	   there may be more than one, but the PatchChangeDialog can only offer
@@ -4905,7 +5266,7 @@ Editor::insert_patch_change (bool from_context)
 	*/
 	MidiRegionView* first = dynamic_cast<MidiRegionView*> (rs.front ());
 
-	Evoral::PatchChange<Evoral::MusicalTime> empty (0, 0, 0, 0);
+	Evoral::PatchChange<Evoral::Beats> empty (Evoral::Beats(), 0, 0, 0);
         PatchChangeDialog d (0, _session, empty, first->instrument_info(), Gtk::Stock::ADD);
 
 	if (d.run() == RESPONSE_CANCEL) {
@@ -4933,7 +5294,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 
 	begin_reversible_command (command);
 
-	set_canvas_cursor (_cursors->wait);
+	CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait);
 	gdk_flush ();
 
 	int n = 0;
@@ -4986,7 +5347,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 				
 				_session->add_command(new StatefulDiffCommand (playlist));
 			} else {
-				goto out;
+				return;
 			}
 
 			if (progress) {
@@ -4999,9 +5360,6 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 	}
 
 	commit_reversible_command ();
-
-  out:
-	set_canvas_cursor (current_canvas_cursor);
 }
 
 void
@@ -5019,8 +5377,8 @@ Editor::reset_region_gain_envelopes ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("reset region gain"));
-
+	begin_reversible_command (_("reset region gain"));
+	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
 		if (arv) {
@@ -5031,8 +5389,8 @@ Editor::reset_region_gain_envelopes ()
 			_session->add_command (new MementoCommand<AutomationList>(*arv->audio_region()->envelope().get(), &before, &alist->get_state()));
 		}
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5072,8 +5430,8 @@ Editor::toggle_gain_envelope_active ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("region gain envelope active"));
-
+	begin_reversible_command (_("region gain envelope active"));
+	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
 		if (arv) {
@@ -5082,8 +5440,8 @@ Editor::toggle_gain_envelope_active ()
 			_session->add_command (new StatefulDiffCommand (arv->region()));
 		}
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5099,15 +5457,15 @@ Editor::toggle_region_lock ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("toggle region lock"));
-
+	begin_reversible_command (_("toggle region lock"));
+	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		(*i)->region()->clear_changes ();
 		(*i)->region()->set_locked (!(*i)->region()->locked());
 		_session->add_command (new StatefulDiffCommand ((*i)->region()));
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5123,15 +5481,15 @@ Editor::toggle_region_video_lock ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("Toggle Video Lock"));
-
+	begin_reversible_command (_("Toggle Video Lock"));
+	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		(*i)->region()->clear_changes ();
 		(*i)->region()->set_video_locked (!(*i)->region()->video_locked());
 		_session->add_command (new StatefulDiffCommand ((*i)->region()));
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5147,16 +5505,16 @@ Editor::toggle_region_lock_style ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("region lock style"));
-
+	begin_reversible_command (_("region lock style"));
+	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		(*i)->region()->clear_changes ();
 		PositionLockStyle const ns = (*i)->region()->position_lock_style() == AudioTime ? MusicTime : AudioTime;
 		(*i)->region()->set_position_lock_style (ns);
 		_session->add_command (new StatefulDiffCommand ((*i)->region()));
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5172,15 +5530,15 @@ Editor::toggle_opaque_region ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("change region opacity"));
-
+	begin_reversible_command (_("change region opacity"));
+	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
 		(*i)->region()->clear_changes ();
 		(*i)->region()->set_opaque (!(*i)->region()->opaque());
 		_session->add_command (new StatefulDiffCommand ((*i)->region()));
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5259,6 +5617,22 @@ Editor::toggle_solo_isolate ()
 {
 }
 
+
+void
+Editor::fade_range ()
+{
+	TrackViewList ts = selection->tracks.filter_to_unique_playlists ();
+
+	begin_reversible_command (_("fade range"));
+
+	for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
+		(*i)->fade_range (selection->time);
+	}
+
+	commit_reversible_command ();
+}
+
+
 void
 Editor::set_fade_length (bool in)
 {
@@ -5562,27 +5936,33 @@ Editor::set_playhead_cursor ()
 		}
 	}
 
-	if ( Config->get_always_play_range() )
+	if (ARDOUR_UI::config()->get_follow_edits()) {
 		cancel_time_selection();
+	}
 }
 
 void
 Editor::split_region ()
 {
+	//if a range is selected, separate it
 	if ( !selection->time.empty()) {
 		separate_regions_between (selection->time);
 		return;
 	}
 
-	RegionSelection rs = get_regions_from_selection_and_edit_point ();
+	//if no range was selected, try to find some regions to split
+	if (current_mouse_mode() == MouseObject) {  //don't try this for Internal Edit, Stretch, Draw, etc.
+	
+		RegionSelection rs = get_regions_from_selection_and_edit_point ();
 
-	framepos_t where = get_preferred_edit_position ();
+		framepos_t where = get_preferred_edit_position ();
 
-	if (rs.empty()) {
-		return;
-	}
+		if (rs.empty()) {
+			return;
+		}
 
-	split_regions_at (where, rs);
+		split_regions_at (where, rs);
+	}
 }
 
 struct EditorOrderRouteSorter {
@@ -5620,7 +6000,7 @@ Editor::select_next_route()
 
 	selection->set(current);
 
-	ensure_track_visible(current);
+	ensure_time_axis_view_is_visible (*current, false);
 }
 
 void
@@ -5651,163 +6031,91 @@ Editor::select_prev_route()
 
 	selection->set (current);
 
-	ensure_track_visible(current);
-}
-
-void
-Editor::ensure_track_visible(TimeAxisView *track)
-{
-	if (track->hidden()) {
-		return;
-	}
-
-	/* compute visible area of trackview group, as offsets from top of
-	 * trackview group.
-	 */
-
-	double const current_view_min_y = vertical_adjustment.get_value();
-	double const current_view_max_y = current_view_min_y + vertical_adjustment.get_page_size();
-
-	double const track_min_y = track->y_position ();
-	double const track_max_y = track->y_position () + track->effective_height ();
-
-	if (track_min_y > current_view_min_y &&
-	    track_max_y <= current_view_max_y) {
-		return;
-	}
-
-	double new_value;
-
-	if (track_min_y < current_view_min_y) {
-		// Track is above the current view
-		new_value = track_min_y;
-	} else {
-		// Track is below the current view
-		new_value = track->y_position () + track->effective_height() - vertical_adjustment.get_page_size();
-	}
-
-	vertical_adjustment.set_value(new_value);
+	ensure_time_axis_view_is_visible (*current, false);
 }
 
 void
 Editor::set_loop_from_selection (bool play)
-{
-	if (_session == 0 || selection->time.empty()) {
-		return;
-	}
-
-	framepos_t start = selection->time[clicked_selection].start;
-	framepos_t end = selection->time[clicked_selection].end;
-
-	set_loop_range (start, end,  _("set loop range from selection"));
-
-	if (play) {
-		_session->request_play_loop (true);
-		_session->request_locate (start, true);
-	}
-}
-
-void
-Editor::set_loop_from_edit_range (bool play)
 {
 	if (_session == 0) {
 		return;
 	}
 
-	framepos_t start;
-	framepos_t end;
-
-	if (!get_edit_op_range (start, end)) {
+	framepos_t start, end;
+	if (!get_selection_extents ( start, end))
 		return;
-	}
 
-	set_loop_range (start, end,  _("set loop range from edit range"));
+	set_loop_range (start, end,  _("set loop range from selection"));
 
 	if (play) {
-		_session->request_play_loop (true);
-		_session->request_locate (start, true);
+		_session->request_play_loop (true, true);
 	}
 }
 
 void
 Editor::set_loop_from_region (bool play)
 {
-	framepos_t start = max_framepos;
-	framepos_t end = 0;
-
-	RegionSelection rs = get_regions_from_selection_and_entered ();
-
-	if (rs.empty()) {
+	framepos_t start, end;
+	if (!get_selection_extents ( start, end))
 		return;
-	}
-
-	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
-		if ((*i)->region()->position() < start) {
-			start = (*i)->region()->position();
-		}
-		if ((*i)->region()->last_frame() + 1 > end) {
-			end = (*i)->region()->last_frame() + 1;
-		}
-	}
 
 	set_loop_range (start, end, _("set loop range from region"));
 
 	if (play) {
-		_session->request_play_loop (true);
 		_session->request_locate (start, true);
+		_session->request_play_loop (true);
 	}
 }
 
 void
 Editor::set_punch_from_selection ()
 {
-	if (_session == 0 || selection->time.empty()) {
+	if (_session == 0) {
 		return;
 	}
 
-	framepos_t start = selection->time[clicked_selection].start;
-	framepos_t end = selection->time[clicked_selection].end;
+	framepos_t start, end;
+	if (!get_selection_extents ( start, end))
+		return;
 
 	set_punch_range (start, end,  _("set punch range from selection"));
 }
 
 void
-Editor::set_punch_from_edit_range ()
+Editor::set_session_extents_from_selection ()
 {
 	if (_session == 0) {
 		return;
 	}
+	
+	framepos_t start, end;
+	if (!get_selection_extents ( start, end))
+		return;
 
-	framepos_t start;
-	framepos_t end;
+	Location* loc;
+	if ((loc = _session->locations()->session_range_location()) == 0) {
+		_session->set_session_extents ( start, end );  // this will create a new session range;  no need for UNDO
+	} else {
+		XMLNode &before = loc->get_state();
 
-	if (!get_edit_op_range (start, end)) {
-		return;
-	}
+		_session->set_session_extents ( start, end );
 
-	set_punch_range (start, end,  _("set punch range from edit range"));
+		XMLNode &after = loc->get_state();
+
+		begin_reversible_command (_("set session start/end from selection"));
+
+		_session->add_command (new MementoCommand<Location>(*loc, &before, &after));
+
+		commit_reversible_command ();
+	}
 }
 
 void
 Editor::set_punch_from_region ()
 {
-	framepos_t start = max_framepos;
-	framepos_t end = 0;
-
-	RegionSelection rs = get_regions_from_selection_and_entered ();
-
-	if (rs.empty()) {
+	framepos_t start, end;
+	if (!get_selection_extents ( start, end))
 		return;
-	}
-
-	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
-		if ((*i)->region()->position() < start) {
-			start = (*i)->region()->position();
-		}
-		if ((*i)->region()->last_frame() + 1 > end) {
-			end = (*i)->region()->last_frame() + 1;
-		}
-	}
 
 	set_punch_range (start, end, _("set punch range from region"));
 }
@@ -5979,8 +6287,8 @@ Editor::split_region_at_transients ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("split regions"));
-
+	begin_reversible_command (_("split regions"));
+	
 	for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) {
 
 		RegionSelection::iterator tmp;
@@ -5997,8 +6305,8 @@ Editor::split_region_at_transients ()
 
 		i = tmp;
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 
 }
 
@@ -6186,14 +6494,14 @@ Editor::place_transient()
 
 	framepos_t where = get_preferred_edit_position();
 
-	_session->begin_reversible_command (_("place transient"));
-
+	begin_reversible_command (_("place transient"));
+	
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
 		framepos_t position = (*r)->region()->position();
 		(*r)->region()->add_transient(where - position);
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -6221,8 +6529,8 @@ Editor::snap_regions_to_grid ()
 		return;
 	}
 
-	_session->begin_reversible_command (_("snap regions to grid"));
-
+	begin_reversible_command (_("snap regions to grid"));
+	
 	for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
 
 		boost::shared_ptr<Playlist> pl = (*r)->region()->playlist();
@@ -6245,8 +6553,8 @@ Editor::snap_regions_to_grid ()
 		(*i)->thaw();
 		used_playlists.pop_front();
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -6304,8 +6612,8 @@ Editor::close_region_gaps ()
 
 	/* Iterate over the region list and make adjacent regions overlap by crossfade_len_ms */
 
-	_session->begin_reversible_command (_("close region gaps"));
-
+	begin_reversible_command (_("close region gaps"));
+	
 	int idx = 0;
 	boost::shared_ptr<Region> last_region;
 
@@ -6344,8 +6652,8 @@ Editor::close_region_gaps ()
 		(*i)->thaw();
 		used_playlists.pop_front();
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -6438,7 +6746,7 @@ Editor::playhead_forward_to_grid ()
 	framepos_t pos = playhead_cursor->current_frame ();
 	if (pos < max_framepos - 1) {
 		pos += 2;
-		snap_to_internal (pos, 1, false);
+		snap_to_internal (pos, RoundUpAlways, false);
 		_session->request_locate (pos);
 	}
 }
@@ -6454,7 +6762,7 @@ Editor::playhead_backward_to_grid ()
 	framepos_t pos = playhead_cursor->current_frame ();
 	if (pos > 2) {
 		pos -= 2;
-		snap_to_internal (pos, -1, false);
+		snap_to_internal (pos, RoundDownAlways, false);
 		_session->request_locate (pos);
 	}
 }
@@ -6495,6 +6803,23 @@ Editor::toggle_tracks_active ()
 
 void
 Editor::remove_tracks ()
+{
+	/* this will delete GUI objects that may be the subject of an event
+	   handler in which this method is called. Defer actual deletion to the
+	   next idle callback, when all event handling is finished.
+	*/
+	Glib::signal_idle().connect (sigc::mem_fun (*this, &Editor::idle_remove_tracks));
+}
+
+bool
+Editor::idle_remove_tracks ()
+{
+	_remove_tracks ();
+	return false; /* do not call again */
+}
+
+void
+Editor::_remove_tracks ()
 {
 	TrackSelection& ts (selection->tracks);
 
@@ -6550,18 +6875,9 @@ edit your ardour.rc file to set the\n\
 		return;
 	}
 
-	if (ntracks > 1) {
-		trackstr = _("tracks");
-	} else {
-		trackstr = _("track");
-	}
-
-	if (nbusses > 1) {
-		busstr = _("busses");
-	} else {
-		busstr = _("bus");
-	}
-
+	trackstr = P_("track", "tracks", ntracks);
+	busstr = P_("bus", "busses", nbusses);
+	
 	if (ntracks) {
 		if (nbusses) {
 			prompt  = string_compose (_("Do you really want to remove %1 %2 and %3 %4?\n"
@@ -6576,7 +6892,7 @@ edit your ardour.rc file to set the\n\
 		}
 	} else if (nbusses) {
 		prompt  = string_compose (_("Do you really want to remove %1 %2?\n\n"
-		                            "This action cannot be undon, and the session file will be overwritten"),
+		                            "This action cannot be undone, and the session file will be overwritten"),
 					  nbusses, busstr);
 	}
 
@@ -6600,8 +6916,12 @@ edit your ardour.rc file to set the\n\
 		return;
 	}
 
-	for (vector<boost::shared_ptr<Route> >::iterator x = routes.begin(); x != routes.end(); ++x) {
-		_session->remove_route (*x);
+	{
+		Session::StateProtector sp (_session);
+		DisplaySuspender ds;
+		for (vector<boost::shared_ptr<Route> >::iterator x = routes.begin(); x != routes.end(); ++x) {
+			_session->remove_route (*x);
+		}
 	}
 }
 
@@ -6612,7 +6932,7 @@ Editor::do_insert_time ()
 		return;
 	}
 
-	InsertTimeDialog d (*this);
+	InsertRemoveTimeDialog d (*this);
 	int response = d.run ();
 
 	if (response != RESPONSE_OK) {
@@ -6716,25 +7036,24 @@ Editor::insert_time (
 
 			Locations::LocationList::const_iterator tmp;
 
-			bool const was_locked = (*i)->locked ();
-			if (locked_markers_too) {
-				(*i)->unlock ();
-			}
-
 			if ((*i)->position_lock_style() == AudioTime || glued_markers_too) {
+				bool const was_locked = (*i)->locked ();
+				if (locked_markers_too) {
+					(*i)->unlock ();
+				}
 
 				if ((*i)->start() >= pos) {
-					(*i)->set_start ((*i)->start() + frames);
+					// move end first, in case we're moving by more than the length of the range
 					if (!(*i)->is_mark()) {
 						(*i)->set_end ((*i)->end() + frames);
 					}
+					(*i)->set_start ((*i)->start() + frames);
 					moved = true;
 				}
 
-			}
-
-			if (was_locked) {
-				(*i)->lock ();
+				if (was_locked) {
+					(*i)->lock ();
+				}
 			}
 		}
 
@@ -6754,7 +7073,168 @@ Editor::insert_time (
 }
 
 void
-Editor::fit_selected_tracks ()
+Editor::do_remove_time ()
+{
+	if (selection->tracks.empty()) {
+		return;
+	}
+
+	framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE);
+	InsertRemoveTimeDialog d (*this, true);
+
+	int response = d.run ();
+
+	if (response != RESPONSE_OK) {
+		return;
+	}
+	
+	framecnt_t distance = d.distance();
+
+	if (distance == 0) {
+		return;
+	}
+
+	remove_time (
+		pos,
+		distance,
+		SplitIntersected,
+		d.move_glued(),
+		d.move_markers(),
+		d.move_glued_markers(),
+		d.move_locked_markers(),
+		d.move_tempos()
+	);
+}
+
+void
+Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, 
+		     bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too)
+{
+	bool commit = false;
+	
+	if (Config->get_edit_mode() == Lock) {
+		error << (_("Cannot insert or delete time when in Lock edit.")) << endmsg;
+		return;
+	}
+
+	begin_reversible_command (_("cut time"));
+
+	for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) {
+		/* regions */
+		boost::shared_ptr<Playlist> pl = (*x)->playlist();
+		
+		if (pl) {
+
+			XMLNode &before = pl->get_state();
+			
+			std::list<AudioRange> rl;
+			AudioRange ar(pos, pos+frames, 0);
+			rl.push_back(ar);
+			pl->cut (rl);
+			pl->shift (pos, -frames, true, ignore_music_glue);
+			
+			XMLNode &after = pl->get_state();
+			
+			_session->add_command (new MementoCommand<Playlist> (*pl, &before, &after));
+			commit = true;
+		}
+			
+		/* automation */
+		RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (*x);
+		if (rtav) {
+			rtav->route ()->shift (pos, -frames);
+			commit = true;
+		}
+	}
+
+	std::list<Location*> loc_kill_list;
+	
+	/* markers */
+	if (markers_too) {
+		bool moved = false;
+		XMLNode& before (_session->locations()->get_state());
+		Locations::LocationList copy (_session->locations()->list());
+
+		for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) {
+			if ((*i)->position_lock_style() == AudioTime || glued_markers_too) {
+
+				bool const was_locked = (*i)->locked ();
+				if (locked_markers_too) {
+					(*i)->unlock ();
+				}
+
+				if (!(*i)->is_mark()) {  // it's a range;  have to handle both start and end
+					if ((*i)->end() >= pos
+					&& (*i)->end() < pos+frames
+					&& (*i)->start() >= pos
+					&& (*i)->end() < pos+frames) {  // range is completely enclosed;  kill it
+						moved = true;
+						loc_kill_list.push_back(*i);
+					} else {  // only start or end is included, try to do the right thing
+						// move start before moving end, to avoid trying to move the end to before the start
+						// if we're removing more time than the length of the range
+						if ((*i)->start() >= pos && (*i)->start() < pos+frames) {
+							// start is within cut
+							(*i)->set_start (pos);  // bring the start marker to the beginning of the cut
+							moved = true;
+						} else if ((*i)->start() >= pos+frames) {
+							// start (and thus entire range) lies beyond end of cut
+							(*i)->set_start ((*i)->start() - frames); // slip the start marker back
+							moved = true;
+						}
+						if ((*i)->end() >= pos && (*i)->end() < pos+frames) {
+							// end is inside cut
+							(*i)->set_end (pos);  // bring the end to the cut
+							moved = true;
+						} else if ((*i)->end() >= pos+frames) {
+							// end is beyond end of cut
+							(*i)->set_end ((*i)->end() - frames); // slip the end marker back
+							moved = true;
+						}
+
+					}
+				} else if ((*i)->start() >= pos && (*i)->start() < pos+frames ) {
+					loc_kill_list.push_back(*i);
+					moved = true;
+				} else if ((*i)->start() >= pos) {
+					(*i)->set_start ((*i)->start() -frames);
+					moved = true;
+				}
+
+				if (was_locked) {
+					(*i)->lock ();
+				}
+			}
+		}
+
+		for (list<Location*>::iterator i = loc_kill_list.begin(); i != loc_kill_list.end(); ++i) {
+			_session->locations()->remove( *i );
+		}
+	
+		if (moved) {
+			XMLNode& after (_session->locations()->get_state());
+			_session->add_command (new MementoCommand<Locations>(*_session->locations(), &before, &after));
+			commit = true;
+		}
+	}
+	
+	if (tempo_too) {
+		XMLNode& before (_session->tempo_map().get_state());
+
+		if (_session->tempo_map().remove_time (pos, frames) ) {
+			XMLNode& after (_session->tempo_map().get_state());
+			_session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
+			commit = true;
+		}
+	}
+	
+	if (commit) {
+		commit_reversible_command ();
+	}
+}
+
+void
+Editor::fit_selection ()
 {
         if (!selection->tracks.empty()) {
                 fit_tracks (selection->tracks);
@@ -6781,6 +7261,7 @@ Editor::fit_selected_tracks ()
                         }
                 }
         }
+
 }
 
 void
@@ -6809,7 +7290,7 @@ Editor::fit_tracks (TrackViewList & tracks)
                  height that will be taken by visible children of selected
                  tracks - height of the ruler/hscroll area 
 	*/
-	uint32_t h = (uint32_t) floor ((_visible_canvas_height - (child_heights + _trackview_group->canvas_origin().y)) / visible_tracks);
+	uint32_t h = (uint32_t) floor ((trackviews_height() - child_heights) / visible_tracks);
 	double first_y_pos = DBL_MAX;
 
 	if (h < TimeAxisView::preset_height (HeightSmall)) {
@@ -6819,7 +7300,7 @@ Editor::fit_tracks (TrackViewList & tracks)
 	}
 
 	undo_visual_stack.push_back (current_visual_state (true));
-	no_save_visual = true;
+	PBD::Unwinder<bool> nsv (no_save_visual, true);
 
 	/* build a list of all tracks, including children */
 
@@ -6832,24 +7313,34 @@ Editor::fit_tracks (TrackViewList & tracks)
 		}
 	}
 
-	/* operate on all tracks, hide unselected ones that are in the middle of selected ones */
-
-	bool within_selected = false;
-
-	for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t) {
 
-		TrackViewList::iterator next;
+	// find selection range.
+	// if someone knows how to user TrackViewList::iterator for this
+	// I'm all ears.
+	int selected_top = -1;
+	int selected_bottom = -1;
+	int i = 0;
+	for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t, ++i) {
+		if ((*t)->marked_for_display ()) {
+			if (tracks.contains(*t)) {
+				if (selected_top == -1) {
+					selected_top = i;
+				}
+				selected_bottom = i;
+			}
+		}
+	}
 
-		next = t;
-		++next;
-		
+	i = 0;
+	for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t, ++i) {
 		if ((*t)->marked_for_display ()) {
-			if (tracks.contains (*t)) { 
+			if (tracks.contains(*t)) {
 				(*t)->set_height (h);
 				first_y_pos = std::min ((*t)->y_position (), first_y_pos);
-				within_selected = true;
-			} else if (within_selected) {
-				hide_track_in_display (*t);
+			} else {
+				if (i > selected_top && i < selected_bottom) {
+					hide_track_in_display (*t);
+				}
 			}
 		}
 	}
@@ -6863,6 +7354,8 @@ Editor::fit_tracks (TrackViewList & tracks)
 	vertical_adjustment.set_value (first_y_pos);
 
 	redo_visual_stack.push_back (current_visual_state (true));
+
+	visible_tracks_selector.set_text (_("Sel"));
 }
 
 void
@@ -6935,7 +7428,7 @@ Editor::toggle_region_mute ()
 
 		(*i)->region()->playlist()->clear_changes ();
 		(*i)->region()->set_muted (!(*i)->region()->muted ());
-		_session->add_command (new StatefulDiffCommand ((*i)->region()->playlist()));
+		_session->add_command (new StatefulDiffCommand ((*i)->region()));
 
 	}
 
@@ -7047,22 +7540,17 @@ Editor::lock ()
 
 		ArdourButton* b = manage (new ArdourButton);
 		b->set_name ("lock button");
-		b->set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("Click to unlock")));
+		b->set_text (_("Click to unlock"));
 		b->signal_clicked.connect (sigc::mem_fun (*this, &Editor::unlock));
 		lock_dialog->get_vbox()->pack_start (*b);
 		
 		lock_dialog->get_vbox()->show_all ();
 		lock_dialog->set_size_request (200, 200);
 	}
+
+	delete _main_menu_disabler;
+	_main_menu_disabler = new MainMenuDisabler;
 	
-#ifdef __APPLE__
-	/* The global menu bar continues to be accessible to applications
-	   with modal dialogs, which means that we need to desensitize
-	   all items in the menu bar. Since those items are really just
-	   proxies for actions, that means disabling all actions.
-	*/
-	ActionManager::disable_all_actions ();
-#endif
 	lock_dialog->present ();
 }
 
@@ -7071,11 +7559,45 @@ Editor::unlock ()
 {
 	lock_dialog->hide ();
 	
-#ifdef __APPLE__
-	ActionManager::pop_action_state ();
-#endif	
+	delete _main_menu_disabler;
 
 	if (ARDOUR_UI::config()->get_lock_gui_after_seconds()) {
 		start_lock_event_timing ();
 	}
 }
+
+void
+Editor::bring_in_callback (Gtk::Label* label, uint32_t n, uint32_t total, string name)
+{
+	Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&Editor::update_bring_in_message, this, label, n, total, name));
+}
+
+void
+Editor::update_bring_in_message (Gtk::Label* label, uint32_t n, uint32_t total, string name)
+{
+	label->set_text (string_compose ("Copying %1, %2 of %3", name, n, total));
+	Gtkmm2ext::UI::instance()->flush_pending ();
+}
+
+void
+Editor::bring_all_sources_into_session ()
+{
+	if (!_session) {
+		return;
+	}
+
+	Gtk::Label msg;
+	ArdourDialog w (_("Moving embedded files into session folder"));
+	w.get_vbox()->pack_start (msg);
+	w.present ();
+	
+	/* flush all pending GUI events because we're about to start copying
+	 * files
+	 */
+	
+	Gtkmm2ext::UI::instance()->flush_pending ();
+
+	cerr << " Do it\n";
+
+	_session->bring_all_sources_into_session (boost::bind (&Editor::bring_in_callback, this, &msg, _1, _2, _3));
+}