From 49117791572b6ce2ccc2732db1389a49ee47a930 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 12 Feb 2021 10:49:26 -0700 Subject: [PATCH] manual fixups after a rebase against master --- gtk2_ardour/automation_region_view.cc | 4 ++-- gtk2_ardour/editor_drag.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 4616b20bbd..bad4a36a4a 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -1,4 +1,4 @@ -n/* +/* * Copyright (C) 2007-2015 David Robillard * Copyright (C) 2008-2017 Paul Davis * Copyright (C) 2009-2011 Carl Hetherington @@ -215,7 +215,7 @@ AutomationRegionView::add_automation_event (GdkEvent *, timepos_t const & w, dou XMLNode& before = _line->the_list()->get_state(); -n if (_line->the_list()->editor_add (when, y, with_guard_points)) { + if (_line->the_list()->editor_add (when, y, with_guard_points)) { if (ac->automation_state () == ARDOUR::Off) { ac->set_automation_state (ARDOUR::Play); diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index f0a0650f59..36a872314d 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -5468,7 +5468,7 @@ RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred) do_deselect = false; } } else if ((atv = dynamic_cast(_editor->clicked_axisview)) != 0) { - samplepos_t where = grab_sample (); + timepos_t where = grab_time (); atv->add_automation_event (event, where, event->button.y, false); do_deselect = false; }