X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=5a6bf5dbbe0e57d941cdb9e4c286830da2e62073;hb=37937d9c698e5fe9ce0f1857f3256dead43f3ebc;hp=3d2773b87965edf77a057fcad8e7480f25c498d6;hpb=47c4929bc285da6d752e68aa5a32cf73f20b9f22;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 3d2773b879..5a6bf5dbbe 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -23,6 +23,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
+#include "pbd/error.h"
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
 
@@ -48,6 +49,7 @@
 #include "point_selection.h"
 #include "control_point.h"
 #include "utils.h"
+#include "item_counts.h"
 
 #include "i18n.h"
 
@@ -120,8 +122,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 
 	CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
 	_base_rect->set_x1 (ArdourCanvas::COORD_MAX);
-	_base_rect->set_outline_color (ARDOUR_UI::config()->get_AutomationTrackOutline());
-	_base_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); // bottom separator
+	_base_rect->set_outline (false);
 	_base_rect->set_fill_color (ARDOUR_UI::config()->get_AutomationTrackFill());
 	_base_rect->set_data ("trackview", this);
 	_base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this));
@@ -631,48 +632,43 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when,
 	_session->set_dirty ();
 }
 
-/** Paste a selection.
- *  @param pos Position to paste to (session frames).
- *  @param times Number of times to paste.
- *  @param selection Selection to paste.
- *  @param nth Index of the AutomationList within the selection to paste from.
- */
 bool
-AutomationTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth)
+AutomationTimeAxisView::paste (framepos_t pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts)
 {
-	boost::shared_ptr<AutomationLine> line;
-
 	if (_line) {
-		line = _line;
+		return paste_one (pos, paste_count, times, selection, counts);
 	} else if (_view) {
-		line = _view->paste_line (pos);
-	}
-
-	if (!line) {
-		return false;
+		AutomationSelection::const_iterator l = selection.lines.get_nth(_parameter, counts.n_lines(_parameter));
+		if (l != selection.lines.end() && _view->paste (pos, paste_count, times, *l)) {
+			counts.increase_n_lines(_parameter);
+			return true;
+		}
 	}
 
-	return paste_one (*line, pos, times, selection, nth);
+	return false;
 }
 
 bool
-AutomationTimeAxisView::paste_one (AutomationLine& line, framepos_t pos, float times, Selection& selection, size_t nth)
+AutomationTimeAxisView::paste_one (framepos_t pos, unsigned paste_count, float times, const Selection& selection, ItemCounts& counts)
 {
-	AutomationSelection::iterator p;
-	boost::shared_ptr<AutomationList> alist(line.the_list());
+	boost::shared_ptr<AutomationList> alist(_line->the_list());
 
 	if (_session->transport_rolling() && alist->automation_write()) {
 		/* do not paste if this control is in write mode and we're rolling */
 		return false;
 	}
 
-	for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {}
-
+	/* Get appropriate list from selection. */
+	AutomationSelection::const_iterator p = selection.lines.get_nth(_parameter, counts.n_lines(_parameter));
 	if (p == selection.lines.end()) {
 		return false;
 	}
+	counts.increase_n_lines(_parameter);
+
+	/* add multi-paste offset if applicable */
+	pos += _editor.get_paste_offset(pos, paste_count, (*p)->length());
 
-	double const model_pos = line.time_converter().from (pos - line.time_converter().origin_b ());
+	double const model_pos = _line->time_converter().from (pos - _line->time_converter().origin_b ());
 
 	XMLNode &before = alist->get_state();
 	alist->paste (**p, model_pos, times);
@@ -881,15 +877,17 @@ AutomationTimeAxisView::lines () const
 string
 AutomationTimeAxisView::state_id() const
 {
-	if (_control) {
+	if (_automatable != _route && _control) {
 		return string_compose ("automation %1", _control->id().to_s());
-	} else {
-		assert (_parameter);
+	} else if (_parameter) {
 		return string_compose ("automation %1 %2/%3/%4", 
 				       _route->id(), 
 				       _parameter.type(),
 				       _parameter.id(),
 				       (int) _parameter.channel());
+	} else {
+		error << "Automation time axis has no state ID" << endmsg;
+		return "";
 	}
 }