X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fautomation_region_view.cc;h=5c9fc767dfa04354713d853602e495295ce01e7b;hb=44e88a2d54e04d29e462246d1988280e03ce7304;hp=3662307c61eaa3aebd5ebd501e92fc7cab31e026;hpb=549de1f298ad777febe201c6c50e2303a6ca0c4d;p=ardour.git

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 3662307c61..5c9fc767df 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -17,21 +17,23 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <utility>
+
 #include "pbd/memento_command.h"
+
 #include "ardour/automation_control.h"
 #include "ardour/event_type_map.h"
-#include "ardour/session.h"
-#include "ardour/source.h"
 #include "ardour/midi_automation_list_binder.h"
 #include "ardour/midi_region.h"
+#include "ardour/session.h"
 
 #include "automation_region_view.h"
+#include "editing.h"
+#include "editor.h"
+#include "editor_drag.h"
 #include "gui_thread.h"
-#include "public_editor.h"
 #include "midi_automation_line.h"
-#include "editor_drag.h"
-#include "editor.h"
-#include "editing.h"
+#include "public_editor.h"
 
 #include "i18n.h"
 
@@ -84,11 +86,10 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
 				trackview, *get_canvas_group(), list,
 				boost::dynamic_pointer_cast<ARDOUR::MidiRegion> (_region),
 				_parameter,
-				&_time_converter));
+				&_source_relative_time_converter));
 	_line->set_colors();
 	_line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
-	_line->show();
-	_line->show_all_control_points();
+	_line->set_visibility (AutomationLine::VisibleAspects (AutomationLine::Line|AutomationLine::ControlPoints));
 	_line->set_maximum_time (_region->length());
 	_line->set_offset (_region->start ());
 }
@@ -101,7 +102,7 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
 	if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) {
 
 		/* XXX: icky dcast to Editor */
-		e.drags()->set (new RubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
+		e.drags()->set (new EditorRubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
 
 	} else if (ev->type == GDK_BUTTON_RELEASE) {
 
@@ -116,10 +117,10 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
 		automation_view()->canvas_display()->w2i (x, y);
 
 		/* clamp y */
-		y = max (y, 0.0);
-		y = min (y, _height - NAME_HIGHLIGHT_SIZE);
+		y = std::max (y, 0.0);
+		y = std::min (y, _height - NAME_HIGHLIGHT_SIZE);
 
-		add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position(), y);
+		add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position() + _region->start(), y);
 	}
 
 	return false;
@@ -147,6 +148,10 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
 	const double h = trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2;
 	y = 1.0 - (y / h);
 
+	/* snap frame */
+
+	when = snap_frame_to_frame (when - _region->start ()) + _region->start ();
+
 	/* map using line */
 
 	double when_d = when;