From 83b942408295d7a85380595e89a62031fbffa437 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 4 Jul 2021 09:38:46 -0600 Subject: [PATCH] fix namespace error (post rebase conflict resolution) --- gtk2_ardour/marker.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index c224c71ffe..7cef154858 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -68,8 +68,8 @@ public: }; - ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type, - ARDOUR::timepos_t const & position, bool handle_events = true, RegionView* rv = 0); + ArdourMarker (PublicEditor& editor, ArdourCanvas::Item &, guint32 rgba, const std::string& text, Type, + Temporal::timepos_t const & position, bool handle_events = true, RegionView* rv = 0); virtual ~ArdourMarker ();