X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fautomation_region_view.cc;h=ce1cd1498d281b2d57ae1f2eac24c85aaa7e1787;hb=0bb0dbad6808a48e3e05f279476c462d8fd9483d;hp=b418d096f22e1e2c7726740b7af66b5efe54761b;hpb=15819f0896795b269811805546ea7621cb9ca213;p=ardour.git

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index b418d096f2..ce1cd1498d 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -29,7 +29,6 @@
 
 #include "gtkmm2ext/keyboard.h"
 
-#include "ardour_ui.h"
 #include "automation_region_view.h"
 #include "editing.h"
 #include "editor.h"
@@ -37,8 +36,9 @@
 #include "gui_thread.h"
 #include "midi_automation_line.h"
 #include "public_editor.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 AutomationRegionView::AutomationRegionView (ArdourCanvas::Container*                  parent,
                                             AutomationTimeAxisView&                   time_axis,
@@ -52,6 +52,8 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Container*
 	, _source_relative_time_converter(region->session().tempo_map(), region->position() - region->start())
 	, _parameter(param)
 {
+	TimeAxisViewItem::set_position (_region->position(), this);
+
 	if (list) {
 		assert(list->parameter() == param);
 		create_line(list);
@@ -66,6 +68,7 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Container*
 
 AutomationRegionView::~AutomationRegionView ()
 {
+	in_destructor = true;
 	RegionViewGoingAway (this); /* EMIT_SIGNAL */
 }
 
@@ -109,11 +112,11 @@ AutomationRegionView::get_fill_color() const
 	                              trackview.editor().internal_editing() ? "editable region" :
 	                              "midi frame base");
 	if (_selected) {
-		return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
-	} else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-		return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name);
+		return UIConfiguration::instance().color_mod ("selected region base", mod_name);
+	} else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) {
+		return UIConfiguration::instance().color_mod ("midi frame base", mod_name);
 	}
-	return ARDOUR_UI::config()->color_mod (fill_color, mod_name);
+	return UIConfiguration::instance().color_mod (fill_color, mod_name);
 }
 
 void
@@ -180,24 +183,25 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
 
 	/* snap frame */
 
-	when = snap_frame_to_frame (when - _region->start ()) + _region->start ();
+	when = snap_frame_to_frame (when - _region->start ()).frame + _region->start ();
 
 	/* map using line */
 
 	double when_d = when;
 	_line->view_to_model_coord (when_d, y);
 
-	view->editor().begin_reversible_command (_("add automation event"));
 	XMLNode& before = _line->the_list()->get_state();
 
-	_line->the_list()->editor_add (when_d, y, with_guard_points);
+	if (_line->the_list()->editor_add (when_d, y, with_guard_points)) {
+		view->editor().begin_reversible_command (_("add automation event"));
 
-	XMLNode& after = _line->the_list()->get_state();
+		XMLNode& after = _line->the_list()->get_state();
 
-	view->session()->add_command (new MementoCommand<ARDOUR::AutomationList> (_line->memento_command_binder(), &before, &after));
-	view->editor().commit_reversible_command ();
+		view->session()->add_command (new MementoCommand<ARDOUR::AutomationList> (_line->memento_command_binder(), &before, &after));
+		view->editor().commit_reversible_command ();
 
-	view->session()->set_dirty ();
+		view->session()->set_dirty ();
+	}
 }
 
 bool
@@ -206,6 +210,8 @@ AutomationRegionView::paste (framepos_t                                      pos
                              float                                           times,
                              boost::shared_ptr<const ARDOUR::AutomationList> slist)
 {
+	using namespace ARDOUR;
+
 	AutomationTimeAxisView* const             view    = automation_view();
 	boost::shared_ptr<ARDOUR::AutomationList> my_list = _line->the_list();
 
@@ -214,15 +220,24 @@ AutomationRegionView::paste (framepos_t                                      pos
 		return false;
 	}
 
+	AutomationType src_type = (AutomationType)slist->parameter().type ();
+	double len = slist->length();
+
 	/* add multi-paste offset if applicable */
-	pos += view->editor().get_paste_offset(
-		pos, paste_count, _source_relative_time_converter.to(slist->length()));
+	if (parameter_is_midi (src_type)) {
+		// convert length to samples (incl tempo-ramps)
+		len = DoubleBeatsFramesConverter (view->session()->tempo_map(), pos).to (len * paste_count);
+		pos += view->editor ().get_paste_offset (pos, paste_count > 0 ? 1 : 0, len);
+	} else {
+		pos += view->editor ().get_paste_offset (pos, paste_count, len);
+	}
 
-	const double model_pos = _source_relative_time_converter.from(
+	/* convert sample-position to model's unit and position */
+	const double model_pos = _source_relative_time_converter.from (
 		pos - _source_relative_time_converter.origin_b());
 
 	XMLNode& before = my_list->get_state();
-	my_list->paste(*slist, model_pos, times);
+	my_list->paste(*slist, model_pos, DoubleBeatsFramesConverter (view->session()->tempo_map(), pos));
 	view->session()->add_command(
 		new MementoCommand<ARDOUR::AutomationList>(_line->memento_command_binder(), &before, &my_list->get_state()));