summaryrefslogtreecommitdiff
path: root/gtk2_ardour/monitor_section.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-10-02 07:32:49 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-10-02 07:32:56 -0400
commiteebbf64484f3b939b92b2d2dda75858c7c11b8e5 (patch)
treecf9fdbe8163cd632b0ad809834ec20dde9836e24 /gtk2_ardour/monitor_section.cc
parent5c63ed589c056a8e84fcaf6b0466d066bd6fd35b (diff)
provide Main/cancel-solo as an action and make rude solo button(s) use it
Diffstat (limited to 'gtk2_ardour/monitor_section.cc')
-rw-r--r--gtk2_ardour/monitor_section.cc17
1 files changed, 2 insertions, 15 deletions
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);
@@ -1080,20 +1081,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*)
{
if (_session) {