From 38a603910a111b6969997e6b53f563eee68181ab Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 20 Jan 2022 17:16:41 -0700 Subject: [PATCH] remove FollowAction type "QueuedTrigger" (GUI edition) --- gtk2_ardour/trigger_ui.cc | 9 --------- gtk2_ardour/triggerbox_ui.cc | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index ad4d52c82f..8058bccf1d 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -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::Stop))); 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::PrevTrigger))); 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) { dynamic_cast (&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 (&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)))); if (trigger ()->follow_action (0) == FollowAction::PrevTrigger) { dynamic_cast (&fitems.back ())->set_active (true); @@ -793,8 +786,6 @@ TriggerUI::follow_action_to_string (FollowAction const & fa) return _("Stop"); case FollowAction::Again: return _("Again"); - case FollowAction::QueuedTrigger: - return _("Queued"); case FollowAction::NextTrigger: return _("Next"); case FollowAction::PrevTrigger: diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index d19bb5f191..370e204039 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -259,16 +259,6 @@ TriggerEntry::draw_follow_icon (Cairo::RefPtr context, FollowAct context->fill (); break; - case FollowAction::QueuedTrigger: { - Glib::RefPtr 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: { for (int i = 0; i < 6; i++) { Cairo::Matrix m = context->get_matrix ();