diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-02 16:42:32 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-02 16:42:50 -0500 |
commit | 2cb3343eec61232e626542b2a123f9df7fae6523 (patch) | |
tree | e629b5bfe588f3b25bad146e4297b0b849d79666 /libs | |
parent | 99a53ed7f0840fea95baec5bf91d6b766b4372e6 (diff) |
when looking up controllables via descriptors (e.g. generic MIDI control) use the new "well-known" route controllables
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/session_state.cc | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 13d1413b19..5ad9769ad6 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -3373,22 +3373,16 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) } case ControllableDescriptor::PanDirection: - { - c = r->pannable()->pan_azimuth_control; + c = r->pan_azimuth_control(); break; - } case ControllableDescriptor::PanWidth: - { - c = r->pannable()->pan_width_control; + c = r->pan_width_control(); break; - } case ControllableDescriptor::PanElevation: - { - c = r->pannable()->pan_elevation_control; + c = r->pan_elevation_control(); break; - } case ControllableDescriptor::Balance: /* XXX simple pan control */ @@ -3418,26 +3412,12 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc) break; } - case ControllableDescriptor::SendGain: - { + case ControllableDescriptor::SendGain: { uint32_t send = desc.target (0); - - /* revert to zero-based counting */ - if (send > 0) { --send; } - - boost::shared_ptr<Processor> p = r->nth_send (send); - - if (p) { - boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p); - boost::shared_ptr<Amp> a = s->amp(); - - if (a) { - c = s->amp()->gain_control(); - } - } + c = r->send_level_controllable (send); break; } |