diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-02 07:32:49 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-02 07:32:56 -0400 |
| commit | eebbf64484f3b939b92b2d2dda75858c7c11b8e5 (patch) | |
| tree | cf9fdbe8163cd632b0ad809834ec20dde9836e24 /gtk2_ardour/ardour_ui2.cc | |
| parent | 5c63ed589c056a8e84fcaf6b0466d066bd6fd35b (diff) | |
provide Main/cancel-solo as an action and make rude solo button(s) use it
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 116cfc95a3..d63fb0ac21 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -324,7 +324,8 @@ ARDOUR_UI::setup_transport () /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */ solo_alert_button.set_name ("rude solo"); - solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false); + act = ActionManager::get_action (X_("Main"), X_("cancel-solo")); + solo_alert_button.set_related_action (act); auditioning_alert_button.set_name ("rude audition"); auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false); feedback_alert_button.set_name ("feedback alert"); @@ -528,19 +529,6 @@ ARDOUR_UI::audition_alert_press (GdkEventButton*) } bool -ARDOUR_UI::solo_alert_press (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 ARDOUR_UI::feedback_alert_press (GdkEventButton *) { return true; |