mackie: redesign display logic entirely
[ardour.git] / libs / surfaces / mackie / strip.cc
index 15ff9e1a388a20f71052e3bc80186be49d76040a..6dac7fa25f87a92046bfcab57bf5155c648251c6 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <sstream>
 #include <vector>
+#include <climits>
 
 #include <stdint.h>
 
@@ -97,8 +98,8 @@ Strip::Strip (Surface& s, const std::string& name, int index, const map<Button::
        , _controls_locked (false)
        , _transport_is_rolling (false)
        , _metering_active (true)
-       , _block_vpot_mode_redisplay_until (0)
        , _block_screen_redisplay_until (0)
+       , return_to_vpot_mode_display_at (UINT64_MAX)
        , eq_band (-1)
        , _pan_mode (PanAzimuthAutomation)
        , _trim_mode (TrimAutomation)
@@ -108,7 +109,6 @@ Strip::Strip (Surface& s, const std::string& name, int index, const map<Button::
        , _last_pan_width_position_written (-1.0)
        , _last_trim_position_written (-1.0)
        , _current_send (0)
-       , redisplay_requests (256)
 {
        _fader = dynamic_cast<Fader*> (Fader::factory (*_surface, index, "fader", *this));
        _vpot = dynamic_cast<Pot*> (Pot::factory (*_surface, Pot::ID + index, "vpot", *this));
@@ -195,7 +195,6 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
        control_by_parameter[GainAutomation] = (Control*) 0;
        control_by_parameter[TrimAutomation] = (Control*) 0;
        control_by_parameter[PhaseAutomation] = (Control*) 0;
-       control_by_parameter[SendAutomation] = (Control*) 0;
 
        reset_saved_values ();
 
@@ -303,6 +302,10 @@ Strip::notify_all()
                zero ();
                return;
        }
+       // The active V-pot control may not be active for this strip
+       // But if we zero it in the controls function it may erase
+       // the one we do want
+       _surface->write (_vpot->zero());
 
        notify_solo_changed ();
        notify_mute_changed ();
@@ -374,19 +377,18 @@ Strip::notify_gain_changed (bool force_update)
                float gain_coefficient = ac->get_value();
                float normalized_position = ac->internal_to_interface (gain_coefficient);
 
-
                if (force_update || normalized_position != _last_gain_position_written) {
 
                        if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
                                if (!control->in_use()) {
                                        _surface->write (_vpot->set (normalized_position, true, Pot::wrap));
                                }
-                               queue_parameter_display (GainAutomation, gain_coefficient);
+                               do_parameter_display (GainAutomation, gain_coefficient);
                        } else {
                                if (!control->in_use()) {
                                        _surface->write (_fader->set_position (normalized_position));
                                }
-                               queue_parameter_display (GainAutomation, gain_coefficient);
+                               do_parameter_display (GainAutomation, gain_coefficient);
                        }
 
                        _last_gain_position_written = normalized_position;
@@ -400,7 +402,6 @@ Strip::notify_trim_changed (bool force_update)
        if (_route) {
 
                if (!_route->trim() || !route()->trim()->active()) {
-                       _surface->write (_vpot->zero());
                        return;
                }
                Control* control = 0;
@@ -421,11 +422,11 @@ Strip::notify_trim_changed (bool force_update)
                        if (control == _fader) {
                                if (!_fader->in_use()) {
                                        _surface->write (_fader->set_position (normalized_position));
-                                       queue_parameter_display (TrimAutomation, gain_coefficient);
+                                       do_parameter_display (TrimAutomation, gain_coefficient);
                                }
                        } else if (control == _vpot) {
                                _surface->write (_vpot->set (normalized_position, true, Pot::dot));
-                               queue_parameter_display (TrimAutomation, gain_coefficient);
+                               do_parameter_display (TrimAutomation, gain_coefficient);
                        }
                        _last_trim_position_written = normalized_position;
                }
@@ -437,7 +438,6 @@ Strip::notify_phase_changed (bool force_update)
 {
        if (_route) {
                if (!_route->phase_invert().size()) {
-                       _surface->write (_vpot->zero());
                        return;
                }
 
@@ -455,11 +455,11 @@ Strip::notify_phase_changed (bool force_update)
                if (control == _fader) {
                        if (!_fader->in_use()) {
                                _surface->write (_fader->set_position (normalized_position));
-                               queue_parameter_display (PhaseAutomation, normalized_position);
+                               do_parameter_display (PhaseAutomation, normalized_position);
                        }
                } else if (control == _vpot) {
                        _surface->write (_vpot->set (normalized_position, true, Pot::wrap));
-                       queue_parameter_display (PhaseAutomation, normalized_position);
+                       do_parameter_display (PhaseAutomation, normalized_position);
                }
        }
 }
@@ -467,39 +467,6 @@ Strip::notify_phase_changed (bool force_update)
 void
 Strip::notify_processor_changed (bool force_update)
 {
-       if (_route) {
-               boost::shared_ptr<Processor> p = _route->nth_send (_current_send);
-               if (!p) {
-                       _surface->write (_vpot->zero());
-                       return;
-               }
-
-               Control* control = 0;
-               ControlParameterMap::iterator i = control_by_parameter.find (SendAutomation);
-
-               if (i == control_by_parameter.end()) {
-                       return;
-               }
-
-               control = i->second;
-
-               boost::shared_ptr<Send> s =  boost::dynamic_pointer_cast<Send>(p);
-               boost::shared_ptr<Amp> a = s->amp();
-               boost::shared_ptr<AutomationControl> ac = a->gain_control();
-
-               float gain_coefficient = ac->get_value();
-               float normalized_position = ac->internal_to_interface (gain_coefficient);
-
-               if (control == _fader) {
-                       if (!_fader->in_use()) {
-                               _surface->write (_fader->set_position (normalized_position));
-                               queue_parameter_display (SendAutomation, gain_coefficient);
-                       }
-               } else if (control == _vpot) {
-                       _surface->write (_vpot->set (normalized_position, true, Pot::dot));
-                       queue_parameter_display (SendAutomation, gain_coefficient);
-               }
-       }
 }
 
 void
@@ -522,11 +489,16 @@ Strip::show_route_name ()
                return;
        }
 
+       string fullname = string();
        if (!_route) {
-               return;
+               // make sure first three strips get cleared of view mode
+               if (_index > 2) {
+                       return;
+               }
+       } else {
+               fullname = _route->name();
        }
        string line1;
-       string fullname = _route->name();
 
        if (fullname.length() <= 6) {
                line1 = fullname;
@@ -534,7 +506,35 @@ Strip::show_route_name ()
                line1 = PBD::short_version (fullname, 6);
        }
 
-       _surface->write (display (0, line1));
+       pending_display[0] = line1;
+}
+
+void
+Strip::notify_send_level_change (AutomationType type, uint32_t send_num, bool force_update)
+{
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
+
+       if (!r) {
+               /* not in subview mode */
+               return;
+       }
+
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::Sends) {
+               /* no longer in EQ subview mode */
+               return;
+       }
+
+       boost::shared_ptr<AutomationControl> control = r->send_level_controllable (send_num);
+       if (!control) {
+               return;
+       }
+
+       if (control) {
+               float val = control->get_value();
+               do_parameter_display (type, control->internal_to_interface (val));
+               /* update pot/encoder */
+               _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
+       }
 }
 
 void
