smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Bug Fix 43117. Shortcut used on Record Enable button makes all tracks Record Enabled. Also fixed the same bug for Input monitoring and Mute buttons.

Browse source 
[Reviewed] GZharun
This commit is contained in:
Nikolay 2014-12-26 13:44:51 +02:00
parent c6af1bb9f9
commit 630e8a7dba
1 changed files with 2 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gtk2_ardour/route_ui.cc
View file

@ -395,36 +395,7 @@ RouteUI::mute_press (GdkEventButton* ev)
multiple_mute_change = false;
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
/* toggle mute on everything (but
* exclude the master and monitor)
*
* because we are going to erase
* elements of the list we need to work
* on a copy.
*/
boost::shared_ptr<RouteList> copy (new RouteList);
*copy = *_session->get_routes ();
for (RouteList::iterator i = copy->begin(); i != copy->end(); ) {
if ((*i)->is_master() || (*i)->is_monitor()) {
i = copy->erase (i);
} else {
++i;
}
}
if (_mute_release) {
_mute_release->routes = copy;
}
DisplaySuspender ds;
_session->set_mute (copy, !_route->muted());
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
/* Primary-button1 applies change to the mix group even if it is not active
@ -575,11 +546,6 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
// do nothing on midi sigc::bind event
return rec_enable_button.on_button_press_event (ev);
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
DisplaySuspender ds;
_session->set_record_enabled (_session->get_routes(), !rec_enable_button.active_state());
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
/* Primary-button1 applies change to the route group (even if it is not active)
@ -699,10 +665,7 @@ RouteUI::monitor_press (GdkEventButton* ev, MonitorChoice monitor_choice)
mc = monitor_choice;
}
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
rl = _session->get_routes ();
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
if (_route->route_group() && _route->route_group()->is_monitoring()) {
rl = _route->route_group()->route_list();
} else {