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

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 47e24470c4..2d26a90a86 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -50,6 +50,7 @@
 #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"
@@ -75,7 +76,7 @@
 #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"
@@ -83,6 +84,8 @@
 #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"
@@ -94,6 +97,7 @@
 #include "strip_silence_dialog.h"
 #include "time_axis_view.h"
 #include "transpose_dialog.h"
+#include "transform_dialog.h"
 
 #include "i18n.h"
 
@@ -118,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 ();
 	}
 }
 
@@ -130,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 ();
 	}
 }
 
@@ -216,14 +230,14 @@ 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)));
 	}
 	
-	latest_regionviews.clear ();
-
 	while (used_playlists.size() > 0) {
 		list <boost::shared_ptr<Playlist > >::iterator i = used_playlists.begin();
 		(*i)->thaw();
@@ -233,22 +247,51 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 	for (vector<sigc::connection>::iterator c = region_added_connections.begin(); c != region_added_connections.end(); ++c) {
 		(*c).disconnect ();
 	}
-	
-	commit_reversible_command ();
 
 	if (frozen){
 		EditorThaw(); /* Emit Signal */
 	}
 
-	if (ARDOUR::Profile->get_mixbus()) {
-		//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;  its not practical or wanted to follow this edit
-		if( working_on_selection ) {
+	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,
@@ -1368,10 +1411,9 @@ 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 top_of_trackviews = vertical_adjustment.get_value();
 
 	for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) {
@@ -1379,14 +1421,51 @@ Editor::scroll_down_one_track ()
 			continue;
 		}
 
-
 		/* If this is the upper-most visible trackview, we want to display
-		   the one above it (next)
-		*/
-
-		res = (*t)->covers_y_position (top_of_trackviews);
+		 * 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 = t;
@@ -1403,10 +1482,9 @@ Editor::scroll_down_one_track ()
 }	
 
 bool
-Editor::scroll_up_one_track ()
+Editor::scroll_up_one_track (bool skip_child_views)
 {
 	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) {
@@ -1415,10 +1493,55 @@ Editor::scroll_up_one_track ()
 			continue;
 		}
 
-		/* find the trackview at the top of the trackview group */
-		res = (*t)->covers_y_position (top_of_trackviews);
+		/* 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) {
+			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;
 		}
 
@@ -1426,7 +1549,23 @@ Editor::scroll_up_one_track ()
 	}
 	
 	if (prev != track_views.end()) {
-		ensure_time_axis_view_is_visible (**prev, true);
+		// 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;
 	}
 
@@ -1669,29 +1808,9 @@ Editor::temporal_zoom_region (bool both_axes)
 	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()));
-	}
-
-	if ((start == 0 && end == 0) || end < start) {
+	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.
@@ -1728,35 +1847,73 @@ Editor::temporal_zoom_region (bool both_axes)
 	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 (bool both_axes)
 {
 	if (!selection) return;
 
-	//if a range is selected, zoom to that
-	if (!selection->time.empty()) {
+	//ToDo:  if notes are selected, zoom to that
 
-		framepos_t start = selection->time.start();
-		framepos_t end = selection->time.end_frame();
+	//ToDo:  if control points are selected, zoom to that
 
-		calc_extra_zoom_edges(start, end);
+	//if region(s) are selected, zoom to that
+	if ( !selection->regions.empty() )
+		temporal_zoom_region (both_axes);
 
-		temporal_zoom_by_frame (start, end);
+	//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_selected_tracks();
-
-	} else {
-		temporal_zoom_region (both_axes);
+			fit_selection();
 	}
 
-
 }
 
 void
@@ -1873,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;
 	}
@@ -1925,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
@@ -1945,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
@@ -1965,7 +2174,8 @@ Editor::remove_location_at_playhead_cursor ()
 	if (_session) {
 
 		//set up for undo
-		_session->begin_reversible_command (_("remove marker"));
+		begin_reversible_command (_("remove marker"));
+		
 		XMLNode &before = _session->locations()->get_state();
 		bool removed = false;
 
@@ -1983,7 +2193,8 @@ Editor::remove_location_at_playhead_cursor ()
 		if (removed) {
 			XMLNode &after = _session->locations()->get_state();
 			_session->add_command(new MementoCommand<Locations>(*(_session->locations()), &before, &after));
-			_session->commit_reversible_command ();
+			
+			commit_reversible_command ();
 		}
 	}
 }
@@ -1998,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) {
@@ -2012,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 */
@@ -2025,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;
@@ -2048,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 */
@@ -2104,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 ();
 	}
 }
 
