From 3f47c7dcc505acccc1a6a5c6e77cbeeda1092188 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 11 Aug 2021 22:54:31 -0600 Subject: [PATCH] triggerbox (UI): changes required by 2 possible follow actions --- gtk2_ardour/triggerbox_ui.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc index 7b08328e7a..1007e9f180 100644 --- a/gtk2_ardour/triggerbox_ui.cc +++ b/gtk2_ardour/triggerbox_ui.cc @@ -288,39 +288,39 @@ TriggerBoxUI::context_menu (size_t n) MenuList& fitems = follow_menu->items(); fitems.push_back (CheckMenuElem (_("Stop"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::Stop))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::Stop) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::Stop) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("Again"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::Again))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::Again) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::Again) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("Queued"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::QueuedTrigger))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::QueuedTrigger) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::QueuedTrigger) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("Next"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::NextTrigger))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::NextTrigger) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::NextTrigger) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("Previous"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::PrevTrigger))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::PrevTrigger) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::PrevTrigger) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("First"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::FirstTrigger))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::FirstTrigger) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::FirstTrigger) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("Last"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::LastTrigger))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::LastTrigger) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::LastTrigger) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("Any"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::AnyTrigger))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::AnyTrigger) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::AnyTrigger) { dynamic_cast (&fitems.back ())->set_active (true); } fitems.push_back (CheckMenuElem (_("Other"), sigc::bind (sigc::mem_fun (*this, &TriggerBoxUI::set_follow_action), n, Trigger::OtherTrigger))); - if (_triggerbox.trigger (n)->follow_action() == Trigger::OtherTrigger) { + if (_triggerbox.trigger (n)->follow_action(0) == Trigger::OtherTrigger) { dynamic_cast (&fitems.back ())->set_active (true); } @@ -401,7 +401,7 @@ TriggerBoxUI::context_menu (size_t n) void TriggerBoxUI::set_follow_action (size_t n, Trigger::FollowAction fa) { - _triggerbox.trigger (n)->set_follow_action (fa); + _triggerbox.trigger (n)->set_follow_action (fa, 0); } void