diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-27 17:10:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-27 17:10:04 +0000 |
| commit | 47de938e998ffceb0d9cfa829b47dad721445dc9 (patch) | |
| tree | 4b45ec998720dca102820df648595a16d3c28dc6 /gtk2_ardour | |
| parent | a8e354ed7bb38f8be8bfdda33841f3f238e8bbab (diff) | |
add muted-by-other concept to solo support infrastructure
git-svn-id: svn://localhost/ardour2/branches/3.0@7005 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 816343a2cb..ae36ccba86 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -295,7 +295,7 @@ RouteUI::mute_press (GdkEventButton* ev) return true; } - _mute_release = new SoloMuteRelease (_route->muted ()); + _mute_release = new SoloMuteRelease (_route->self_muted ()); } if (ev->button == 1 || Keyboard::is_button2_event (ev)) { @@ -306,7 +306,7 @@ RouteUI::mute_press (GdkEventButton* ev) _mute_release->routes = _session->get_routes (); } - _session->set_mute (_session->get_routes(), !_route->muted()); + _session->set_mute (_session->get_routes(), !_route->self_muted()); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { @@ -319,7 +319,7 @@ RouteUI::mute_press (GdkEventButton* ev) _mute_release->routes = _session->get_routes (); } - _session->set_mute (_session->get_routes(), !_route->muted(), Session::rt_cleanup, true); + _session->set_mute (_session->get_routes(), !_route->self_muted(), Session::rt_cleanup, true); } } else { @@ -333,7 +333,7 @@ RouteUI::mute_press (GdkEventButton* ev) _mute_release->routes = rl; } - _session->set_mute (rl, !_route->muted()); + _session->set_mute (rl, !_route->self_muted()); } } @@ -390,7 +390,7 @@ RouteUI::solo_press(GdkEventButton* ev) return true; } - _solo_release = new SoloMuteRelease (_route->soloed()); + _solo_release = new SoloMuteRelease (_route->self_soloed()); } if (ev->button == 1 || Keyboard::is_button2_event (ev)) { @@ -406,7 +406,7 @@ RouteUI::solo_press(GdkEventButton* ev) if (Config->get_solo_control_is_listen_control()) { _session->set_listen (_session->get_routes(), !_route->listening(), Session::rt_cleanup, true); } else { - _session->set_solo (_session->get_routes(), !_route->soloed(), Session::rt_cleanup, true); + _session->set_solo (_session->get_routes(), !_route->self_soloed(), Session::rt_cleanup, true); } } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) { @@ -456,7 +456,7 @@ RouteUI::solo_press(GdkEventButton* ev) if (Config->get_solo_control_is_listen_control()) { _session->set_listen (_route->route_group()->route_list(), !_route->listening(), Session::rt_cleanup, true); } else { - _session->set_solo (_route->route_group()->route_list(), !_route->soloed(), Session::rt_cleanup, true); + _session->set_solo (_route->route_group()->route_list(), !_route->self_soloed(), Session::rt_cleanup, true); } } @@ -474,7 +474,7 @@ RouteUI::solo_press(GdkEventButton* ev) if (Config->get_solo_control_is_listen_control()) { _session->set_listen (rl, !_route->listening()); } else { - _session->set_solo (rl, !_route->soloed()); + _session->set_solo (rl, !_route->self_soloed()); } } } @@ -836,11 +836,10 @@ RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r) if (Config->get_show_solo_mutes()) { - if (r->muted ()) { + if (r->self_muted ()) { /* full mute */ return 2; - } else if (s->soloing() && !r->soloed() && !r->solo_isolated()) { - /* mute-because-not-soloed */ + } else if (r->muted_by_others()) { return 1; } else { /* no mute at all */ @@ -849,7 +848,7 @@ RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r) } else { - if (r->muted()) { + if (r->self_muted()) { /* full mute */ return 2; } else { |