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

remove FollowAction type "QueuedTrigger" (GUI edition)

Browse source
This commit is contained in:
Paul Davis 2022-01-20 17:16:41 -07:00
parent bbdfc5e777
commit 38a603910a
2 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/trigger_ui.cc
View file

@ -79,7 +79,6 @@ TriggerUI::TriggerUI ()
follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::None))); follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::None)));
follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::Stop))); follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::Stop)));
follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::Again))); follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::Again)));
follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::QueuedTrigger)));
follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::NextTrigger))); follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::NextTrigger)));
follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::PrevTrigger))); follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::PrevTrigger)));
follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::ForwardTrigger))); follow_strings.push_back (follow_action_to_string (FollowAction (FollowAction::ForwardTrigger)));
@ -604,12 +603,6 @@ TriggerUI::follow_context_menu ()
if (trigger ()->follow_action (0) == FollowAction::Again) { if (trigger ()->follow_action (0) == FollowAction::Again) {
dynamic_cast<Gtk::CheckMenuItem*> (&fitems.back ())->set_active (true); dynamic_cast<Gtk::CheckMenuItem*> (&fitems.back ())->set_active (true);
} }
#if QUEUED_SLOTS_IMPLEMENTED
fitems.push_back (RadioMenuElem (fagroup, TriggerUI::follow_action_to_string(FollowAction (FollowAction::QueuedTrigger)), sigc::bind(sigc::mem_fun (*this, &TriggerUI::set_follow_action), FollowAction (FollowAction::QueuedTrigger))));
if (trigger ()->follow_action (0) == FollowAction::QueuedTrigger) {
dynamic_cast<Gtk::CheckMenuItem*> (&fitems.back ())->set_active (true);
}
#endif
fitems.push_back (RadioMenuElem (fagroup, TriggerUI::follow_action_to_string(FollowAction (FollowAction::PrevTrigger)), sigc::bind(sigc::mem_fun (*this, &TriggerUI::set_follow_action), FollowAction (FollowAction::PrevTrigger)))); fitems.push_back (RadioMenuElem (fagroup, TriggerUI::follow_action_to_string(FollowAction (FollowAction::PrevTrigger)), sigc::bind(sigc::mem_fun (*this, &TriggerUI::set_follow_action), FollowAction (FollowAction::PrevTrigger))));
if (trigger ()->follow_action (0) == FollowAction::PrevTrigger) { if (trigger ()->follow_action (0) == FollowAction::PrevTrigger) {
dynamic_cast<Gtk::CheckMenuItem*> (&fitems.back ())->set_active (true); dynamic_cast<Gtk::CheckMenuItem*> (&fitems.back ())->set_active (true);
@ -793,8 +786,6 @@ TriggerUI::follow_action_to_string (FollowAction const & fa)
return _("Stop"); return _("Stop");
case FollowAction::Again: case FollowAction::Again:
return _("Again"); return _("Again");
case FollowAction::QueuedTrigger:
return _("Queued");
case FollowAction::NextTrigger: case FollowAction::NextTrigger:
return _("Next"); return _("Next");
case FollowAction::PrevTrigger: case FollowAction::PrevTrigger:

10
gtk2_ardour/triggerbox_ui.cc
View file

@ -259,16 +259,6 @@ TriggerEntry::draw_follow_icon (Cairo::RefPtr<Cairo::Context> context, FollowAct
context->fill (); context->fill ();
break; break;
case FollowAction::QueuedTrigger: {
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
layout->set_font_description (UIConfiguration::instance ().get_SmallMonospaceFont ());
layout->set_text (icon == FollowAction::AnyTrigger ? "&" : "@");
int tw, th;
layout->get_pixel_size (tw, th);
context->move_to (size / 2, size / 2);
context->rel_move_to (-tw / 2, -th / 2);
layout->show_in_cairo_context (context);
} break;
case FollowAction::AnyTrigger: { case FollowAction::AnyTrigger: {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
Cairo::Matrix m = context->get_matrix (); Cairo::Matrix m = context->get_matrix ();