From 7f962557221454f8ac0c6a9eb9c3d48ebf60b4fd Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 26 Jan 2022 10:12:03 -0700 Subject: [PATCH] triggerbox UI: catch up with method and property name changes from 528fd247 --- gtk2_ardour/slot_properties_box.cc | 12 ++++++------ gtk2_ardour/triggerbox_ui.cc | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/slot_properties_box.cc b/gtk2_ardour/slot_properties_box.cc index 9881d11511..eec7a8f264 100644 --- a/gtk2_ardour/slot_properties_box.cc +++ b/gtk2_ardour/slot_properties_box.cc @@ -411,7 +411,7 @@ SlotPropertyTable::velocity_adjusted () return; } - trigger()->set_midi_velocity_effect (_velocity_adjustment.get_value()); + trigger()->set_velocity_effect (_velocity_adjustment.get_value()); } void @@ -571,7 +571,7 @@ SlotPropertyTable::on_trigger_changed (PropertyChange const& pc) _legato_button.set_active_state (trigger()->legato() ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off); } - if (pc.contains (Properties::isolated)) { + if (pc.contains (Properties::cue_isolated)) { _isolate_button.set_active_state (trigger()->cue_isolated() ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off); } @@ -580,10 +580,10 @@ SlotPropertyTable::on_trigger_changed (PropertyChange const& pc) } if (pc.contains (Properties::follow_action0)) { - _follow_left.set_text (follow_action_to_string (trigger()->follow_action (0))); + _follow_left.set_text (follow_action_to_string (trigger()->follow_action0 ())); /* set widget sensitivity based on 'left' follow action */ - bool follow_widgets_sensitive = trigger()->follow_action (0).type != FollowAction::None; + bool follow_widgets_sensitive = trigger()->follow_action0 ().type != FollowAction::None; if (follow_widgets_sensitive) { _follow_right.set_sensitive(true); _follow_count_spinner.set_sensitive(true); @@ -610,11 +610,11 @@ SlotPropertyTable::on_trigger_changed (PropertyChange const& pc) } if (pc.contains (Properties::follow_action1)) { - _follow_right.set_text (follow_action_to_string (trigger()->follow_action (1))); + _follow_right.set_text (follow_action_to_string (trigger()->follow_action1 ())); } if (pc.contains (Properties::velocity_effect)) { - _velocity_adjustment.set_value (trigger()->midi_velocity_effect()); + _velocity_adjustment.set_value (trigger()->velocity_effect()); } if (pc.contains (Properties::follow_action_probability)) { diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index b1c4f74866..896ef29526 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -469,7 +469,7 @@ TriggerEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtrset_identity_matrix (); context->translate (self.x0, self.y0 - 0.5); context->translate (width - height, 0); // right side of the widget - draw_follow_icon (context, trigger ()->follow_action (0), height, scale); + draw_follow_icon (context, trigger ()->follow_action0 (), height, scale); context->set_identity_matrix (); } } @@ -495,7 +495,7 @@ TriggerEntry::on_trigger_changed (PropertyChange const& change) interesting_stuff.add (ARDOUR::Properties::follow_action1); interesting_stuff.add (ARDOUR::Properties::follow_action_probability); interesting_stuff.add (ARDOUR::Properties::follow_count); - interesting_stuff.add (ARDOUR::Properties::isolated); + interesting_stuff.add (ARDOUR::Properties::cue_isolated); interesting_stuff.add (ARDOUR::Properties::running); if (change.contains (interesting_stuff)) {