@@ -2117,27 +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();
 
 		_session->locations()->clear_ranges ();
 
 		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
@@ -2263,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);
@@ -2284,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
@@ -2301,7 +2525,7 @@ Editor::get_preroll ()
 void
 Editor::maybe_locate_with_edit_preroll ( framepos_t location )
 {
-	if ( _session->transport_rolling() || !Config->get_follow_edits() || _ignore_follow_edits )
+	if ( _session->transport_rolling() || !ARDOUR_UI::config()->get_follow_edits() || _ignore_follow_edits )
 		return;
 
 	location -= get_preroll();
@@ -2321,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;
@@ -2643,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);
@@ -2703,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:
@@ -3641,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
@@ -3828,20 +4059,15 @@ 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;
@@ -3909,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;
@@ -3938,31 +4164,45 @@ Editor::cut_copy_points (CutCopyOp op)
 		/* This operation will involve putting things in the cut buffer, so create an empty
 		   ControlList for each of our source lists to put the cut buffer data in.
 		*/
-		framepos_t start = std::numeric_limits<framepos_t>::max();
 		for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) {
-			i->second.copy = i->first->create (i->first->parameter ());
-
-			/* Calculate earliest start position of any point in selection. */
-			start = std::min(start, i->second.line->session_position(i->first->begin()));
+			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 ();
+			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. */
-		snap_to(start, RoundDownMaybe);
+		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 is relative to the earliest
 			   start time, so relative ordering between points is preserved
-			   when copying from several lists. */
-			const AutomationLine* line        = i->second.line;
-			const double          line_offset = line->time_converter().from(start);
-
+			   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 -= line_offset;
 			}
@@ -4000,9 +4240,13 @@ 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 = 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 */
@@ -4011,7 +4255,7 @@ Editor::cut_copy_midi (CutCopyOp op)
 	}
 
 	if (!selection->points.empty()) {
-		cut_copy_points (op);
+		cut_copy_points (op, earliest, true);
 		if (op == Cut || op == Delete) {
 			selection->clear_points ();
 		}
@@ -4039,6 +4283,8 @@ Editor::remove_clicked_region ()
 		return;
 	}
 
+	begin_reversible_command (_("remove region"));
+
 	boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
 
 	playlist->clear_changes ();
@@ -4335,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
@@ -4386,7 +4632,7 @@ Editor::paste_internal (framepos_t position, float times)
 		sort_track_selection (ts);
 	} else {
 		/* Figure out which track to base the paste at. */
-		TimeAxisView* base_track;
+		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;
@@ -4396,6 +4642,9 @@ Editor::paste_internal (framepos_t position, float times)
 		} 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;
 		}
 
 		/* Walk up to parent if necessary, so base track is a route. */
@@ -4435,34 +4684,27 @@ Editor::paste_internal (framepos_t position, float times)
 		   R1.A1, R1.A2, R2, R2.A1, ... */
 	}
 
