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

remove muted-by-others, a concept that turns out to have been a red herring; add auditioning alert button to monitor section; start adding exclusive solo button to monitor section

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7052 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-05-04 16:39:03 +00:00
parent 823bad3049
commit bf6de6da77
10 changed files with 117 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/route_ui.cc
View file

@ -294,7 +294,7 @@ RouteUI::mute_press (GdkEventButton* ev)
return true;
}
_mute_release = new SoloMuteRelease (_route->self_muted ());
_mute_release = new SoloMuteRelease (_route->muted ());
}
if (ev->button == 1 || Keyboard::is_button2_event (ev)) {
@ -305,7 +305,7 @@ RouteUI::mute_press (GdkEventButton* ev)
_mute_release->routes = _session->get_routes ();
}
_session->set_mute (_session->get_routes(), !_route->self_muted());
_session->set_mute (_session->get_routes(), !_route->muted());
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
@ -318,7 +318,7 @@ RouteUI::mute_press (GdkEventButton* ev)
_mute_release->routes = _session->get_routes ();
}
_session->set_mute (_session->get_routes(), !_route->self_muted(), Session::rt_cleanup, true);
_session->set_mute (_session->get_routes(), !_route->muted(), Session::rt_cleanup, true);
}
} else {
@ -332,7 +332,7 @@ RouteUI::mute_press (GdkEventButton* ev)
_mute_release->routes = rl;
}
_session->set_mute (rl, !_route->self_muted());
_session->set_mute (rl, !_route->muted());
}
}
@ -835,7 +835,7 @@ RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r)
if (Config->get_show_solo_mutes()) {
if (r->self_muted ()) {
if (r->muted ()) {
/* full mute */
return 2;
} else if (s->soloing() && !r->soloed() && !r->solo_isolated()) {
@ -847,7 +847,7 @@ RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r)
} else {
if (r->self_muted()) {
if (r->muted()) {
/* full mute */
return 2;
} else {
@ -866,7 +866,7 @@ RouteUI::update_mute_display ()
return;
}
bool model = _route->self_muted();
bool model = _route->muted();
bool view = mute_button->get_active();
/* first make sure the button's "depressed" visual