diff --git a/gtk2_ardour/slot_properties_box.cc b/gtk2_ardour/slot_properties_box.cc index fafa42fa16..2f5d1e9021 100644 --- a/gtk2_ardour/slot_properties_box.cc +++ b/gtk2_ardour/slot_properties_box.cc @@ -362,6 +362,7 @@ SlotPropertyTable::probability_adjusted () bool SlotPropertyTable::follow_action_button_event (GdkEvent* ev) { +#if 0 /* ben to remove */ switch (ev->type) { case GDK_BUTTON_PRESS: trigger()->set_use_follow (!trigger()->use_follow()); @@ -370,7 +371,7 @@ SlotPropertyTable::follow_action_button_event (GdkEvent* ev) default: break; } - +#endif return false; } @@ -417,10 +418,6 @@ SlotPropertyTable::on_trigger_changed (PropertyChange const& pc) _quantize_button.set_active (quantize_length_to_string (bbo)); } - if (pc.contains (Properties::use_follow)) { - _follow_action_button.set_active_state (trigger()->use_follow() ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off); - } - if (pc.contains (Properties::follow_count)) { _follow_count_adjustment.set_value (trigger()->follow_count()); } diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index d50f2af0ee..d51a84244d 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -692,7 +692,6 @@ TriggerUI::set_follow_action (Trigger::FollowAction fa) trigger()->set_follow_action (fa, 0); trigger()->set_follow_action_probability (0); - trigger()->set_use_follow (true); } void @@ -851,7 +850,6 @@ TriggerUI::set_trigger (ARDOUR::TriggerReference tr) pc.add (Properties::name); pc.add (Properties::color); - pc.add (Properties::use_follow); pc.add (Properties::legato); pc.add (Properties::quantization); pc.add (Properties::launch_style); diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index dcfe3f5c58..11d4fdc376 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -491,7 +491,7 @@ TriggerEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtrregion () && trigger ()->use_follow ()) { + if (trigger ()->region () && trigger ()->will_follow ()) { context->set_identity_matrix (); context->translate (self.x0, self.y0 - 0.5); context->translate (width - height, 0); // right side of the widget @@ -519,7 +519,6 @@ TriggerEntry::on_trigger_changed (PropertyChange const& change) interesting_stuff.add (ARDOUR::Properties::launch_style); interesting_stuff.add (ARDOUR::Properties::follow_action0); interesting_stuff.add (ARDOUR::Properties::follow_action1); - interesting_stuff.add (ARDOUR::Properties::use_follow); interesting_stuff.add (ARDOUR::Properties::follow_action_probability); interesting_stuff.add (ARDOUR::Properties::follow_count); interesting_stuff.add (ARDOUR::Properties::isolated);