diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-04 16:39:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-04 16:39:03 +0000 |
| commit | bf6de6da77ca8fdeda6e92ae5adffd0a9f14da1c (patch) | |
| tree | c6547d77a1f70fc725611f8fc668dd176e1919a5 /gtk2_ardour/route_ui.cc | |
| parent | 823bad30497b67508ed4031232049ba2f9920941 (diff) | |
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
git-svn-id: svn://localhost/ardour2/branches/3.0@7052 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index f3430ccc4a..851a96da5a 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -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 |