X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=77dad5bf29de7806cd6caf7f6f2cd0f1aeefeefc;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=d79813ab352edb3f6626336c6d6cfdb28a02da98;hpb=f415e24514f74c8773e416e7917fdea07eebcf4a;p=ardour.git

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index d79813ab35..77dad5bf29 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"
@@ -74,11 +78,14 @@
 #include "gui_thread.h"
 #include "insert_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"
@@ -136,7 +143,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 
 	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;
 
@@ -212,14 +219,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();
@@ -229,21 +236,28 @@ 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 */
 	}
 
-	//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 ) {
-		selection->add ( pre_selected_regions );
-		selection->add (latest_regionviews);  //these are the new regions created after the split
+	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 ) {
+			selection->add ( pre_selected_regions );
+			selection->add (latest_regionviews);  //these are the new regions created after the split
+		}
+		_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;
 	}
-	_ignore_follow_edits = false;
 
+	commit_reversible_command ();
 }
 
 /** Move one extreme of the current range selection.  If more than one range is selected,
@@ -644,7 +658,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;
 	}
 
@@ -1365,7 +1379,7 @@ Editor::scroll_tracks_up_line ()
 bool
 Editor::scroll_down_one_track ()
 {
-	TrackViewList::reverse_iterator next = track_views.rbegin();
+	TrackViewList::reverse_iterator next = track_views.rend();
 	std::pair<TimeAxisView*,double> res;
 	const double top_of_trackviews = vertical_adjustment.get_value();
 
@@ -1374,10 +1388,6 @@ Editor::scroll_down_one_track ()
 			continue;
 		}
 
-		next = t;
-		if (next != track_views.rbegin()) {
-			--next; // moves "next" towards the lower/later tracks since it is a reverse iterator
-		}
 
 		/* If this is the upper-most visible trackview, we want to display
 		   the one above it (next)
@@ -1388,11 +1398,12 @@ Editor::scroll_down_one_track ()
 		if (res.first) {
 			break;
 		}
+		next = t;
 	}
 
 	/* move to the track below the first one that covers the */
 	
-	if (next != track_views.rbegin()) {
+	if (next != track_views.rend()) {
 		ensure_time_axis_view_is_visible (**next, true);
 		return true;
 	}
@@ -1531,7 +1542,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;
@@ -1638,14 +1649,14 @@ Editor::calc_extra_zoom_edges(framepos_t &start, framepos_t &end)
 	*/
 
 	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;
+	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;
@@ -1660,7 +1671,6 @@ Editor::calc_extra_zoom_edges(framepos_t &start, framepos_t &end)
 	}
 }
 
-
 void
 Editor::temporal_zoom_region (bool both_axes)
 {
@@ -1691,7 +1701,7 @@ Editor::temporal_zoom_region (bool both_axes)
 		return;
 	}
 
-	calc_extra_zoom_edges(start, end);
+	calc_extra_zoom_edges (start, end);
 
 	/* if we're zooming on both axes we need to save track heights etc.
 	 */
@@ -1752,7 +1762,7 @@ Editor::temporal_zoom_selection (bool both_axes)
 			fit_selected_tracks();
 
 	} else {
-		temporal_zoom_region(both_axes);
+		temporal_zoom_region (both_axes);
 	}
 
 
@@ -1800,9 +1810,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));
 
@@ -1924,12 +1934,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
@@ -1944,12 +1956,14 @@ 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
@@ -1964,7 +1978,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;
 
@@ -1982,7 +1997,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 ();
 		}
 	}
 }
@@ -1997,7 +2013,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) {
@@ -2011,7 +2028,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 */
@@ -2024,7 +2042,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;
@@ -2047,7 +2066,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 */
@@ -2103,12 +2123,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 ();
 	}
 }
 
@@ -2116,27 +2138,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
@@ -2702,6 +2727,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:
@@ -3827,44 +3853,21 @@ 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;
 
