From c7e778bba010cde0715d19fdb99c109b8c9315a9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 21 Dec 2021 17:55:48 -0700 Subject: [PATCH] manual fixups for unresolved merge conflicts --- gtk2_ardour/triggerbox_ui.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index 309a7da417..7590c30224 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -253,8 +253,8 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr context, float sz, float margin = 4*scale; float size = sz - 2*margin; - if (_trigger.active()) { - if (_trigger.launch_style()==Trigger::Toggle) { + if (trigger()->active()) { + if (trigger()->launch_style()==Trigger::Toggle) { //clicking again will Stop this clip set_source_rgba (context, UIConfiguration::instance ().color ("neutral:foreground")); context->move_to (margin, margin); @@ -277,7 +277,7 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr context, float sz, set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground")); - if (!_trigger.region ()) { + if (!trigger()->region ()) { //no content in this slot, it is only a Stop button context->move_to (margin, margin); context->rel_line_to (size, 0); @@ -288,7 +288,7 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr context, float sz, return; //done } - switch (_trigger.launch_style()) { + switch (trigger()->launch_style()) { case Trigger::Toggle: case Trigger::OneShot: context->move_to (margin, margin);