diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-08 16:49:47 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:40 -0400 |
commit | 653ae4acd639fef149314fe6f8c7a0d862afae40 (patch) | |
tree | ba32ff0efd9b105c207ad7e3b2e89d73e76b4355 /libs/surfaces/faderport/faderport.cc | |
parent | c107f1ab56270f4485ca2a787d575c2b5b53cfcf (diff) |
universal change in the design of the way Route/Track controls are designed and used. The controls now own their own state, rather than proxy for state in their owners.
Massive changes all over the code to accomodate this. Many things are not finished. Consider this a backup safety commit
Diffstat (limited to 'libs/surfaces/faderport/faderport.cc')
-rw-r--r-- | libs/surfaces/faderport/faderport.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index d08264a42d..1df2fc4865 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -507,7 +507,7 @@ FaderPort::fader_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb) single route at a time, allow the fader to modify the group, if appropriate. */ - _current_route->set_gain (val, Controllable::UseGroup); + _current_route->gain_control()->set_value (val, Controllable::UseGroup); } } } @@ -1147,7 +1147,7 @@ FaderPort::set_current_route (boost::shared_ptr<Route> r) boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (_current_route); if (t) { - t->RecordEnableChanged.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_recenable, this), this); + t->rec_enable_control()->Changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&FaderPort::map_recenable, this), this); } boost::shared_ptr<AutomationControl> control = _current_route->gain_control (); @@ -1227,7 +1227,7 @@ FaderPort::map_mute () if (_current_route->muted()) { stop_blinking (Mute); get_button (Mute).set_led_state (_output_port, true); - } else if (_current_route->muted_by_others()) { + } else if (_current_route->mute_control()->muted_by_others()) { start_blinking (Mute); } else { stop_blinking (Mute); @@ -1252,7 +1252,7 @@ FaderPort::map_recenable () { boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (_current_route); if (t) { - get_button (Rec).set_led_state (_output_port, t->record_enabled()); + get_button (Rec).set_led_state (_output_port, t->rec_enable_control()->get_value()); } else { get_button (Rec).set_led_state (_output_port, false); } |