-	if (internal_editing ()) {
-
-		/* undo/redo is handled by individual tracks/regions */
+	begin_reversible_command (Operations::paste);
 
-		RegionSelection rs;
-		get_regions_at (rs, position, ts);
+	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. */
 
-		ItemCounts counts;
-		for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
-			MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*r);
-			if (mrv) {
-				mrv->paste (position, paste_count, times, *cut_buffer, counts);
-			}
-		}
+	    PasteContext ctx(paste_count, times, ItemCounts(), true);
+	    ts.front()->paste (position, *cut_buffer, ctx);
 
 	} else {
 
-		/* we do redo (do you do voodoo?) */
-
-		begin_reversible_command (Operations::paste);
+		/* Paste into tracks */
 
-		ItemCounts counts;
+		PasteContext ctx(paste_count, times, ItemCounts(), false);
 		for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) {
-			(*i)->paste (position, paste_count, times, *cut_buffer, counts);
+			(*i)->paste (position, *cut_buffer, ctx);
 		}
-
-		commit_reversible_command ();
 	}
+
+	commit_reversible_command ();
 }
 
 void
@@ -4498,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
@@ -4533,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;
@@ -4675,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 */
@@ -4694,7 +4942,6 @@ Editor::normalize_region ()
 
 			if (a == -1) {
 				/* the user cancelled the operation */
-				set_canvas_cursor (current_canvas_cursor);
 				return;
 			}
 
@@ -4725,7 +4972,6 @@ Editor::normalize_region ()
 	}
 
 	commit_reversible_command ();
-	set_canvas_cursor (current_canvas_cursor);
 }
 
 
@@ -4840,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);
@@ -4896,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(); ) {
@@ -4923,61 +5165,100 @@ Editor::fork_region ()
 	}
 
 	commit_reversible_command ();
-
-	set_canvas_cursor (current_canvas_cursor);
 }
 
 void
 Editor::quantize_region ()
 {
-	int selected_midi_region_cnt = 0;
-
-	if (!_session) {
-		return;
+	if (_session) {
+		quantize_regions(get_regions_from_selection_and_entered ());
 	}
+}
 
-	RegionSelection rs = get_regions_from_selection_and_entered ();
-
-	if (rs.empty()) {
+void
+Editor::quantize_regions (const RegionSelection& rs)
+{
+	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++;
-		}
-	}
-
-	if (selected_midi_region_cnt == 0) {
-		return;
+	if (!quantize_dialog) {
+		quantize_dialog = new QuantizeDialog (*this);
 	}
 
-	QuantizeDialog* qd = new QuantizeDialog (*this);
-
-	qd->present ();
-	const int r = qd->run ();
-	qd->hide ();
+	quantize_dialog->present ();
+	const int r = quantize_dialog->run ();
+	quantize_dialog->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());
+		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);
+		apply_midi_note_edit_op (quant, rs);
 	}
 }
 
 void
-Editor::insert_patch_change (bool from_context)
+Editor::legatize_region (bool shrink_only)
 {
-	RegionSelection rs = get_regions_from_selection_and_entered ();
+	if (_session) {
+		legatize_regions(get_regions_from_selection_and_entered (), shrink_only);
+	}
+}
 
-	if (rs.empty ()) {
+void
+Editor::legatize_regions (const RegionSelection& rs, bool shrink_only)
+{
+	if (rs.n_midi_regions() == 0) {
 		return;
 	}
 
-	const framepos_t p = get_preferred_edit_position (false, from_context);
+	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 ());
+	}
+}
+
+void
+Editor::transform_regions (const RegionSelection& rs)
+{
+	if (rs.n_midi_regions() == 0) {
+		return;
+	}
+
+	TransformDialog* td = new TransformDialog();
+
+	td->present();
+	const int r = td->run();
+	td->hide();
+
+	if (r == Gtk::RESPONSE_OK) {
+		Transform transform(td->get());
+		apply_midi_note_edit_op(transform, rs);
+	}
+}
+
+void
+Editor::insert_patch_change (bool from_context)
+{
+	RegionSelection rs = get_regions_from_selection_and_entered ();
+
+	if (rs.empty ()) {
+		return;
+	}
+
+	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
@@ -4985,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) {
@@ -5013,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;
@@ -5066,7 +5347,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 				
 				_session->add_command(new StatefulDiffCommand (playlist));
 			} else {
-				goto out;
+				return;
 			}
 
 			if (progress) {
@@ -5079,9 +5360,6 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress
 	}
 
 	commit_reversible_command ();
