From bb8ddc4322e376c9a5687feecfd74b0c2f59f7e2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 25 Nov 2016 11:50:08 +0000 Subject: [PATCH] remove redundant (identical) 2nd conditional, and improve comment --- libs/ardour/session.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index b00c8a1d8f..3bf61cac26 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3839,21 +3839,13 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: self %2 masters %3 transition %4\n", route->name(), route->self_soloed(), route->solo_control()->get_masters_value(), route->solo_control()->transitioned_into_solo())); if (route->solo_control()->transitioned_into_solo() == 0) { - /* route solo changed by upstream/downstream; not interesting + /* route solo changed by upstream/downstream or clear all solo state; not interesting to Session. */ DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 not self-soloed nor soloed by master (%2), ignoring\n", route->name(), route->solo_control()->get_masters_value())); return; } - if (route->solo_control()->transitioned_into_solo() == 0) { - /* reason for being soloed changed (e.g. master went away, we - * took over the master state), but actual status did - * not. nothing to do. - */ - DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: solo change was change in reason, not status\n", route->name())); - } - boost::shared_ptr r = routes.reader (); int32_t delta = route->solo_control()->transitioned_into_solo ();