From eebbf64484f3b939b92b2d2dda75858c7c11b8e5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 2 Oct 2015 07:32:49 -0400 Subject: provide Main/cancel-solo as an action and make rude solo button(s) use it --- gtk2_ardour/monitor_section.cc | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'gtk2_ardour/monitor_section.cc') diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 5335b3ee1c..aa5a85ac94 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -115,7 +115,8 @@ MonitorSection::MonitorSection (Session* s) Timers::blink_connect (sigc::mem_fun (*this, &MonitorSection::do_blink)); - rude_solo_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_solo), false); + act = ActionManager::get_action (X_("Main"), X_("cancel-solo")); + rude_solo_button.set_related_action (act); UI::instance()->set_tip (rude_solo_button, _("When active, something is soloed.\nClick to de-solo everything")); rude_iso_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_isolate), false); @@ -1079,20 +1080,6 @@ MonitorSection::solo_blink (bool onoff) } } -bool -MonitorSection::cancel_solo (GdkEventButton*) -{ - if (_session) { - if (_session->soloing()) { - _session->set_solo (_session->get_routes(), false); - } else if (_session->listening()) { - _session->set_listen (_session->get_routes(), false); - } - } - - return true; -} - bool MonitorSection::cancel_isolate (GdkEventButton*) { -- cgit v1.2.3