diff options
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/route.h | 4 | ||||
| -rw-r--r-- | libs/ardour/audio_track.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 14 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index a57610ab98..e3eec71078 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -142,8 +142,8 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou void shift (framepos_t, framecnt_t); - void set_gain (gain_t val, void *src); - void inc_gain (gain_t delta, void *src); + void set_gain (gain_t val, PBD::Controllable::GroupControlDisposition); + void inc_gain (gain_t delta); void set_trim (gain_t val, void *src); diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index f5d5207cc6..47746ffe31 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -629,7 +629,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt) /* reset stuff that has already been accounted for in the freeze process */ - set_gain (GAIN_COEFF_UNITY, this); + set_gain (GAIN_COEFF_UNITY, Controllable::NoGroup); _amp->gain_control()->set_automation_state (Off); /* XXX need to use _main_outs _panner->set_automation_state (Off); */ diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index a23af603de..c07612f125 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -387,7 +387,7 @@ Route::ensure_track_or_route_name(string name, Session &session) } void -Route::inc_gain (gain_t factor, void *src) +Route::inc_gain (gain_t factor) { /* To be used ONLY when doing group-relative gain adjustment, from * ::set_gain() @@ -404,9 +404,9 @@ Route::inc_gain (gain_t factor, void *src) } void -Route::set_gain (gain_t val, void *src) +Route::set_gain (gain_t val, Controllable::GroupControlDisposition group_override) { - if (src != 0 && _route_group && src != _route_group && _route_group->is_active() && _route_group->is_gain()) { + if (_route_group && (group_override != Controllable::NoGroup) && _route_group->is_active() && _route_group->is_gain()) { if (_route_group->is_relative()) { @@ -441,11 +441,11 @@ Route::set_gain (gain_t val, void *src) } } - _route_group->foreach_route (boost::bind (&Route::inc_gain, _1, factor, _route_group)); + _route_group->foreach_route (boost::bind (&Route::inc_gain, _1, factor)); } else { - _route_group->foreach_route (boost::bind (&Route::set_gain, _1, val, _route_group)); + _route_group->foreach_route (boost::bind (&Route::set_gain, _1, val, Controllable::NoGroup)); } return; @@ -3894,14 +3894,14 @@ Route::set_latency_compensation (framecnt_t longest_session_latency) } void -Route::set_control (AutomationType type, double val, PBD::Controllable::GroupControlDisposition /*group_override*/) +Route::set_control (AutomationType type, double val, PBD::Controllable::GroupControlDisposition group_override) { boost::shared_ptr<RouteList> rl; switch (type) { case GainAutomation: /* route must mediate group control */ - set_gain (val, this); /* any "src" argument will do other than our route group */ + set_gain (val, group_override); return; break; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index c20a7709ce..3da7f6c071 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2880,7 +2880,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod // 0 for Stereo Out mode // 0 Multi Out mode if (Config->get_output_auto_connect() & AutoConnectMaster) { - track->set_gain (dB_to_coefficient (0), 0); + track->set_gain (dB_to_coefficient (0), Controllable::NoGroup); } } |