remove Route::listening_via_monitor()

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index bfd3ed10067c1dda7dd0531c725f7bed72314c58..126e3af99670696b9ec270c6cf423f302baf65c2 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1120,22 +1120,10 @@ RouteUI::solo_active_state (boost::shared_ptr<Route> r)
                return Gtkmm2ext::Off;
        }
 
-       if (Config->get_solo_control_is_listen_control()) {
-
-               if (r->listening_via_monitor()) {
-                       return Gtkmm2ext::ExplicitActive;
-               } else {
-                       return Gtkmm2ext::Off;
-               }
-
-       }
-
-       if (r->soloed()) {
-                if (!r->self_soloed()) {
-                        return Gtkmm2ext::ImplicitActive;
-                } else {
-                        return Gtkmm2ext::ExplicitActive;
-                }
+       if (r->self_soloed()) {
+               return Gtkmm2ext::ExplicitActive;
+       } else if (r->soloed_by_others()) {
+               return Gtkmm2ext::ImplicitActive;
        } else {
                return Gtkmm2ext::Off;
        }