-	if (!selection->points.empty()) {
-		begin_reversible_command (opname + _(" points"));
-		did_edit = true;
-		cut_copy_points (op);
-		if (op == Cut || op == Delete) {
-			selection->clear_points ();
-		}
-	} else 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);
+	if (!selection->regions.empty() || !selection->points.empty()) {
+		begin_reversible_command (opname + ' ' + _("objects"));
 		did_edit = true;
 
 		if (!selection->regions.empty()) {
@@ -3891,7 +3894,7 @@ Editor::cut_copy (CutCopyOp op)
 			selection->set (start, end);
 		}
 	} else if (!selection->time.empty()) {
-		begin_reversible_command (opname + _(" range"));
+		begin_reversible_command (opname + ' ' + _("range"));
 
 		did_edit = true;
 		cut_copy_ranges (op);
@@ -3902,6 +3905,9 @@ Editor::cut_copy (CutCopyOp op)
 	}
 	
 	if (did_edit) {
+		/* reset repeated paste state */
+		paste_count    = 0;
+		last_paste_pos = 0;
 		commit_reversible_command ();	
 	}
 	
@@ -3911,10 +3917,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
 };
 
@@ -3922,7 +3929,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::MusicalTime earliest, bool midi)
 {
 	if (selection->points.empty ()) {
 		return;
@@ -3937,12 +3944,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);
 		}
 	}
 
@@ -3951,21 +3959,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::MusicalTime((*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::MusicalTime::max()) {
+				earliest = Evoral::MusicalTime();  // 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 */
@@ -4001,13 +4034,27 @@ Editor::cut_copy_points (CutCopyOp op)
 void
 Editor::cut_copy_midi (CutCopyOp op)
 {
+	Evoral::MusicalTime earliest = Evoral::MusicalTime::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) {
@@ -4030,6 +4077,8 @@ Editor::remove_clicked_region ()
 		return;
 	}
 
+	begin_reversible_command (_("remove region"));
+
 	boost::shared_ptr<Playlist> playlist = clicked_routeview->playlist();
 
 	playlist->clear_changes ();
@@ -4348,14 +4397,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) {
@@ -4363,45 +4406,102 @@ 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);
+	} 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;
+		}
+
+		/* Walk up to parent if necessary, so base track is a route. */
+		while (base_track->get_parent()) {
+			base_track = base_track->get_parent();
+		}
+
+		/* 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);
+			}
+		}
+
+		/* Sort tracks so the nth track of type T will pick the nth object of type T. */
+		sort_track_selection (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;
+			}
+
+			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;
+			}
+		}
+
+		/* 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, ... */
 	}
 
-	if (internal_editing ()) {
+	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. */
 
-		/* undo/redo is handled by individual tracks/regions */
+	    begin_reversible_command (Operations::paste);
 
-		for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) {
+	    PasteContext ctx(paste_count, times, ItemCounts(), true);
+	    ts.front()->paste (position, *cut_buffer, ctx);
 
-			RegionSelection rs;
-			RegionSelection::iterator r;
-			MidiNoteSelection::iterator cb;
+	    commit_reversible_command ();
 
-			get_regions_at (rs, position, ts);
+	} else if (internal_editing ()) {
 
-			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;
-				}
+		/* undo/redo is handled by individual tracks/regions */
+
+		RegionSelection rs;
+		get_regions_at (rs, position, ts);
+
+		PasteContext ctx(paste_count, times, ItemCounts(), false);
+		for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) {
+			MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*r);
+			if (mrv) {
+				mrv->paste (position, *cut_buffer, ctx);
 			}
 		}
 
@@ -4411,8 +4511,9 @@ Editor::paste_internal (framepos_t position, float times)
 
 		begin_reversible_command (Operations::paste);
 
-		for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) {
-			(*i)->paste (position, times, *cut_buffer, nth);
+		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 ();
@@ -4452,11 +4553,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
@@ -4800,8 +4901,8 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv
 	vector<Evoral::Sequence<Evoral::MusicalTime>::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::MusicalTime pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
 
 	return op (mrv.midi_region()->model(), pos_beats, v);
 }