@@ -579,7 +579,7 @@ Strip::notify_eq_change (AutomationType type, uint32_t band, bool force_update)
 
        if (control) {
                float val = control->get_value();
-               queue_parameter_display (type, val);
+               do_parameter_display (type, val);
                /* update pot/encoder */
                _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
        }
@@ -633,7 +633,7 @@ Strip::notify_dyn_change (AutomationType type, bool force_update, bool propagate
 
        if (control) {
                float val = control->get_value();
-               queue_parameter_display (type, val);
+               do_parameter_display (type, val);
                /* update pot/encoder */
                _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
        }
@@ -651,7 +651,6 @@ Strip::notify_panner_azi_changed (bool force_update)
        boost::shared_ptr<AutomationControl> pan_control = _route->pan_azimuth_control ();
 
        if (!pan_control) {
-               _surface->write (_vpot->zero());
                return;
        }
 
@@ -673,12 +672,12 @@ Strip::notify_panner_azi_changed (bool force_update)
                        if (!_fader->in_use()) {
                                _surface->write (_fader->set_position (normalized_pos));
                                /* show actual internal value to user */
-                               queue_parameter_display (PanAzimuthAutomation, internal_pos);
+                               do_parameter_display (PanAzimuthAutomation, internal_pos);
                        }
                } else if (control == _vpot) {
                        _surface->write (_vpot->set (normalized_pos, true, Pot::dot));
                        /* show actual internal value to user */
-                       queue_parameter_display (PanAzimuthAutomation, internal_pos);
+                       do_parameter_display (PanAzimuthAutomation, internal_pos);
                }
 
                _last_pan_azi_position_written = normalized_pos;
@@ -697,7 +696,6 @@ Strip::notify_panner_width_changed (bool force_update)
        boost::shared_ptr<AutomationControl> pan_control = _route->pan_width_control ();
 
        if (!pan_control) {
-               _surface->write (_vpot->zero());
                return;
        }
 
@@ -719,13 +717,13 @@ Strip::notify_panner_width_changed (bool force_update)
                        if (control == _fader) {
                                if (!control->in_use()) {
                                        _surface->write (_fader->set_position (pos));
-                                       queue_parameter_display (PanWidthAutomation, pos);
+                                       do_parameter_display (PanWidthAutomation, pos);
                                }
                        }
 
                } else if (control == _vpot) {
                        _surface->write (_vpot->set (pos, true, Pot::spread));
-                       queue_parameter_display (PanWidthAutomation, pos);
+                       do_parameter_display (PanWidthAutomation, pos);
                }
 
                _last_pan_width_position_written = pos;
