smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

add group disposition argument to Route::set_gain() and use it in various UIs

Browse source 
Executive decisions were necessary in a couple of places about the correct group disposition
behaviour, notably faderport and OSC surfaces
This commit is contained in:
Paul Davis 2016-01-18 10:52:15 -05:00
parent 1948b50a68
commit 64c9198d60
10 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/gain_meter.cc
View file

@ -532,7 +532,7 @@ GainMeterBase::gain_adjusted ()
if (!ignore_toggle) { if (!ignore_toggle) {
if (_route && _route->amp() == _amp) { if (_route && _route->amp() == _amp) {
_route->set_gain (value, this); _route->set_gain (value, Controllable::UseGroup);
} else { } else {
_amp->gain_control()->set_value (value, Controllable::NoGroup); _amp->gain_control()->set_value (value, Controllable::NoGroup);
} }

2
gtk2_ardour/mixer_actor.cc
View file

@ -176,7 +176,7 @@ printf("setting gain to unity (?)");
BOOST_FOREACH(RouteUI* r, _route_targets) { BOOST_FOREACH(RouteUI* r, _route_targets) {
boost::shared_ptr<Route> rp = r->route(); boost::shared_ptr<Route> rp = r->route();
if (rp) { if (rp) {
rp->set_gain (1.0, this); rp->set_gain (1.0, Controllable::NoGroup);
} }
} }
} }

8
gtk2_ardour/route_ui.cc
View file

@ -1949,25 +1949,25 @@ RouteUI::parameter_changed (string const & p)
void void
RouteUI::step_gain_up () RouteUI::step_gain_up ()
{ {
_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.1), this); _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.1), Controllable::UseGroup);
} }
void void
RouteUI::page_gain_up () RouteUI::page_gain_up ()
{ {
_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.5), this); _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.5), Controllable::UseGroup);
} }
void void
RouteUI::step_gain_down () RouteUI::step_gain_down ()
{ {
_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.1), this); _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.1), Controllable::UseGroup);
} }
void void
RouteUI::page_gain_down () RouteUI::page_gain_down ()
{ {
_route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), this); _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup);
} }
void void

4
libs/ardour/ardour/route.h
View file

@ -142,8 +142,8 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
void shift (framepos_t, framecnt_t); void shift (framepos_t, framecnt_t);
void set_gain (gain_t val, void *src); void set_gain (gain_t val, PBD::Controllable::GroupControlDisposition);
void inc_gain (gain_t delta, void *src); void inc_gain (gain_t delta);
void set_trim (gain_t val, void *src); void set_trim (gain_t val, void *src);

2
libs/ardour/audio_track.cc
View file

@ -629,7 +629,7 @@ AudioTrack::freeze_me (InterThreadInfo& itt)
/* reset stuff that has already been accounted for in the freeze process */ /* 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); _amp->gain_control()->set_automation_state (Off);
/* XXX need to use _main_outs _panner->set_automation_state (Off); */ /* XXX need to use _main_outs _panner->set_automation_state (Off); */

14
libs/ardour/route.cc
View file

@ -387,7 +387,7 @@ Route::ensure_track_or_route_name(string name, Session &session)
} }
void 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 /* To be used ONLY when doing group-relative gain adjustment, from
* ::set_gain() * ::set_gain()
@ -404,9 +404,9 @@ Route::inc_gain (gain_t factor, void *src)
} }
void 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()) { 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 { } 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; return;
@ -3894,14 +3894,14 @@ Route::set_latency_compensation (framecnt_t longest_session_latency)
} }
void 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; boost::shared_ptr<RouteList> rl;
switch (type) { switch (type) {
case GainAutomation: case GainAutomation:
/* route must mediate group control */ /* 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; return;
break; break;

2
libs/ardour/session.cc
View file

@ -2880,7 +2880,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
// 0 for Stereo Out mode // 0 for Stereo Out mode
// 0 Multi Out mode // 0 Multi Out mode
if (Config->get_output_auto_connect() & AutoConnectMaster) { if (Config->get_output_auto_connect() & AutoConnectMaster) {
track->set_gain (dB_to_coefficient (0), 0); track->set_gain (dB_to_coefficient (0), Controllable::NoGroup);
} }
} }

2
libs/surfaces/control_protocol/control_protocol.cc
View file

@ -248,7 +248,7 @@ ControlProtocol::route_set_gain (uint32_t table_index, float gain)
boost::shared_ptr<Route> r = route_table[table_index]; boost::shared_ptr<Route> r = route_table[table_index];
if (r != 0) { if (r != 0) {
r->set_gain (gain, this); r->set_gain (gain, Controllable::UseGroup);
} }
} }

6
libs/surfaces/faderport/faderport.cc
View file

@ -499,7 +499,11 @@ FaderPort::fader_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
if (gain) { if (gain) {
int ival = (fader_msb << 7) | fader_lsb; int ival = (fader_msb << 7) | fader_lsb;
float val = gain->interface_to_internal (ival/16384.0); float val = gain->interface_to_internal (ival/16384.0);
_current_route->set_gain (val, this); /* even though the faderport only controls a
single route at a time, allow the fader to
modify the group, if appropriate.
*/
_current_route->set_gain (val, Controllable::UseGroup);
} }
} }
} }

2
libs/surfaces/osc/osc.cc
View file

@ -1013,7 +1013,7 @@ OSC::route_set_gain_abs (int rid, float level)
boost::shared_ptr<Route> r = session->route_by_remote_id (rid); boost::shared_ptr<Route> r = session->route_by_remote_id (rid);
if (r) { if (r) {
r->set_gain (level, this); r->set_gain (level, PBD::Controllable::NoGroup);
} }
return 0; return 0;