@@ -4914,7 +5015,7 @@ Editor::quantize_region ()
 	qd->hide ();
 
 	if (r == Gtk::RESPONSE_OK) {
-		Quantize quant (*_session, qd->snap_start(), qd->snap_end(),
+		Quantize quant (qd->snap_start(), qd->snap_end(),
 				qd->start_grid_size(), qd->end_grid_size(),
 				qd->strength(), qd->swing(), qd->threshold());
 
@@ -4922,6 +5023,36 @@ Editor::quantize_region ()
 	}
 }
 
+void
+Editor::legatize_region (bool shrink_only)
+{
+	int selected_midi_region_cnt = 0;
+
+	if (!_session) {
+		return;
+	}
+
+	RegionSelection rs = get_regions_from_selection_and_entered ();
+
+	if (rs.empty()) {
+		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;
+	}
+
+	Legatize legatize(shrink_only);
+	apply_midi_note_edit_op (legatize);
+}
+
 void
 Editor::insert_patch_change (bool from_context)
 {
@@ -4939,7 +5070,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::MusicalTime> empty (Evoral::MusicalTime(), 0, 0, 0);
         PatchChangeDialog d (0, _session, empty, first->instrument_info(), Gtk::Stock::ADD);
 
 	if (d.run() == RESPONSE_CANCEL) {
@@ -5053,8 +5184,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) {
@@ -5065,8 +5196,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
@@ -5106,8 +5237,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) {
@@ -5116,8 +5247,8 @@ Editor::toggle_gain_envelope_active ()
 			_session->add_command (new StatefulDiffCommand (arv->region()));
 		}
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -5133,15 +5264,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
@@ -5157,15 +5288,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
@@ -5181,16 +5312,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
@@ -5206,15 +5337,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
@@ -5786,6 +5917,34 @@ Editor::set_punch_from_selection ()
 	set_punch_range (start, end,  _("set punch range from selection"));
 }
 
+void
+Editor::set_session_extents_from_selection ()
+{
+	if (_session == 0 || selection->time.empty()) {
+		return;
+	}
+
+	begin_reversible_command (_("set session start/stop from selection"));
+
+	framepos_t start = selection->time[clicked_selection].start;
+	framepos_t end = selection->time[clicked_selection].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();
+
+		_session->set_session_extents ( start, end );
+
+		XMLNode &after = loc->get_state();
+
+		_session->add_command (new MementoCommand<Location>(*loc, &before, &after));
+
+		commit_reversible_command ();
+	}
+}
+
 void
 Editor::set_punch_from_edit_range ()
 {
@@ -5994,8 +6153,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;
@@ -6012,8 +6171,8 @@ Editor::split_region_at_transients ()
 
 		i = tmp;
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 
 }
 
@@ -6201,14 +6360,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
@@ -6236,8 +6395,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();
@@ -6260,8 +6419,8 @@ Editor::snap_regions_to_grid ()
 		(*i)->thaw();
 		used_playlists.pop_front();
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -6319,8 +6478,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;
 
@@ -6359,8 +6518,8 @@ Editor::close_region_gaps ()
 		(*i)->thaw();
 		used_playlists.pop_front();
 	}
-
-	_session->commit_reversible_command ();
+	
+	commit_reversible_command ();
 }
 
 void
@@ -6453,7 +6612,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);
 	}
 }
@@ -6469,7 +6628,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);
 	}
 }
@@ -6565,6 +6724,7 @@ edit your ardour.rc file to set the\n\
 		return;
 	}
 
+	// XXX should be using gettext plural forms, maybe?
 	if (ntracks > 1) {
 		trackstr = _("tracks");
 	} else {
@@ -6591,7 +6751,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);
 	}
 
@@ -6967,7 +7127,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()));
 
 	}