@@ -752,7 +750,7 @@ Strip::select_event (Button&, ButtonState bs)
                        /* reset to default */
                        boost::shared_ptr<AutomationControl> ac = _fader->control ();
                        if (ac) {
-                               ac->set_value (ac->normal());
+                               ac->set_value (ac->normal(), Controllable::NoGroup);
                        }
                        return;
                }
@@ -772,23 +770,52 @@ Strip::vselect_event (Button&, ButtonState bs)
 {
        if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
 
-               /* subview mode: vpot press acts like a button for toggle parameters */
+               /* most subview modes: vpot press acts like a button for toggle parameters */
 
                if (bs != press) {
                        return;
                }
 
-               boost::shared_ptr<AutomationControl> control = _vpot->control ();
-               if (!control) {
-                       return;
-               }
+               if (_surface->mcp().subview_mode() != MackieControlProtocol::Sends) {
+
+                       boost::shared_ptr<AutomationControl> control = _vpot->control ();
+                       if (!control) {
+                               return;
+                       }
 
-               if (control->toggled()) {
                        if (control->toggled()) {
-                               control->set_value (!control->get_value());
+                               if (control->toggled()) {
+                                       control->set_value (!control->get_value(), Controllable::NoGroup);
+                               }
+                       }
+               } else {
+
+                       /* Send mode: press enables/disables the relevant send */
+
+                       if (_route) {
+
+                               const uint32_t global_pos = _surface->mcp().global_index (*this);
+                               boost::shared_ptr<AutomationControl> control = _route->send_enable_controllable (global_pos);
+
+                               if (control) {
+                                       bool currently_enabled = (bool) control->get_value();
+                                       control->set_value (!currently_enabled, Controllable::UseGroup);
+
+                                       if (currently_enabled) {
+                                               /* we just turned it off */
+                                               pending_display[1] = "off";
+                                       } else {
+                                               /* we just turned it on, show the level
+                                               */
+                                               control = _route->send_level_controllable (global_pos);
+                                               do_parameter_display (BusSendLevel, control->get_value());
+                                       }
+                               }
                        }
                }
 
+               /* done with this event in subview mode */
+
                return;
        }
 
@@ -803,7 +830,7 @@ Strip::vselect_event (Button&, ButtonState bs)
                        if (ac) {
 
                                /* reset to default/normal value */
-                               ac->set_value (ac->normal());
+                               ac->set_value (ac->normal(), Controllable::NoGroup);
                        }
 
                }  else {
@@ -824,18 +851,11 @@ Strip::fader_touch_event (Button&, ButtonState bs)
 
                boost::shared_ptr<AutomationControl> ac = _fader->control ();
 
-               if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
-                       if (ac) {
-                               ac->set_value (ac->normal());
-                       }
-               } else {
-
-                       _fader->set_in_use (true);
-                       _fader->start_touch (_surface->mcp().transport_frame());
+               _fader->set_in_use (true);
+               _fader->start_touch (_surface->mcp().transport_frame());
 
-                       if (ac) {
-                               queue_parameter_display ((AutomationType) ac->parameter().type(), ac->get_value());
-                       }
+               if (ac) {
+                       do_parameter_display ((AutomationType) ac->parameter().type(), ac->get_value());
                }
 
        } else {
@@ -879,15 +899,7 @@ Strip::handle_button (Button& button, ButtonState bs)
                                DEBUG_TRACE (DEBUG::MackieControl, "add button on press\n");
                                _surface->mcp().add_down_button ((AutomationType) control->parameter().type(), _surface->number(), _index);
 
-                               float new_value;
-                               int ms = _surface->mcp().main_modifier_state();
-
-                               if (ms & MackieControlProtocol::MODIFIER_SHIFT) {
-                                       /* reset to default/normal value */
-                                       new_value = control->normal();
-                               } else {
-                                       new_value = control->get_value() ? 0.0 : 1.0;
-                               }
+                               float new_value = control->get_value() ? 0.0 : 1.0;
 
                                /* get all controls that either have their
                                 * button down or are within a range of
@@ -900,10 +912,18 @@ Strip::handle_button (Button& button, ButtonState bs)
                                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("there are %1 buttons down for control type %2, new value = %3\n",
                                                                            controls.size(), control->parameter().type(), new_value));
 
-                               /* apply change */
+                               /* apply change, with potential modifier semantics */
+
+                               Controllable::GroupControlDisposition gcd;
+
+                               if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+                                       gcd = Controllable::NoGroup;
+                               } else {
+                                       gcd = Controllable::UseGroup;
+                               }
 
                                for (MackieControlProtocol::ControlList::iterator c = controls.begin(); c != controls.end(); ++c) {
-                                       (*c)->set_value (new_value);
+                                       (*c)->set_value (new_value, gcd);
                                }
 
                        } else {
@@ -915,17 +935,6 @@ Strip::handle_button (Button& button, ButtonState bs)
        }
 }
 
