ardour/livetrax
13
0
Fork 0
Code

fix some merge issues from cherry-picking mackie changes from a mixbus repo

Browse Source
This commit is contained in:
Paul Davis 2015-12-16 06:31:06 -05:00
parent 11f069f118
commit 3b872fb207
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -312,10 +312,12 @@ MackieControlProtocol::get_sorted_routes()
break;
case Busses:
if (Profile->get_mixbus()) {
#ifdef MIXBUS
if (route->mixbus()) {
sorted.push_back (route);
remote_ids.insert (route->remote_control_id());
}
#endif
} else {
if (!is_track(route)) {
if (route->route_group()) {

31
libs/surfaces/mackie/strip.cc
View File

@ -1893,19 +1893,6 @@ Strip::set_vpot_parameter (AutomationType p)
_fader->set_control (boost::shared_ptr<AutomationControl>());
control_by_parameter[SendAutomation] = 0;
}
} else {
// gain to fader, send to vpot
_fader->set_control (_route->group_gain_control());
control_by_parameter[GainAutomation] = _fader;
boost::shared_ptr<Processor> p = _route->nth_send (_current_send);
if (p && p->name() != "Monitor 1") {
boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
boost::shared_ptr<Amp> a = s->amp();
_vpot->set_control (a->gain_control());
// connect to signal
send_connections.drop_connections ();
a->gain_control()->Changed.connect(send_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_processor_changed, this, false), ui_context());
control_by_parameter[SendAutomation] = _vpot;
} else {
// gain to fader, send to vpot
_fader->set_control (_route->group_gain_control());
@ -1920,8 +1907,22 @@ Strip::set_vpot_parameter (AutomationType p)
a->gain_control()->Changed.connect(send_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_processor_changed, this, false), ui_context());
control_by_parameter[SendAutomation] = _vpot;
} else {
_vpot->set_control (boost::shared_ptr<AutomationControl>());
control_by_parameter[SendAutomation] = 0;
// gain to fader, send to vpot
_fader->set_control (_route->group_gain_control());
control_by_parameter[GainAutomation] = _fader;
boost::shared_ptr<Processor> p = _route->nth_send (_current_send);
if (p && p->name() != "Monitor 1") {
boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
boost::shared_ptr<Amp> a = s->amp();
_vpot->set_control (a->gain_control());
// connect to signal
send_connections.drop_connections ();
a->gain_control()->Changed.connect(send_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_processor_changed, this, false), ui_context());
control_by_parameter[SendAutomation] = _vpot;
} else {
_vpot->set_control (boost::shared_ptr<AutomationControl>());
control_by_parameter[SendAutomation] = 0;
}
}
}
}