-
-  out:
-	set_canvas_cursor (current_canvas_cursor);
 }
 
 void
@@ -5099,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) {
@@ -5111,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
@@ -5152,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) {
@@ -5162,8 +5440,8 @@ Editor::toggle_gain_envelope_active ()
 			_session->add_command (new StatefulDiffCommand (arv->region()));
 		}
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5179,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
@@ -5203,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
@@ -5227,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
@@ -5252,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
@@ -5658,27 +5936,33 @@ Editor::set_playhead_cursor ()
 		}
 	}
 
-	if ( Config->get_follow_edits() )
+	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 {
@@ -5752,64 +6036,28 @@ Editor::select_prev_route()
 
 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_locate (start, true);
-		_session->request_play_loop (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_locate (start, true);
-		_session->request_play_loop (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"));
 
@@ -5822,53 +6070,52 @@ Editor::set_loop_from_region (bool play)
 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 );
+
+		XMLNode &after = loc->get_state();
+
+		begin_reversible_command (_("set session start/end from selection"));
 
-	set_punch_range (start, end,  _("set punch range from edit range"));
+		_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"));
 }
@@ -6040,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;
@@ -6058,8 +6305,8 @@ Editor::split_region_at_transients ()
 
 		i = tmp;
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 
 }
 
@@ -6247,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
@@ -6282,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();
@@ -6306,8 +6553,8 @@ Editor::snap_regions_to_grid ()
 		(*i)->thaw();
 		used_playlists.pop_front();
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -6365,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;
 
@@ -6405,8 +6652,8 @@ Editor::close_region_gaps ()
 		(*i)->thaw();
 		used_playlists.pop_front();
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -6556,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);
 
@@ -6611,19 +6875,9 @@ edit your ardour.rc file to set the\n\
 		return;
 	}
 
-	// XXX should be using gettext plural forms, maybe?
-	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"
@@ -6678,7 +6932,7 @@ Editor::do_insert_time ()
 		return;
 	}
 
-	InsertTimeDialog d (*this);
+	InsertRemoveTimeDialog d (*this);
 	int response = d.run ();
 
 	if (response != RESPONSE_OK) {
@@ -6782,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 ();
+				}
 			}
 		}
 
@@ -6820,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);
@@ -6886,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 */
 
@@ -6899,36 +7313,36 @@ Editor::fit_tracks (TrackViewList & tracks)
 		}
 	}
 
-	bool prev_was_selected = false;
-	bool is_selected = tracks.contains (all.front());
-	bool next_is_selected;
-
-	for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t) {
-
-		TrackViewList::iterator next;
-
-		next = t;
-		++next;
 
-		if (next != all.end()) {
-			next_is_selected = tracks.contains (*next);
-		} else {
-			next_is_selected = false;
+	// 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;
+			}
 		}
+	}
 
+	i = 0;
+	for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t, ++i) {
 		if ((*t)->marked_for_display ()) {
-			if (is_selected) {
+			if (tracks.contains(*t)) {
 				(*t)->set_height (h);
 				first_y_pos = std::min ((*t)->y_position (), first_y_pos);
 			} else {
-				if (prev_was_selected && next_is_selected) {
+				if (i > selected_top && i < selected_bottom) {
 					hide_track_in_display (*t);
 				}
 			}
 		}
-
-		prev_was_selected = is_selected;
-		is_selected = next_is_selected;
 	}
 
 	/*
@@ -7014,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()));
 
 	}
 
@@ -7133,15 +7547,10 @@ Editor::lock ()
 		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 ();
 }
 
@@ -7150,9 +7559,7 @@ 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 ();