-void
-Strip::queue_parameter_display (AutomationType type, float val)
-{
-       RedisplayRequest req;
-
-       req.type = type;
-       req.val = val;
-
-       redisplay_requests.write (&req, 1);
-}
-
 void
 Strip::do_parameter_display (AutomationType type, float val)
 {
@@ -935,11 +944,11 @@ Strip::do_parameter_display (AutomationType type, float val)
        switch (type) {
        case GainAutomation:
                if (val == 0.0) {
-                       _surface->write (display (1, " -inf "));
+                       pending_display[1] = " -inf ";
                } else {
                        float dB = accurate_coefficient_to_dB (val);
                        snprintf (buf, sizeof (buf), "%6.1f", dB);
-                       _surface->write (display (1, buf));
+                       pending_display[1] = buf;
                        screen_hold = true;
                }
                break;
@@ -947,14 +956,13 @@ Strip::do_parameter_display (AutomationType type, float val)
        case PanAzimuthAutomation:
                if (Profile->get_mixbus()) {
                        snprintf (buf, sizeof (buf), "%2.1f", val);
-                       _surface->write (display (1, buf));
+                       pending_display[1] = buf;
                        screen_hold = true;
                } else {
                        if (_route) {
                                boost::shared_ptr<Pannable> p = _route->pannable();
                                if (p && _route->panner()) {
-                                       string str =_route->panner()->value_as_string (p->pan_azimuth_control);
-                                       _surface->write (display (1, str));
+                                       pending_display[1] =_route->panner()->value_as_string (p->pan_azimuth_control);
                                        screen_hold = true;
                                }
                        }
@@ -964,7 +972,7 @@ Strip::do_parameter_display (AutomationType type, float val)
        case PanWidthAutomation:
                if (_route) {
                        snprintf (buf, sizeof (buf), "%5ld%%", lrintf ((val * 200.0)-100));
-                       _surface->write (display (1, buf));
+                       pending_display[1] = buf;
                        screen_hold = true;
                }
                break;
@@ -973,7 +981,7 @@ Strip::do_parameter_display (AutomationType type, float val)
                if (_route) {
                        float dB = accurate_coefficient_to_dB (val);
                        snprintf (buf, sizeof (buf), "%6.1f", dB);
-                       _surface->write (display (1, buf));
+                       pending_display[1] = buf;
                        screen_hold = true;
                }
                break;
@@ -981,24 +989,23 @@ Strip::do_parameter_display (AutomationType type, float val)
        case PhaseAutomation:
                if (_route) {
                        if (_route->phase_control()->get_value() < 0.5) {
-                               _surface->write (display (1, "Normal"));
+                               pending_display[1] = "Normal";
                        } else {
-                               _surface->write (display (1, "Invert"));
+                               pending_display[1] = "Invert";
                        }
                        screen_hold = true;
                }
                break;
 
-       case SendAutomation:
-               if (val == 0.0) {
-                       _surface->write (display (1, " -inf "));
-               } else {
+       case BusSendLevel:
+               if (_route) {
                        float dB = accurate_coefficient_to_dB (val);
                        snprintf (buf, sizeof (buf), "%6.1f", dB);
-                       _surface->write (display (1, buf));
+                       pending_display[1] = buf;
                        screen_hold = true;
                }
                break;
+
        case EQGain:
        case EQFrequency:
        case EQQ:
@@ -1009,20 +1016,20 @@ Strip::do_parameter_display (AutomationType type, float val)
        case CompMakeup:
        case CompRedux:
                snprintf (buf, sizeof (buf), "%6.1f", val);
-               _surface->write (display (1, buf));
+               pending_display[1] = buf;
                screen_hold = true;
                break;
        case EQEnable:
        case CompEnable:
                if (val >= 0.5) {
-                       _surface->write (display (1, "on"));
+                       pending_display[1] = "on";
                } else {
-                       _surface->write (display (1, "off"));
+                       pending_display[1] = "off";
                }
                break;
        case CompMode:
                if (_surface->mcp().subview_route()) {
-                       _surface->write (display (1, _surface->mcp().subview_route()->comp_mode_name (val)));
+                       pending_display[1] = _surface->mcp().subview_route()->comp_mode_name (val);
                }
                break;
        default:
@@ -1030,6 +1037,9 @@ Strip::do_parameter_display (AutomationType type, float val)
        }
 
        if (screen_hold) {
+               /* we just queued up a parameter to be displayed.
+                  1 second from now, switch back to vpot mode display.
+               */
                block_vpot_mode_display_for (1000);
        }
 }
@@ -1053,7 +1063,13 @@ Strip::handle_fader (Fader& fader, float position)
                return;
        }
 
-       fader.set_value (position);
+       Controllable::GroupControlDisposition gcd = Controllable::UseGroup;
+
+       if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+               gcd = Controllable::NoGroup;
+       }
+
+       fader.set_value (position, gcd);
 
        /* From the Mackie Control MIDI implementation docs:
 
@@ -1090,72 +1106,39 @@ Strip::handle_pot (Pot& pot, float delta)
 void
 Strip::periodic (ARDOUR::microseconds_t now)
 {
-       bool reshow_vpot_mode = false;
-       bool reshow_name = false;
-
-       if (!_route) {
-               return;
-       }
+       update_meter ();
+       update_automation ();
+}
 
+void
+Strip::redisplay (ARDOUR::microseconds_t now, bool force)
+{
        if (_block_screen_redisplay_until >= now) {
-               if (_surface->mcp().device_info().has_separate_meters()) {
-                       goto meters;
-               }
-               /* no drawing here, for now */
+               /* no drawing allowed */
                return;
