From 03bfb91aff4808e4ceb185917d76f10bdaafce40 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 4 Jul 2021 09:39:08 -0600 Subject: [PATCH] fix argument name (post rebase conflict resolution) --- gtk2_ardour/marker.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index b2a1a5dd01..fdda34b748 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -70,8 +70,8 @@ void ArdourMarker::setup_sizes(const double timebar_height) marker_height = floor (timebar_height) - 2; } -ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation, - Type type, timepos_t const & pos, bool handle_events, RegionView* rc) +ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint32 rgba, const string& annotation, + Type type, timepos_t const & pos, bool handle_events, RegionView* rv) : editor (ed) , _parent (&parent)