diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-21 02:02:13 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:41 -0400 |
| commit | 5b5e64d860f40c949cf58d75de81fc86914f1baa (patch) | |
| tree | fcbd51677863e0a0cf5468dde8e489865b93d72a /libs/surfaces | |
| parent | 01bba9f91054db7655c8eca42901f7c579b4bd24 (diff) | |
remove Route::listening_via_monitor()
This is better tested with direct use of the solo_control and
Config->get_solo_controls_are_listen_controls()
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/faderport/faderport.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/faderport/operations.cc | 10 | ||||
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index 1cc47b52e1..3d549348f4 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -1241,7 +1241,7 @@ void FaderPort::map_solo () { if (_current_route) { - get_button (Solo).set_led_state (_output_port, _current_route->soloed() || _current_route->listening_via_monitor()); + get_button (Solo).set_led_state (_output_port, _current_route->soloed()); } else { get_button (Solo).set_led_state (_output_port, false); } diff --git a/libs/surfaces/faderport/operations.cc b/libs/surfaces/faderport/operations.cc index 592b26da23..ec60727392 100644 --- a/libs/surfaces/faderport/operations.cc +++ b/libs/surfaces/faderport/operations.cc @@ -141,15 +141,7 @@ FaderPort::solo () return; } - bool yn; - - if (Config->get_solo_control_is_listen_control()) { - yn = !_current_route->listening_via_monitor(); - } else { - yn = !_current_route->soloed(); - } - - _current_route->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::UseGroup); + _current_route->solo_control()->set_value (_current_route->soloed() ? 0.0 : 1.0, PBD::Controllable::UseGroup); } void diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 0062c3b4fb..9c3fc21bda 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -285,7 +285,7 @@ void Strip::notify_solo_changed () { if (_route && _solo) { - _surface->write (_solo->set_state ((_route->soloed() || _route->listening_via_monitor()) ? on : off)); + _surface->write (_solo->set_state (_route->soloed() ? on : off)); } } |