-
-       } else if (_block_screen_redisplay_until) {
-
-               /* timeout reached, reset */
-
-               _block_screen_redisplay_until = 0;
-               reshow_vpot_mode = true;
-               reshow_name = true;
        }
 
-       if (_block_vpot_mode_redisplay_until >= now) {
-               return;
-       } else if (_block_vpot_mode_redisplay_until) {
-
-               /* timeout reached, reset */
-
-               _block_vpot_mode_redisplay_until = 0;
-               reshow_vpot_mode = true;
+       if (_block_screen_redisplay_until) {
+               /* we were blocked, but the time period has elapsed, so we must
+                * force a redraw.
+                */
+               force = true;
+               _block_screen_redisplay_until = 0;
        }
 
-       if (reshow_name) {
-               show_route_name ();
+       if (force || (current_display[0] != pending_display[0])) {
+               _surface->write (display (0, pending_display[0]));
+               current_display[0] = pending_display[0];
        }
 
-       if (reshow_vpot_mode) {
+       if (return_to_vpot_mode_display_at <= now) {
+               return_to_vpot_mode_display_at = UINT64_MAX;
                return_to_vpot_mode_display ();
-       } else {
-               /* no point doing this if we just switched back to vpot mode
-                  display */
-               update_automation ();
-       }
-
-  meters:
-       update_meter ();
-}
-
-void
-Strip::redisplay (ARDOUR::microseconds_t now)
-{
-       RedisplayRequest req;
-       bool have_request = false;
-
-       while (redisplay_requests.read (&req, 1) == 1) {
-               /* read them all */
-               have_request = true;
        }
 
-       if (_block_screen_redisplay_until >= now) {
-               return;
-       }
-
-       if (have_request) {
-               do_parameter_display (req.type, req.val);
+       if (force || (current_display[1] != pending_display[1])) {
+               _surface->write (display (1, pending_display[1]));
+               current_display[1] = pending_display[1];
        }
 }
 
@@ -1199,6 +1182,10 @@ Strip::update_automation ()
 void
 Strip::update_meter ()
 {
+       if (!_route) {
+               return;
+       }
+
        if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
                return;
        }
@@ -1206,6 +1193,7 @@ Strip::update_meter ()
        if (_meter && _transport_is_rolling && _metering_active) {
                float dB = const_cast<PeakMeter&> (_route->peak_meter()).meter_level (0, MeterMCP);
                _meter->send_update (*_surface, dB);
+               return;
        }
 }
 
@@ -1218,6 +1206,10 @@ Strip::zero ()
 
        _surface->write (blank_display (0));
        _surface->write (blank_display (1));
+       pending_display[0] = string();
+       pending_display[1] = string();
+       current_display[0] = string();
+       current_display[1] = string();
 }
 
 MidiByteArray
@@ -1306,12 +1298,6 @@ Strip::vpot_mode_string ()
                return "Trim";
        } else if (control_by_parameter.find (PhaseAutomation)->second == _vpot) {
                return string_compose ("Phase%1", _route->phase_control()->channel() + 1);
-       } else if (control_by_parameter.find (SendAutomation)->second == _vpot) {
-               // should be bus name
-               boost::shared_ptr<Processor> p = _route->nth_send (_current_send);
-               if (p) {
-                       return p->name();
-               }
        } else if (control_by_parameter.find (PanAzimuthAutomation)->second == _vpot) {
                return "Pan";
        } else if (control_by_parameter.find (PanWidthAutomation)->second == _vpot) {
@@ -1350,11 +1336,6 @@ Strip::potmode_changed (bool notify)
                DEBUG_TRACE (DEBUG::MackieControl, "Assign pot to Trim mode.\n");
                set_vpot_parameter (_trim_mode);
                break;
-       case MackieControlProtocol::Send:
-               // _current_send has the number of the send we will show
-               DEBUG_TRACE (DEBUG::MackieControl, "Assign pot to Send mode.\n");
-               set_vpot_parameter (SendAutomation);
-               break;
        }
 
        if (notify) {
@@ -1371,7 +1352,7 @@ Strip::block_screen_display_for (uint32_t msecs)
 void
 Strip::block_vpot_mode_display_for (uint32_t msecs)
 {
-       _block_vpot_mode_redisplay_until = ARDOUR::get_microseconds() + (msecs * 1000);
+       return_to_vpot_mode_display_at = ARDOUR::get_microseconds() + (msecs * 1000);
 }
 
 void
@@ -1385,9 +1366,9 @@ Strip::return_to_vpot_mode_display ()
                /* do nothing - second line shows value of current subview parameter */
                return;
        } else if (_route) {
-               _surface->write (display (1, vpot_mode_string()));
+               pending_display[1] = vpot_mode_string();
        } else {
-               _surface->write (blank_display (1));
+               pending_display[1] = string();
        }
 }
 
