ardour/livetrax
13
0
Fork 0
Code

triggerbox: remove "use follow action" as an explicit property of a trigger (GUI edition, partial)

Browse Source
This commit is contained in:
Paul Davis 2022-01-14 17:32:09 -07:00
parent f339c0b5f9
commit 203017e2d5
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/slot_properties_box.cc
View File

@ -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());
}

2
gtk2_ardour/trigger_ui.cc
View File

@ -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);

3
gtk2_ardour/triggerbox_ui.cc
View File

@ -491,7 +491,7 @@ TriggerEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Conte
}
/* follow-action icon */
if (trigger ()->region () && 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);