diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-09 13:12:23 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:40 -0400 |
| commit | 4b365931066a5e25f0aceba4bdb3d919296066b4 (patch) | |
| tree | 1d1b756c17dc25d930076c4732e3c38a7ad35833 /libs/surfaces/faderport | |
| parent | 1c0c9b40b73180537da7630b6a219baf85886da6 (diff) | |
fix faderport and mackie to use route AutomationControls to be notified about solo/mute changes
Diffstat (limited to 'libs/surfaces/faderport')
| -rw-r--r-- | libs/surfaces/faderport/faderport.cc | 15 | ||||
| -rw-r--r-- | libs/surfaces/faderport/faderport.h | 1 |
2 files changed, 2 insertions, 14 deletions
diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index 5f5a1a1bcc..d08264a42d 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -1142,9 +1142,8 @@ FaderPort::set_current_route (boost::shared_ptr<Route> r) if (_current_route) { _current_route->DropReferences.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::drop_current_route, this), this); - _current_route->mute_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_mute, this), this); - _current_route->solo_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_solo, this), this); - _current_route->listen_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_listen, this), this); + _current_route->mute_control()->Changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_mute, this), this); + _current_route->solo_control()->Changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_solo, this), this); boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (_current_route); if (t) { @@ -1249,16 +1248,6 @@ FaderPort::map_solo () } void -FaderPort::map_listen () -{ - if (_current_route) { - get_button (Solo).set_led_state (_output_port, _current_route->listening_via_monitor()); - } else { - get_button (Solo).set_led_state (_output_port, false); - } -} - -void FaderPort::map_recenable () { boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (_current_route); diff --git a/libs/surfaces/faderport/faderport.h b/libs/surfaces/faderport/faderport.h index 2706f912c6..10bd23e618 100644 --- a/libs/surfaces/faderport/faderport.h +++ b/libs/surfaces/faderport/faderport.h @@ -304,7 +304,6 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq void map_route_state (); void map_solo (); - void map_listen (); void map_mute (); bool rec_enable_state; void map_recenable (); |