smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

triggerbox: CAS-based property updating GUI editing

Browse source 
Follow actions are now set by two distinct methods, not one
This commit is contained in:
Paul Davis 2022-01-25 18:07:13 -07:00
parent ccf90a9181
commit b6f37f11be
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/cuebox_ui.cc
View file

@ -379,7 +379,7 @@ CueBoxUI::set_all_follow_action (FollowAction const & fa, uint64_t idx)
TriggerList tl; TriggerList tl;
get_slots(tl, idx); get_slots(tl, idx);
for (TriggerList::iterator t = tl.begin(); t != tl.end(); ++t) { for (TriggerList::iterator t = tl.begin(); t != tl.end(); ++t) {
(*t)->set_follow_action(fa, 0); (*t)->set_follow_action0 (fa);
(*t)->set_follow_action_probability(0); (*t)->set_follow_action_probability(0);
} }
} }

6
gtk2_ardour/slot_properties_box.cc
View file

@ -511,7 +511,11 @@ SlotPropertyTable::set_follow_action (FollowAction const & fa, uint64_t idx)
return; return;
} }
trigger()->set_follow_action (fa, idx); if (idx == 0) {
trigger()->set_follow_action0 (fa);
} else {
trigger()->set_follow_action1 (fa);
}
} }
void void

6
gtk2_ardour/trigger_ui.cc
View file

@ -559,7 +559,7 @@ TriggerUI::launch_context_menu ()
items.push_back (MenuElem (_("Quantization..."), *quant_menu)); items.push_back (MenuElem (_("Quantization..."), *quant_menu));
items.push_back (CheckMenuElem (_("Cue Isolate"), sigc::mem_fun (*this, &TriggerUI::toggle_trigger_isolated))); items.push_back (CheckMenuElem (_("Cue Isolate"), sigc::mem_fun (*this, &TriggerUI::toggle_trigger_isolated)));
if (trigger ()->scene_isolated ()) { if (trigger ()->cue_isolated ()) {
PBD::Unwinder<bool> uw (_ignore_menu_action, true); PBD::Unwinder<bool> uw (_ignore_menu_action, true);
dynamic_cast<Gtk::CheckMenuItem*> (&items.back ())->set_active (true); dynamic_cast<Gtk::CheckMenuItem*> (&items.back ())->set_active (true);
} }
@ -616,7 +616,7 @@ TriggerUI::toggle_trigger_isolated ()
return; return;
} }
trigger()->set_scene_isolated (!trigger()->scene_isolated ()); trigger()->set_cue_isolated (!trigger()->cue_isolated ());
} }
void void
@ -645,7 +645,7 @@ TriggerUI::set_follow_action (FollowAction const & fa)
return; return;
} }
trigger()->set_follow_action (fa, 0); trigger()->set_follow_action0 (fa);
trigger()->set_follow_action_probability (0); trigger()->set_follow_action_probability (0);
} }

2
gtk2_ardour/triggerbox_ui.cc
View file

@ -432,7 +432,7 @@ TriggerEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Conte
render_children (area, context); render_children (area, context);
if (trigger ()->scene_isolated ()) { if (trigger ()->cue_isolated ()) {
/* left shadow */ /* left shadow */
context->set_identity_matrix (); context->set_identity_matrix ();
context->translate (self.x0, self.y0 - 0.5); context->translate (self.x0, self.y0 - 0.5);