From 84d33f3ec35bdebe22708196e3285a3d9b84f249 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 6 Dec 2020 16:33:50 -0700 Subject: [PATCH] manual fixups after rebase against master (GUI edition) --- gtk2_ardour/automation_region_view.cc | 2 +- gtk2_ardour/editor_drag.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index cd5014bac5..cc29d5fb44 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -202,7 +202,7 @@ AutomationRegionView::add_automation_event (GdkEvent *, timepos_t const & w, dou assert (mc); y = mc->user_double (); } else { - y = c->list()->eval (when_d); + y = c->list()->eval (when); } } diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index e2784caf25..e8a1270da0 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -627,7 +627,7 @@ public: void finished (GdkEvent *, bool); void aborted (bool); - void setup_pointer_sample_offset (); + void setup_pointer_offset (); bool allow_vertical_autoscroll () const { return false;