diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-21 11:03:14 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-22 11:58:31 -0500 |
| commit | 9e5b7db89f381c70232fab35dc21fd885863f998 (patch) | |
| tree | 2300e2211267c9e09f06e4948965d86b5a7bf3fa /libs/surfaces/faderport | |
| parent | eee07ac351cbdc5ade3d8ceed5de2df7f19a6217 (diff) | |
first compiling, mostly working version of group controls changes
Diffstat (limited to 'libs/surfaces/faderport')
| -rw-r--r-- | libs/surfaces/faderport/faderport.cc | 17 | ||||
| -rw-r--r-- | libs/surfaces/faderport/faderport.h | 6 |
2 files changed, 11 insertions, 12 deletions
diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index 50250a5f13..a1ca393d73 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -1107,9 +1107,9 @@ 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, _1), this); - _current_route->solo_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_solo, this, _1, _2, _3), this); - _current_route->listen_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_listen, this, _1, _2), 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); boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (_current_route); if (t) { @@ -1187,7 +1187,7 @@ FaderPort::map_cut () } void -FaderPort::map_mute (void*) +FaderPort::map_mute () { if (_current_route) { if (_current_route->muted()) { @@ -1204,7 +1204,7 @@ FaderPort::map_mute (void*) } void -FaderPort::map_solo (bool, void*, bool) +FaderPort::map_solo () { if (_current_route) { get_button (Solo).set_led_state (_output_port, _current_route->soloed() || _current_route->listening_via_monitor()); @@ -1214,7 +1214,7 @@ FaderPort::map_solo (bool, void*, bool) } void -FaderPort::map_listen (void*, bool) +FaderPort::map_listen () { if (_current_route) { get_button (Solo).set_led_state (_output_port, _current_route->listening_via_monitor()); @@ -1292,8 +1292,7 @@ FaderPort::map_route_state () stop_blinking (Solo); get_button (Rec).set_led_state (_output_port, false); } else { - /* arguments to these map_*() methods are all ignored */ - map_solo (false, 0, false); + map_solo (); map_recenable (); map_gain (); map_auto (); @@ -1301,7 +1300,7 @@ FaderPort::map_route_state () if (_current_route == session->monitor_out()) { map_cut (); } else { - map_mute (0); + map_mute (); } } } diff --git a/libs/surfaces/faderport/faderport.h b/libs/surfaces/faderport/faderport.h index 025cf09e00..d0a4d915f0 100644 --- a/libs/surfaces/faderport/faderport.h +++ b/libs/surfaces/faderport/faderport.h @@ -302,9 +302,9 @@ class FaderPort : public ARDOUR::ControlProtocol, public AbstractUI<FaderPortReq PBD::ScopedConnectionList route_connections; void map_route_state (); - void map_solo (bool,void*,bool); - void map_listen (void*,bool); - void map_mute (void*); + void map_solo (); + void map_listen (); + void map_mute (); void map_recenable (); void map_gain (); void map_cut (); |