smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

more consistency for mute/solo/rec-enable press including making ctrl-click work even if the route is not part of a group

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@14054 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-02-05 21:39:38 +00:00
parent ca697ee768
commit 7dd6b4c915
1 changed files with 48 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

59
gtk2_ardour/route_ui.cc
View file

@ -327,10 +327,9 @@ RouteUI::mute_press (GdkEventButton* ev)
* on a copy. * on a copy.
*/ */
boost::shared_ptr<RouteList> rl = _session->get_routes ();
boost::shared_ptr<RouteList> copy (new RouteList); boost::shared_ptr<RouteList> copy (new RouteList);
*copy = *rl; *copy = *_session->get_routes ();
for (RouteList::iterator i = copy->begin(); i != copy->end(); ) { for (RouteList::iterator i = copy->begin(); i != copy->end(); ) {
if ((*i)->is_master() || (*i)->is_monitor()) { if ((*i)->is_master() || (*i)->is_monitor()) {
@ -352,13 +351,20 @@ RouteUI::mute_press (GdkEventButton* ev)
NOTE: Primary-button2 is MIDI learn. NOTE: Primary-button2 is MIDI learn.
*/ */
boost::shared_ptr<RouteList> rl;
if (ev->button == 1 && _route->route_group()) { if (ev->button == 1) {
boost::shared_ptr<RouteList> rl = _route->route_group()->route_list(); if (_route->route_group()) {
if (_mute_release) { rl = _route->route_group()->route_list();
_mute_release->routes = rl;
if (_mute_release) {
_mute_release->routes = rl;
}
} else {
rl.reset (new RouteList);
rl->push_back (_route);
} }
_session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true); _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true);
@ -493,16 +499,30 @@ RouteUI::solo_press(GdkEventButton* ev)
NOTE: Primary-button2 is MIDI learn. NOTE: Primary-button2 is MIDI learn.
*/ */
if (ev->button == 1 && _route->route_group()) { /* Primary-button1 applies change to the mix group even if it is not active
NOTE: Primary-button2 is MIDI learn.
*/
if (_solo_release) { boost::shared_ptr<RouteList> rl;
_solo_release->routes = _route->route_group()->route_list();
if (ev->button == 1) {
if (_route->route_group()) {
rl = _route->route_group()->route_list();
if (_solo_release) {
_solo_release->routes = rl;
}
} else {
rl.reset (new RouteList);
rl->push_back (_route);
} }
if (Config->get_solo_control_is_listen_control()) { if (Config->get_solo_control_is_listen_control()) {
_session->set_listen (_route->route_group()->route_list(), !_route->listening_via_monitor(), Session::rt_cleanup, true); _session->set_listen (rl, !_route->listening_via_monitor(), Session::rt_cleanup, true);
} else { } else {
_session->set_solo (_route->route_group()->route_list(), !_route->self_soloed(), Session::rt_cleanup, true); _session->set_solo (rl, !_route->self_soloed(), Session::rt_cleanup, true);
} }
} }
@ -594,8 +614,21 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
/* Primary-button1 applies change to the route group (even if it is not active) /* Primary-button1 applies change to the route group (even if it is not active)
NOTE: Primary-button2 is MIDI learn. NOTE: Primary-button2 is MIDI learn.
*/ */
if (ev->button == 1 && _route->route_group()) {
_session->set_record_enabled (_route->route_group()->route_list(), !rec_enable_button->active_state(), Session::rt_cleanup, true); if (ev->button == 1) {
boost::shared_ptr<RouteList> rl;
if (_route->route_group()) {
rl = _route->route_group()->route_list();
} else {
rl.reset (new RouteList);
rl->push_back (_route);
}
_session->set_record_enabled (rl, !rec_enable_button->active_state(), Session::rt_cleanup, true);
} }
} else if (Keyboard::is_context_menu_event (ev)) { } else if (Keyboard::is_context_menu_event (ev)) {