@@ -1399,7 +1380,7 @@ Strip::next_pot_mode ()
        if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
                /* do not change vpot mode while in flipped mode */
                DEBUG_TRACE (DEBUG::MackieControl, "not stepping pot mode - in flip mode\n");
-               _surface->write (display (1, "Flip"));
+               pending_display[1] = "Flip";
                block_vpot_mode_display_for (1000);
                return;
        }
@@ -1410,13 +1391,16 @@ Strip::next_pot_mode ()
        if (!ac) {
                return;
        }
+
+
        if (_surface->mcp().pot_mode() == MackieControlProtocol::Pan) {
-               if (possible_pot_parameters.empty() || (possible_pot_parameters.size() == 1 && possible_pot_parameters.front() == ac->parameter())) {
+
+               if (possible_pot_parameters.empty() || (possible_pot_parameters.size() == 1 && possible_pot_parameters.front() == ac->parameter().type())) {
                        return;
                }
 
                for (i = possible_pot_parameters.begin(); i != possible_pot_parameters.end(); ++i) {
-                       if ((*i) == ac->parameter()) {
+                       if ((*i) == ac->parameter().type()) {
                                break;
                        }
                }
@@ -1432,14 +1416,15 @@ Strip::next_pot_mode ()
                if (i == possible_pot_parameters.end()) {
                        i = possible_pot_parameters.begin();
                }
+
                set_vpot_parameter (*i);
        } else if (_surface->mcp().pot_mode() == MackieControlProtocol::Trim) {
-                               if (possible_trim_parameters.empty() || (possible_trim_parameters.size() == 1 && possible_trim_parameters.front() == ac->parameter())) {
+               if (possible_trim_parameters.empty() || (possible_trim_parameters.size() == 1 && possible_trim_parameters.front() == ac->parameter().type())) {
                        return;
                }
 
                for (i = possible_trim_parameters.begin(); i != possible_trim_parameters.end(); ++i) {
-                       if ((*i) == ac->parameter()) {
+                       if ((*i) == ac->parameter().type()) {
                                break;
                        }
                }
@@ -1465,18 +1450,6 @@ Strip::next_pot_mode ()
                        i = possible_trim_parameters.begin();
                }
                set_vpot_parameter (*i);
-       } else if (_surface->mcp().pot_mode() == MackieControlProtocol::Send) {
-               boost::shared_ptr<Processor> p = _route->nth_send (_current_send);
-               if (!p) {
-                       return;
-               }
-               p = _route->nth_send (_current_send + 1);
-               if (p && p->name() != "Monitor 1") {
-                       _current_send++;
-               } else {
-                       _current_send = 0;
-               }
-               set_vpot_parameter (SendAutomation);
        }
 }
 
@@ -1490,6 +1463,8 @@ Strip::subview_mode_changed ()
        switch (_surface->mcp().subview_mode()) {
        case MackieControlProtocol::None:
                set_vpot_parameter (vpot_parameter);
+               /* need to show strip name again */
+               show_route_name ();
                notify_metering_state_changed ();
                eq_band = -1;
                break;
@@ -1508,6 +1483,16 @@ Strip::subview_mode_changed ()
                } else {
                        /* leave it as it was */
                }
+               eq_band = -1;
+               break;
+
+       case MackieControlProtocol::Sends:
+               if (r) {
+                       setup_sends_vpot (r);
+               } else {
+                       /* leave it as it was */
+               }
+               eq_band = -1;
                break;
        }
 }
@@ -1520,79 +1505,81 @@ Strip::setup_dyn_vpot (boost::shared_ptr<Route> r)
        }
 
        boost::shared_ptr<AutomationControl> tc = r->comp_threshold_controllable ();
