From 1dc756142ca890f1f43508402a6ffeff389702a7 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 30 Dec 2021 12:20:17 -0600 Subject: [PATCH] trigger_ui: disambiguate set_triggerbox() from set_trigger() --- gtk2_ardour/mixer_strip.cc | 2 +- gtk2_ardour/trigger_master.cc | 2 +- gtk2_ardour/trigger_master.h | 2 +- gtk2_ardour/trigger_strip.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index ee38789e0a..0bfc21da8d 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -2135,7 +2135,7 @@ MixerStrip::hide_master_spacer (bool yn) void MixerStrip::set_trigger_display (boost::shared_ptr tb) { - _tmaster->set_trigger (tb); + _tmaster->set_triggerbox (tb); trigger_display.set_triggerbox (tb.get()); } diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc index a12beedd98..8cd222231a 100644 --- a/gtk2_ardour/trigger_master.cc +++ b/gtk2_ardour/trigger_master.cc @@ -231,7 +231,7 @@ TriggerMaster::~TriggerMaster () } void -TriggerMaster::set_trigger (boost::shared_ptr t) +TriggerMaster::set_triggerbox (boost::shared_ptr t) { _triggerbox = t; } diff --git a/gtk2_ardour/trigger_master.h b/gtk2_ardour/trigger_master.h index 4f0a6b7a48..35fc0b9d12 100644 --- a/gtk2_ardour/trigger_master.h +++ b/gtk2_ardour/trigger_master.h @@ -67,7 +67,7 @@ public: TriggerMaster (ArdourCanvas::Item* canvas); ~TriggerMaster (); - void set_trigger (boost::shared_ptr); + void set_triggerbox (boost::shared_ptr); void render (ArdourCanvas::Rect const&, Cairo::RefPtr) const; diff --git a/gtk2_ardour/trigger_strip.cc b/gtk2_ardour/trigger_strip.cc index 9e6fc2477e..70e6040e89 100644 --- a/gtk2_ardour/trigger_strip.cc +++ b/gtk2_ardour/trigger_strip.cc @@ -190,7 +190,7 @@ TriggerStrip::set_route (boost::shared_ptr rt) { RouteUI::set_route (rt); - _tmaster->set_trigger(_route->triggerbox ()); + _tmaster->set_triggerbox(_route->triggerbox ()); _processor_box.set_route (rt);