diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-16 06:31:06 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-16 06:31:06 -0500 |
| commit | 3b872fb207f54945ce552d3b4a887951d8beef27 (patch) | |
| tree | c465d58819149dfd34120aff5bc12c52472cea93 | |
| parent | 11f069f11869284b8f32bd3564abbb7cd63a4ff1 (diff) | |
fix some merge issues from cherry-picking mackie changes from a mixbus repo
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 31 |
2 files changed, 18 insertions, 15 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 98285a87e6..545c69670d 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -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()) { diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index e4e9a19880..15ff9e1a38 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -1906,22 +1906,23 @@ Strip::set_vpot_parameter (AutomationType p) 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()); - 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; + // 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; + } } } } |