-        boost::shared_ptr<AutomationControl> sc = r->comp_speed_controllable ();
-        boost::shared_ptr<AutomationControl> mc = r->comp_mode_controllable ();
-        boost::shared_ptr<AutomationControl> kc = r->comp_makeup_controllable ();
-        boost::shared_ptr<AutomationControl> rc = r->comp_redux_controllable ();
-        boost::shared_ptr<AutomationControl> ec = r->comp_enable_controllable ();
-
-        uint32_t pos = _surface->mcp().global_index (*this);
-
-        /* we will control the pos-th available parameter, from the list in the
-         * order shown above.
-         */
-
-        vector<boost::shared_ptr<AutomationControl> > available;
-        vector<AutomationType> params;
-
-        if (tc) { available.push_back (tc); params.push_back (CompThreshold); }
-        if (sc) { available.push_back (sc); params.push_back (CompSpeed); }
-        if (mc) { available.push_back (mc); params.push_back (CompMode); }
-        if (kc) { available.push_back (kc); params.push_back (CompMakeup); }
-        if (rc) { available.push_back (rc); params.push_back (CompRedux); }
-        if (ec) { available.push_back (ec); params.push_back (CompEnable); }
-
-        if (pos >= available.size()) {
-               /* this knob is not needed to control the available parameters */
-               _vpot->set_control (boost::shared_ptr<AutomationControl>());
-               _surface->write (display (0, string()));
-               _surface->write (display (1, string()));
-               return;
-        }
-
-        boost::shared_ptr<AutomationControl> pc;
-        AutomationType param;
-
-        pc = available[pos];
-        param = params[pos];
-
-        pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_dyn_change, this, param, false, true), ui_context());
-        _vpot->set_control (pc);
-
-        string pot_id;
-
-        switch (param) {
-        case CompThreshold:
-               pot_id = "Thresh";
-               break;
-        case CompSpeed:
-               if (mc) {
-                       pot_id = r->comp_speed_name (mc->get_value());
-               } else {
-                       pot_id = "Speed";
-               }
-               break;
-        case CompMode:
-               pot_id = "Mode";
-               break;
-        case CompMakeup:
-               pot_id = "Makeup";
-               break;
-        case CompRedux:
-               pot_id = "Redux";
-               break;
-        case CompEnable:
-               pot_id = "on/off";
-               break;
-        default:
-               break;
-        }
-
-        if (!pot_id.empty()) {
-               _surface->write (display (0, pot_id));
-        }
-
-        notify_dyn_change (param, true, false);
+       boost::shared_ptr<AutomationControl> sc = r->comp_speed_controllable ();
+       boost::shared_ptr<AutomationControl> mc = r->comp_mode_controllable ();
+       boost::shared_ptr<AutomationControl> kc = r->comp_makeup_controllable ();
+       boost::shared_ptr<AutomationControl> rc = r->comp_redux_controllable ();
+       boost::shared_ptr<AutomationControl> ec = r->comp_enable_controllable ();
+
+       uint32_t pos = _surface->mcp().global_index (*this);
+
+       /* we will control the pos-th available parameter, from the list in the
+        * order shown above.
+        */
+
+       vector<boost::shared_ptr<AutomationControl> > available;
+       vector<AutomationType> params;
+
+       if (tc) { available.push_back (tc); params.push_back (CompThreshold); }
+       if (sc) { available.push_back (sc); params.push_back (CompSpeed); }
+       if (mc) { available.push_back (mc); params.push_back (CompMode); }
+       if (kc) { available.push_back (kc); params.push_back (CompMakeup); }
+       if (rc) { available.push_back (rc); params.push_back (CompRedux); }
+       if (ec) { available.push_back (ec); params.push_back (CompEnable); }
+
+       if (pos >= available.size()) {
+               /* this knob is not needed to control the available parameters */
+               _vpot->set_control (boost::shared_ptr<AutomationControl>());
+               pending_display[0] = string();
+               pending_display[1] = string();
+               return;
+       }
+
+       boost::shared_ptr<AutomationControl> pc;
+       AutomationType param;
+
+       pc = available[pos];
+       param = params[pos];
+
+       pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_dyn_change, this, param, false, true), ui_context());
+       _vpot->set_control (pc);
+
+       string pot_id;
+
+       switch (param) {
+       case CompThreshold:
+               pot_id = "Thresh";
+               break;
+       case CompSpeed:
+               if (mc) {
+                       pot_id = r->comp_speed_name (mc->get_value());
+               } else {
+                       pot_id = "Speed";
+               }
+               break;
+       case CompMode:
+               pot_id = "Mode";
+               break;
+       case CompMakeup:
+               pot_id = "Makeup";
+               break;
+       case CompRedux:
+               pot_id = "Redux";
+               break;
+       case CompEnable:
+               pot_id = "on/off";
+               break;
+       default:
+               break;
+       }
+
+       if (!pot_id.empty()) {
+               pending_display[0] = pot_id;
+       } else {
+               pending_display[0] = string();
+       }
+
+       notify_dyn_change (param, true, false);
 }
 
 void
@@ -1682,8 +1669,8 @@ Strip::setup_eq_vpot (boost::shared_ptr<Route> r)
                default:
                        /* nothing to control */
                        _vpot->set_control (boost::shared_ptr<AutomationControl>());
-                       _surface->write (display (0, string()));
-                       _surface->write (display (1, string()));
+                       pending_display[0] = string();
+                       pending_display[1] = string();
                        /* done */
                        return;
                        break;
@@ -1721,13 +1708,40 @@ Strip::setup_eq_vpot (boost::shared_ptr<Route> r)
                }
 
                if (!pot_id.empty()) {
-                       _surface->write (display (0, pot_id));
+                       pending_display[0] = pot_id;
+               } else {
+                       pending_display[0] = string();
                }
 
                notify_eq_change (param, eq_band, true);
        }
 }
 
+void
+Strip::setup_sends_vpot (boost::shared_ptr<Route> r)
+{
+       if (!r) {
+               return;
+       }
+
+       const uint32_t global_pos = _surface->mcp().global_index (*this);
+
+       boost::shared_ptr<AutomationControl> pc = r->send_level_controllable (global_pos);
+
+       if (!pc) {
+               pending_display[0] = string();
+               pending_display[1] = string();
+               return;
+       }
+
+       pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_send_level_change, this, BusSendLevel, global_pos, false), ui_context());
+       _vpot->set_control (pc);
+
+       pending_display[0] = r->send_name (global_pos);
+
+       notify_send_level_change (BusSendLevel, global_pos, true);
+}
+
 void
 Strip::set_vpot_parameter (AutomationType p)
 {
@@ -1735,7 +1749,7 @@ Strip::set_vpot_parameter (AutomationType p)
                control_by_parameter[vpot_parameter] = 0;
                vpot_parameter = NullAutomation;
                _vpot->set_control (boost::shared_ptr<AutomationControl>());
-               _surface->write (display (1, string()));
+               pending_display[1] = string();
                return;
        }
 
