From bae4bbfc0c6cf84ecea274b73e821c03722563c1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 18 Dec 2021 23:18:47 +0100 Subject: [PATCH] Resolve more ambiguous `Rect` (fixes macOS build) --- gtk2_ardour/trigger_master.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc index 45f2e73662..b543f3b246 100644 --- a/gtk2_ardour/trigger_master.cc +++ b/gtk2_ardour/trigger_master.cc @@ -75,13 +75,13 @@ Loopster::set_fraction (float f) } void -Loopster::render (Rect const& area, Cairo::RefPtr context) const +Loopster::render (ArdourCanvas::Rect const& area, Cairo::RefPtr context) const { /* Note that item_to_window() already takes _position into account (as * part of item_to_canvas() */ - Rect self (item_to_window (_rect)); - const Rect draw = self.intersection (area); + ArdourCanvas::Rect self (item_to_window (_rect)); + ArdourCanvas::Rect const draw = self.intersection (area); if (!draw) { return; @@ -141,13 +141,13 @@ PassThru::set_enabled (bool e) } void -PassThru::render (Rect const& area, Cairo::RefPtr context) const +PassThru::render (ArdourCanvas::Rect const& area, Cairo::RefPtr context) const { /* Note that item_to_window() already takes _position into account (as * part of item_to_canvas() */ - Rect self (item_to_window (_rect)); - const Rect draw = self.intersection (area); + ArdourCanvas::Rect self (item_to_window (_rect)); + ArdourCanvas::Rect const draw = self.intersection (area); if (!draw) { return; @@ -236,13 +236,13 @@ TriggerMaster::set_trigger (boost::shared_ptr t) } void -TriggerMaster::render (Rect const& area, Cairo::RefPtr context) const +TriggerMaster::render (ArdourCanvas::Rect const& area, Cairo::RefPtr context) const { /* Note that item_to_window() already takes _position into account (as * part of item_to_canvas() */ - Rect self (item_to_window (_rect)); - const Rect draw = self.intersection (area); + ArdourCanvas::Rect self (item_to_window (_rect)); + ArdourCanvas::Rect const draw = self.intersection (area); if (!draw) { return; @@ -564,13 +564,13 @@ CueMaster::~CueMaster () } void -CueMaster::render (Rect const& area, Cairo::RefPtr context) const +CueMaster::render (ArdourCanvas::Rect const& area, Cairo::RefPtr context) const { /* Note that item_to_window() already takes _position into account (as part of item_to_canvas() */ - Rect self (item_to_window (_rect)); - const Rect draw = self.intersection (area); + ArdourCanvas::Rect self (item_to_window (_rect)); + ArdourCanvas::Rect const draw = self.intersection (area); if (!draw) { return;