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

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 98285a87e69874aa7a215d840cd4dd4871e9b7d8..545c69670de2f44e4fdfe377bd25f52a9aaff044 100644 (file)
--- 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 e4e9a19880aee0612173549aa1c04ed5b460d1fa..15ff9e1a388a20f71052e3bc80186be49d76040a 100644 (file)
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -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;
+                                       }
                                }
                        }
                }