@@ -1761,7 +1775,7 @@ Strip::set_vpot_parameter (AutomationType p)
                                _pan_mode = PanAzimuthAutomation;
                                if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
                                        /* gain to vpot, pan azi to fader */
-                                       _vpot->set_control (_route->group_gain_control());
+                                       _vpot->set_control (_route->gain_control());
                                        vpot_parameter = GainAutomation;
                                        control_by_parameter[GainAutomation] = _vpot;
                                        _fader->set_control (pan_control);
@@ -1773,7 +1787,7 @@ Strip::set_vpot_parameter (AutomationType p)
                        } else {
                                /* gain to fader, pan azi to vpot */
                                vpot_parameter = PanAzimuthAutomation;
-                               _fader->set_control (_route->group_gain_control());
+                               _fader->set_control (_route->gain_control());
                                control_by_parameter[GainAutomation] = _fader;
                                _vpot->set_control (pan_control);
                                control_by_parameter[PanAzimuthAutomation] = _vpot;
@@ -1790,7 +1804,7 @@ Strip::set_vpot_parameter (AutomationType p)
                                _pan_mode = PanWidthAutomation;
                                if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
                                        /* gain to vpot, pan width to fader */
-                                       _vpot->set_control (_route->group_gain_control());
+                                       _vpot->set_control (_route->gain_control());
                                        vpot_parameter = GainAutomation;
                                        control_by_parameter[GainAutomation] = _vpot;
                                        _fader->set_control (pan_control);
@@ -1802,7 +1816,7 @@ Strip::set_vpot_parameter (AutomationType p)
                        } else {
                                /* gain to fader, pan width to vpot */
                                vpot_parameter = PanWidthAutomation;
-                               _fader->set_control (_route->group_gain_control());
+                               _fader->set_control (_route->gain_control());
                                control_by_parameter[GainAutomation] = _fader;
                                _vpot->set_control (pan_control);
                                control_by_parameter[PanWidthAutomation] = _vpot;
@@ -1824,7 +1838,7 @@ Strip::set_vpot_parameter (AutomationType p)
                vpot_parameter = TrimAutomation;
                if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
                        /* gain to vpot, trim to fader */
-                       _vpot->set_control (_route->group_gain_control());
+                       _vpot->set_control (_route->gain_control());
                        control_by_parameter[GainAutomation] = _vpot;
                        if (_route->trim() && route()->trim()->active()) {
                                _fader->set_control (_route->trim_control());
@@ -1835,7 +1849,7 @@ Strip::set_vpot_parameter (AutomationType p)
                        }
                } else {
                        /* gain to fader, trim to vpot */
-                       _fader->set_control (_route->group_gain_control());
+                       _fader->set_control (_route->gain_control());
                        control_by_parameter[GainAutomation] = _fader;
                        if (_route->trim() && route()->trim()->active()) {
                                _vpot->set_control (_route->trim_control());
@@ -1851,7 +1865,7 @@ Strip::set_vpot_parameter (AutomationType p)
                vpot_parameter = PhaseAutomation;
                if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
                        /* gain to vpot, phase to fader */
-                       _vpot->set_control (_route->group_gain_control());
+                       _vpot->set_control (_route->gain_control());
                        control_by_parameter[GainAutomation] = _vpot;
                        if (_route->phase_invert().size()) {
                                _fader->set_control (_route->phase_control());
@@ -1862,7 +1876,7 @@ Strip::set_vpot_parameter (AutomationType p)
                        }
                } else {
                        /* gain to fader, phase to vpot */
-                       _fader->set_control (_route->group_gain_control());
+                       _fader->set_control (_route->gain_control());
                        control_by_parameter[GainAutomation] = _fader;
                        if (_route->phase_invert().size()) {
                                _vpot->set_control (_route->phase_control());
@@ -1873,67 +1887,13 @@ Strip::set_vpot_parameter (AutomationType p)
                        }
                }
                break;
-       case SendAutomation:
-               if (!Profile->get_mixbus()) {
-                       if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                               // gain to vpot, send to fader
-                               _vpot->set_control (_route->group_gain_control());
-                               control_by_parameter[GainAutomation] = _vpot;
-                               // test for send to control
-                               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();
-                                       _fader->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] = _fader;
-                               } else {
-                                       _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());
-                                       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;
-                                       }
-                               }
-                       }
-               }
-               break;
        default:
                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("vpot mode %1 not known.\n", p));
                break;
 
        }
 
-       _surface->write (display (1, vpot_mode_string()));
+       pending_display[1] = vpot_mode_string ();
 }
 
 bool