diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-08 23:29:17 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:40 -0400 |
| commit | c660703f95a269a7f312e84564345f8961cb7e75 (patch) | |
| tree | f09c8dc32e0afc1ed0fc2715d82697f2a82c06c4 /libs/ardour/route.cc | |
| parent | 74f8a812765ba197173489407e4d30b0b4f94d66 (diff) | |
redesign control slave/master system, move code from GainControl to AutomationControl
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 5332a70036..641bc8ef83 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -5892,13 +5892,13 @@ Route::slaved_to (boost::shared_ptr<VCA> vca) const return false; } - return _gain_control->slaved_to (vca); + return _gain_control->slaved_to (vca->gain_control()); } void Route::vca_assign (boost::shared_ptr<VCA> vca) { - _gain_control->add_master (vca); + _gain_control->add_master (vca->gain_control()); vca->add_solo_target (shared_from_this()); vca->add_mute_target (shared_from_this()); } @@ -5911,7 +5911,7 @@ Route::vca_unassign (boost::shared_ptr<VCA> vca) _gain_control->clear_masters (); /* XXXX need to remove from solo/mute target lists */ } else { - _gain_control->remove_master (vca); + _gain_control->remove_master (vca->gain_control()); vca->remove_solo_target (shared_from_this()); vca->remove_mute_target (shared_from_this()); } |