remove Route::listening_via_monitor()
[ardour.git] / libs / surfaces / mackie / strip.cc
index 628cc9cde892d455805b582ef20717774e99cb5b..9c3fc21bdacaa16089f26a4f5e12e100ff78b4b1 100644 (file)
 */
 
 #include <sstream>
+#include <vector>
+#include <climits>
+
 #include <stdint.h>
-#include "strip.h"
 
 #include <sys/time.h>
 
 #include "ardour/debug.h"
 #include "ardour/midi_ui.h"
 #include "ardour/meter.h"
+#include "ardour/monitor_control.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
+#include "ardour/phase_control.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/send.h"
+#include "ardour/solo_isolate_control.h"
 #include "ardour/track.h"
 #include "ardour/midi_track.h"
 #include "ardour/user_bundle.h"
@@ -51,6 +56,7 @@
 #include "mackie_control_protocol.h"
 #include "surface_port.h"
 #include "surface.h"
+#include "strip.h"
 #include "button.h"
 #include "led.h"
 #include "pot.h"
@@ -95,16 +101,14 @@ 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)
        , _last_gain_position_written (-1.0)
        , _last_pan_azi_position_written (-1.0)
        , _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));
@@ -181,21 +185,10 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
 
        _route = r;
 
-       control_by_parameter.clear ();
-
-       control_by_parameter[PanAzimuthAutomation] = (Control*) 0;
-       control_by_parameter[PanWidthAutomation] = (Control*) 0;
-       control_by_parameter[PanElevationAutomation] = (Control*) 0;
-       control_by_parameter[PanFrontBackAutomation] = (Control*) 0;
-       control_by_parameter[PanLFEAutomation] = (Control*) 0;
-       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 ();
 
        if (!r) {
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface %1 Strip %2 mapped to null route\n", _surface->number(), _index));
                zero ();
                return;
        }
@@ -206,35 +199,19 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
        _solo->set_control (_route->solo_control());
        _mute->set_control (_route->mute_control());
 
-       _route->solo_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_solo_changed, this), ui_context());
-       _route->listen_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_solo_changed, this), ui_context());
-
+       _route->solo_control()->Changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_solo_changed, this), ui_context());
        _route->mute_control()->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_mute_changed, this), ui_context());
 
-       if (_route->trim() && route()->trim()->active()) {
-               _route->trim_control()->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_trim_changed, this, false), ui_context());
+       boost::shared_ptr<AutomationControl> pan_control = _route->pan_azimuth_control();
+       if (pan_control) {
+               pan_control->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_panner_azi_changed, this, false), ui_context());
        }
 
-       if (_route->phase_invert().size()) {
-               _route->phase_invert_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_phase_changed, this, false), ui_context());
-               _route->phase_control()->set_channel(0);
+       pan_control = _route->pan_width_control();
+       if (pan_control) {
+               pan_control->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_panner_width_changed, this, false), ui_context());
        }
 
-       boost::shared_ptr<Pannable> pannable = _route->pannable();
-
-if(Profile->get_mixbus()) {
-       const uint32_t port_channel_post_pan = 2; // gtk2_ardour/mixbus_ports.h
-       boost::shared_ptr<ARDOUR::PluginInsert> plug = _route->ch_post();
-       mb_pan_controllable = boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (plug->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, port_channel_post_pan)));
-
-       mb_pan_controllable->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_panner_azi_changed, this, false), ui_context());
-} else {
-       if (pannable && _route->panner()) {
-               pannable->pan_azimuth_control->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_panner_azi_changed, this, false), ui_context());
-               pannable->pan_width_control->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_panner_width_changed, this, false), ui_context());
-       }
-}
-       
        _route->gain_control()->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_gain_changed, this, false), ui_context());
        _route->PropertyChanged.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_property_changed, this, _1), ui_context());
 
@@ -243,8 +220,6 @@ if(Profile->get_mixbus()) {
        if (trk) {
                _recenable->set_control (trk->rec_enable_control());
                trk->rec_enable_control()->Changed .connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_record_enable_changed, this), ui_context());
-
-
        }
 
        // TODO this works when a currently-banked route is made inactive, but not
@@ -257,50 +232,31 @@ if(Profile->get_mixbus()) {
 
        possible_pot_parameters.clear();
 
-if (Profile->get_mixbus()) {
-       possible_pot_parameters.push_back (PanAzimuthAutomation);
-} else {
-       if (pannable) {
-               boost::shared_ptr<Panner> panner = _route->panner();
-               if (panner) {
-                       set<Evoral::Parameter> automatable = panner->what_can_be_automated ();
-                       set<Evoral::Parameter>::iterator a;
-
-                       if ((a = automatable.find (PanAzimuthAutomation)) != automatable.end()) {
-                               possible_pot_parameters.push_back (PanAzimuthAutomation);
-                       }
-
-                       if ((a = automatable.find (PanWidthAutomation)) != automatable.end()) {
-                               possible_pot_parameters.push_back (PanWidthAutomation);
-                       }
-               }
+       if (_route->pan_azimuth_control()) {
+               possible_pot_parameters.push_back (PanAzimuthAutomation);
        }
-}
-
-       if (_route->trim() && route()->trim()->active()) {
-               possible_pot_parameters.push_back (TrimAutomation);
+       if (_route->pan_width_control()) {
+               possible_pot_parameters.push_back (PanWidthAutomation);
+       }
+       if (_route->pan_elevation_control()) {
+               possible_pot_parameters.push_back (PanElevationAutomation);
+       }
+       if (_route->pan_frontback_control()) {
+               possible_pot_parameters.push_back (PanFrontBackAutomation);
+       }
+       if (_route->pan_lfe_control()) {
+               possible_pot_parameters.push_back (PanLFEAutomation);
        }
 
-       possible_trim_parameters.clear();
+       _pan_mode = PanAzimuthAutomation;
 
-       if (_route->trim() && route()->trim()->active()) {
-               possible_trim_parameters.push_back (TrimAutomation);
-               _trim_mode = TrimAutomation;
+       if (_surface->mcp().subview_mode() == MackieControlProtocol::None) {
+               set_vpot_parameter (_pan_mode);
        }
 
-       if (_route->phase_invert().size()) {
-               possible_trim_parameters.push_back (PhaseAutomation);
-               _route->phase_control()->set_channel(0);
-               if (_trim_mode != TrimAutomation) {
-                       _trim_mode = PhaseAutomation;
-               }
-       }
-       _current_send = 0;
-       /* Update */
-       _pan_mode = PanAzimuthAutomation;
-       potmode_changed (false);
-       notify_all ();
+       _fader->set_control (_route->gain_control());
 
+       notify_all ();
 }
 
 void
@@ -310,6 +266,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 ();
@@ -318,8 +278,6 @@ Strip::notify_all()
        notify_panner_azi_changed ();
        notify_panner_width_changed ();
        notify_record_enable_changed ();
-       notify_trim_changed ();
-       notify_phase_changed ();
        notify_processor_changed ();
 }
 
@@ -327,7 +285,7 @@ void
 Strip::notify_solo_changed ()
 {
        if (_route && _solo) {
-               _surface->write (_solo->set_state ((_route->soloed() || _route->listening_via_monitor()) ? on : off));
+               _surface->write (_solo->set_state (_route->soloed() ? on : off));
        }
 }
 
@@ -347,7 +305,10 @@ void
 Strip::notify_record_enable_changed ()
 {
        if (_route && _recenable)  {
-               _surface->write (_recenable->set_state (_route->record_enabled() ? on : off));
+               boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<Track> (_route);
+               if (trk) {
+                       _surface->write (_recenable->set_state (trk->rec_enable_control()->get_value() ? on : off));
+               }
        }
 }
 
@@ -366,262 +327,339 @@ Strip::notify_route_deleted ()
 void
 Strip::notify_gain_changed (bool force_update)
 {
-       if (_route) {
+       if (!_route) {
+               return;
+       }
 
-               Control* control;
+       boost::shared_ptr<AutomationControl> ac = _route->gain_control();
+       Control* control;
 
-               if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                       control = _vpot;
-               } else {
-                       control = _fader;
-               }
+       if (!ac) {
+               /* doesn't seem possible but lets be safe */
+               return;
+       }
 
-               boost::shared_ptr<AutomationControl> ac = _route->gain_control();
+       /* track gain control could be on vpot or fader, depending in
+        * flip mode.
+        */
 
-               float gain_coefficient = ac->get_value();
-               float normalized_position = ac->internal_to_interface (gain_coefficient);
+       if (_vpot->control() == ac) {
+               control = _vpot;
+       } else if (_fader->control() == ac) {
+               control = _fader;
+       } else {
+               return;
+       }
 
+       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 (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);
+               if (!control->in_use()) {
+                       if (control == _vpot) {
+                               _surface->write (_vpot->set (normalized_position, true, Pot::wrap));
                        } else {
-                               if (!control->in_use()) {
-                                       _surface->write (_fader->set_position (normalized_position));
-                               }
-                               queue_parameter_display (GainAutomation, gain_coefficient);
+                               _surface->write (_fader->set_position (normalized_position));
                        }
-
-                       _last_gain_position_written = normalized_position;
                }
+
+               do_parameter_display (GainAutomation, gain_coefficient);
+               _last_gain_position_written = normalized_position;
        }
 }
 
 void
-Strip::notify_trim_changed (bool force_update)
+Strip::notify_processor_changed (bool force_update)
 {
-       if (_route) {
+}
 
-               if (!_route->trim() || !route()->trim()->active()) {
-                       _surface->write (_vpot->zero());
-                       return;
-               }
-               Control* control = 0;
-               ControlParameterMap::iterator i = control_by_parameter.find (TrimAutomation);
+void
+Strip::notify_property_changed (const PropertyChange& what_changed)
+{
+       if (!what_changed.contains (ARDOUR::Properties::name)) {
+               return;
+       }
 
-               if (i == control_by_parameter.end()) {
-                       return;
-               }
+       show_route_name ();
+}
 
-               control = i->second;
+void
+Strip::show_route_name ()
+{
+       MackieControlProtocol::SubViewMode svm = _surface->mcp().subview_mode();
 
-               boost::shared_ptr<AutomationControl> ac = _route->trim_control();
+       if (svm != MackieControlProtocol::None) {
+               /* subview mode is responsible for upper line */
+               return;
+       }
 
-               float gain_coefficient = ac->get_value();
-               float normalized_position = ac->internal_to_interface (gain_coefficient);
+       string fullname = string();
+       if (!_route) {
+               fullname = string();
+       } else {
+               fullname = _route->name();
+       }
 
-               if (force_update || normalized_position != _last_trim_position_written) {
-                       if (control == _fader) {
-                               if (!_fader->in_use()) {
-                                       _surface->write (_fader->set_position (normalized_position));
-                                       queue_parameter_display (TrimAutomation, gain_coefficient);
-                               }
-                       } else if (control == _vpot) {
-                               _surface->write (_vpot->set (normalized_position, true, Pot::dot));
-                               queue_parameter_display (TrimAutomation, gain_coefficient);
-                       }
-                       _last_trim_position_written = normalized_position;
-               }
+       if (fullname.length() <= 6) {
+               pending_display[0] = fullname;
+       } else {
+               pending_display[0] = PBD::short_version (fullname, 6);
        }
 }
 
 void
-Strip::notify_phase_changed (bool force_update)
+Strip::notify_send_level_change (AutomationType type, uint32_t send_num, bool force_update)
 {
-       if (_route) {
-               if (!_route->phase_invert().size()) {
-                       _surface->write (_vpot->zero());
-                       return;
-               }
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
 
-               Control* control = 0;
-               ControlParameterMap::iterator i = control_by_parameter.find (PhaseAutomation);
+       if (!r) {
+               /* not in subview mode */
+               return;
+       }
 
-               if (i == control_by_parameter.end()) {
-                       return;
-               }
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::Sends) {
+               /* no longer in Sends subview mode */
+               return;
+       }
 
-               control = i->second;
+       boost::shared_ptr<AutomationControl> control = r->send_level_controllable (send_num);
+       if (!control) {
+               return;
+       }
 
-               float normalized_position = _route->phase_control()->get_value();
+       if (control) {
+               float val = control->get_value();
+               do_parameter_display (type, val);
 
-               if (control == _fader) {
-                       if (!_fader->in_use()) {
-                               _surface->write (_fader->set_position (normalized_position));
-                               queue_parameter_display (PhaseAutomation, normalized_position);
-                       }
-               } else if (control == _vpot) {
-                       _surface->write (_vpot->set (normalized_position, true, Pot::wrap));
-                       queue_parameter_display (PhaseAutomation, normalized_position);
+               if (_vpot->control() == control) {
+                       /* update pot/encoder */
+                       _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
                }
        }
 }
 
 void
-Strip::notify_processor_changed (bool force_update)
+Strip::notify_trackview_change (AutomationType type, uint32_t send_num, bool force_update)
 {
-       if (_route) {
-               boost::shared_ptr<Processor> p = _route->nth_send (_current_send);
-               if (!p) {
-                       _surface->write (_vpot->zero());
-                       return;
-               }
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
 
-               Control* control = 0;
-               ControlParameterMap::iterator i = control_by_parameter.find (SendAutomation);
+       if (!r) {
+               /* not in subview mode */
+               return;
+       }
 
-               if (i == control_by_parameter.end()) {
-                       return;
-               }
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::TrackView) {
+               /* no longer in TrackViewsubview mode */
+               return;
+       }
+
+       boost::shared_ptr<AutomationControl> control;
+       boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (r);
 
-               control = i->second;
+       switch (type) {
+       case TrimAutomation:
+               control = r->trim_control();
+               break;
+       case SoloIsolateAutomation:
+               control = r->solo_isolate_control ();
+               break;
+       case SoloSafeAutomation:
+               control = r->solo_safe_control ();
+               break;
+       case MonitoringAutomation:
+               if (track) {
+                       control = track->monitoring_control();
+               }
+               break;
+       case PhaseAutomation:
+               control = r->phase_control ();
+               break;
+       default:
+               break;
+       }
 
-               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();
+       if (control) {
+               float val = control->get_value();
 
-               float gain_coefficient = ac->get_value();
-               float normalized_position = ac->internal_to_interface (gain_coefficient);
+               /* Note: all of the displayed controllables require the display
+                * of their *actual* ("internal") value, not the version mapped
+                * into the normalized 0..1.0 ("interface") range.
+                */
 
-               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);
-               }
+               do_parameter_display (type, val);
+               /* update pot/encoder */
+               _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
        }
 }
 
 void
-Strip::notify_property_changed (const PropertyChange& what_changed)
+Strip::notify_eq_change (AutomationType type, uint32_t band, bool force_update)
 {
-       if (!what_changed.contains (ARDOUR::Properties::name)) {
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
+
+       if (!r) {
+               /* not in subview mode */
                return;
        }
 
-       show_route_name ();
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::EQ) {
+               /* no longer in EQ subview mode */
+               return;
+       }
+
+       boost::shared_ptr<AutomationControl> control;
+
+       switch (type) {
+       case EQGain:
+               control = r->eq_gain_controllable (band);
+               break;
+       case EQFrequency:
+               control = r->eq_freq_controllable (band);
+               break;
+       case EQQ:
+               control = r->eq_q_controllable (band);
+               break;
+       case EQShape:
+               control = r->eq_shape_controllable (band);
+               break;
+       case EQHPF:
+               control = r->eq_hpf_controllable ();
+               break;
+       case EQEnable:
+               control = r->eq_enable_controllable ();
+               break;
+       default:
+               break;
+       }
+
+       if (control) {
+               float val = control->get_value();
+               do_parameter_display (type, val);
+               /* update pot/encoder */
+               _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
+       }
 }
 
 void
-Strip::show_route_name ()
+Strip::notify_dyn_change (AutomationType type, bool force_update, bool propagate_mode)
 {
-       if (!_route) {
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
+
+       if (!r) {
+               /* not in subview mode */
                return;
        }
-       string line1;
-       string fullname = _route->name();
 
-       if (fullname.length() <= 6) {
-               line1 = fullname;
-       } else {
-               line1 = PBD::short_version (fullname, 6);
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::Dynamics) {
+               /* no longer in EQ subview mode */
+               return;
+       }
+
+       boost::shared_ptr<AutomationControl> control;
+       bool reset_all = false;
+
+       switch (type) {
+       case CompThreshold:
+               control = r->comp_threshold_controllable ();
+               break;
+       case CompSpeed:
+               control = r->comp_speed_controllable ();
+               break;
+       case CompMode:
+               control = r->comp_mode_controllable ();
+               reset_all = true;
+               break;
+       case CompMakeup:
+               control = r->comp_makeup_controllable ();
+               break;
+       case CompRedux:
+               control = r->comp_redux_controllable ();
+               break;
+       case CompEnable:
+               control = r->comp_enable_controllable ();
+               break;
+       default:
+               break;
+       }
+
+       if (propagate_mode && reset_all) {
+               _surface->subview_mode_changed ();
        }
 
-       _surface->write (display (0, line1));
+       if (control) {
+               float val = control->get_value();
+               do_parameter_display (type, val);
+               /* update pot/encoder */
+               _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
+       }
 }
 
 void
 Strip::notify_panner_azi_changed (bool force_update)
 {
-       if (_route) {
-
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan change for strip %1\n", _index));
-
-               boost::shared_ptr<Pannable> pannable = _route->pannable();
+       if (!_route) {
+               return;
+       }
 
-               if (!pannable || !_route->panner()) {
-                       _surface->write (_vpot->zero());
-                       return;
-               }
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan change for strip %1\n", _index));
 
-               Control* control = 0;
-               ControlParameterMap::iterator i = control_by_parameter.find (PanAzimuthAutomation);
+       boost::shared_ptr<AutomationControl> pan_control = _route->pan_azimuth_control ();
 
-               if (i == control_by_parameter.end()) {
-                       return;
-               }
+       if (!pan_control) {
+               /* basically impossible, since we're here because that control
+                *  changed, but sure, whatever.
+                */
+               return;
+       }
 
-               control = i->second;
+       if (_vpot->control() != pan_control) {
+               return;
+       }
 
-               double pos = mb_pan_controllable->internal_to_interface (mb_pan_controllable->get_value());
+       double normalized_pos = pan_control->internal_to_interface (pan_control->get_value());
+       double internal_pos = pan_control->get_value();
 
-               if (force_update || pos != _last_pan_azi_position_written) {
+       if (force_update || (normalized_pos != _last_pan_azi_position_written)) {
 
-                       if (control == _fader) {
-                               if (!_fader->in_use()) {
-                                       _surface->write (_fader->set_position (pos));
-                                       queue_parameter_display (PanAzimuthAutomation, pos);
-                               }
-                       } else if (control == _vpot) {
-                               _surface->write (_vpot->set (pos, true, Pot::dot));
-                               queue_parameter_display (PanAzimuthAutomation, pos);
-                       }
+               _surface->write (_vpot->set (normalized_pos, true, Pot::dot));
+               /* show actual internal value to user */
+               do_parameter_display (PanAzimuthAutomation, internal_pos);
 
-                       _last_pan_azi_position_written = pos;
-               }
+               _last_pan_azi_position_written = normalized_pos;
        }
 }
 
 void
 Strip::notify_panner_width_changed (bool force_update)
 {
-       if (_route) {
-
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan width change for strip %1\n", _index));
-
-               boost::shared_ptr<Pannable> pannable = _route->pannable();
-
-               if (!pannable || !_route->panner()) {
-                       _surface->write (_vpot->zero());
-                       return;
-               }
-
-               Control* control = 0;
-               ControlParameterMap::iterator i = control_by_parameter.find (PanWidthAutomation);
+       if (!_route) {
+               return;
+       }
 
-               if (i == control_by_parameter.end()) {
-                       return;
-               }
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan width change for strip %1\n", _index));
 
-               control = i->second;
+       boost::shared_ptr<AutomationControl> pan_control = _route->pan_width_control ();
 
-               double pos = pannable->pan_width_control->internal_to_interface (pannable->pan_width_control->get_value());
+       if (!pan_control) {
+               /* basically impossible, since we're here because that control
+                *  changed, but sure, whatever.
+                */
+               return;
+       }
 
-               if (force_update || pos != _last_pan_width_position_written) {
+       if (_vpot->control() != pan_control) {
+               return;
+       }
 
-                       if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
+       double pos = pan_control->internal_to_interface (pan_control->get_value());
 
-                               if (control == _fader) {
-                                       if (!control->in_use()) {
-                                               _surface->write (_fader->set_position (pos));
-                                               queue_parameter_display (PanWidthAutomation, pos);
-                                       }
-                               }
+       if (force_update || pos != _last_pan_width_position_written) {
 
-                       } else if (control == _vpot) {
-                               _surface->write (_vpot->set (pos, true, Pot::spread));
-                               queue_parameter_display (PanWidthAutomation, pos);
-                       }
+               _surface->write (_vpot->set (pos, true, Pot::spread));
+               do_parameter_display (PanWidthAutomation, pos);
 
-                       _last_pan_width_position_written = pos;
-               }
+               _last_pan_width_position_written = pos;
        }
 }
 
@@ -641,15 +679,6 @@ Strip::select_event (Button&, ButtonState bs)
                        return;
                }
 
-               if (ms & MackieControlProtocol::MODIFIER_SHIFT) {
-                       /* reset to default */
-                       boost::shared_ptr<AutomationControl> ac = _fader->control ();
-                       if (ac) {
-                               ac->set_value (ac->normal());
-                       }
-                       return;
-               }
-
                DEBUG_TRACE (DEBUG::MackieControl, "add select button on press\n");
                _surface->mcp().add_down_select_button (_surface->number(), _index);
                _surface->mcp().select_range ();
@@ -663,6 +692,88 @@ Strip::select_event (Button&, ButtonState bs)
 void
 Strip::vselect_event (Button&, ButtonState bs)
 {
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+
+               /* most subview modes: vpot press acts like a button for toggle parameters */
+
+               if (bs != press) {
+                       return;
+               }
+
+               if (_surface->mcp().subview_mode() != MackieControlProtocol::Sends) {
+
+                       boost::shared_ptr<AutomationControl> control = _vpot->control ();
+                       if (!control) {
+                               return;
+                       }
+
+                       Controllable::GroupControlDisposition gcd;
+                       if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+                               gcd = Controllable::InverseGroup;
+                       } else {
+                               gcd = Controllable::UseGroup;
+                       }
+
+                       if (control->toggled()) {
+                               if (control->toggled()) {
+                                       control->set_value (!control->get_value(), gcd);
+                               }
+
+                       } else if (control->desc().enumeration || control->desc().integer_step) {
+
+                               double val = control->get_value ();
+                               if (val <= control->upper() - 1.0) {
+                                       control->set_value (val + 1.0, gcd);
+                               } else {
+                                       control->set_value (control->lower(), gcd);
+                               }
+                       }
+
+               } else {
+
+                       /* Send mode: press enables/disables the relevant
+                        * send, but the vpot is bound to the send-level so we
+                        * need to lookup the enable/disable control
+                        * explicitly.
+                        */
+
+                       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
+
+                       if (r) {
+
+                               const uint32_t global_pos = _surface->mcp().global_index (*this);
+                               boost::shared_ptr<AutomationControl> control = r->send_enable_controllable (global_pos);
+
+                               if (control) {
+                                       bool currently_enabled = (bool) control->get_value();
+                                       Controllable::GroupControlDisposition gcd;
+
+                                       if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+                                               gcd = Controllable::InverseGroup;
+                                       } else {
+                                               gcd = Controllable::UseGroup;
+                                       }
+
+                                       control->set_value (!currently_enabled, gcd);
+
+                                       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;
+       }
+
        if (bs == press) {
 
                int ms = _surface->mcp().main_modifier_state();
@@ -674,13 +785,32 @@ 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 {
 
+#ifdef MIXBUS
+                       if (_route) {
+                               boost::shared_ptr<AutomationControl> ac = _route->master_send_enable_controllable ();
+                               if (ac) {
+                                       Controllable::GroupControlDisposition gcd;
+
+                                       if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+                                               gcd = Controllable::InverseGroup;
+                                       } else {
+                                               gcd = Controllable::UseGroup;
+                                       }
+
+                                       bool enabled = ac->get_value();
+                                       ac->set_value (!enabled, gcd);
+                               }
+                       }
+#else
                        DEBUG_TRACE (DEBUG::MackieControl, "switching to next pot mode\n");
+                       /* switch vpot to control next available parameter */
                        next_pot_mode ();
+#endif
                }
 
        }
@@ -695,18 +825,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 {
@@ -750,15 +873,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
@@ -771,10 +886,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::InverseGroup;
+                               } 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 {
@@ -787,99 +910,142 @@ 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)
+Strip::do_parameter_display (AutomationType type, float val)
 {
        bool screen_hold = false;
+       char buf[16];
 
        switch (type) {
        case GainAutomation:
                if (val == 0.0) {
-                       _surface->write (display (1, " -inf "));
+                       pending_display[1] = " -inf ";
                } else {
-                       char buf[16];
                        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 PanAzimuthAutomation:
-if (Profile->get_mixbus()) {
-       char buf[16];
-       snprintf (buf, sizeof (buf), "%2.1f", val);
-       _surface->write (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));
+       case BusSendLevel:
+               if (Profile->get_mixbus()) {  //Mixbus sends are already stored in dB
+                       snprintf (buf, sizeof (buf), "%2.1f", val);
+                       pending_display[1] = buf;
+                       screen_hold = true;
+               } else {
+                       if (val == 0.0) {
+                               pending_display[1] = " -inf ";
+                       } else {
+                               float dB = accurate_coefficient_to_dB (val);
+                               snprintf (buf, sizeof (buf), "%6.1f", dB);
+                               pending_display[1] = buf;
                                screen_hold = true;
                        }
                }
-}
+               break;
+
+       case PanAzimuthAutomation:
+               if (Profile->get_mixbus()) {
+                       snprintf (buf, sizeof (buf), "%2.1f", val);
+                       pending_display[1] = buf;
+                       screen_hold = true;
+               } else {
+                       if (_route) {
+                               boost::shared_ptr<Pannable> p = _route->pannable();
+                               if (p && _route->panner()) {
+                                       pending_display[1] =_route->panner()->value_as_string (p->pan_azimuth_control);
+                                       screen_hold = true;
+                               }
+                       }
+               }
                break;
 
        case PanWidthAutomation:
                if (_route) {
-                       char buf[16];
                        snprintf (buf, sizeof (buf), "%5ld%%", lrintf ((val * 200.0)-100));
-                       _surface->write (display (1, buf));
+                       pending_display[1] = buf;
                        screen_hold = true;
                }
                break;
 
        case TrimAutomation:
                if (_route) {
-                       char buf[16];
                        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 PhaseAutomation:
                if (_route) {
-                       if (_route->phase_control()->get_value() < 0.5) {
-                               _surface->write (display (1, "Normal"));
+                       if (val < 0.5) {
+                               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 "));
+       case EQGain:
+       case EQFrequency:
+       case EQQ:
+       case EQShape:
+       case EQHPF:
+       case CompThreshold:
+       case CompSpeed:
+       case CompMakeup:
+       case CompRedux:
+               snprintf (buf, sizeof (buf), "%6.1f", val);
+               pending_display[1] = buf;
+               screen_hold = true;
+               break;
+       case EQEnable:
+       case CompEnable:
+               if (val >= 0.5) {
+                       pending_display[1] = "on";
                } else {
-                       char buf[16];
-                       float dB = accurate_coefficient_to_dB (val);
-                       snprintf (buf, sizeof (buf), "%6.1f", dB);
-                       _surface->write (display (1, buf));
-                       screen_hold = true;
+                       pending_display[1] = "off";
+               }
+               break;
+       case CompMode:
+               if (_surface->mcp().subview_route()) {
+                       pending_display[1] = _surface->mcp().subview_route()->comp_mode_name (val);
+               }
+               break;
+       case SoloSafeAutomation:
+       case SoloIsolateAutomation:
+               if (val >= 0.5) {
+                       pending_display[1] = "on";
+               } else {
+                       pending_display[1] = "off";
+               }
+               break;
+       case MonitoringAutomation:
+               switch (MonitorChoice ((int) val)) {
+               case MonitorAuto:
+                       pending_display[1] = "auto";
+                       break;
+               case MonitorInput:
+                       pending_display[1] = "input";
+                       break;
+               case MonitorDisk:
+                       pending_display[1] = "disk";
+                       break;
+               case MonitorCue: /* XXX not implemented as of jan 2016 */
+                       pending_display[1] = "cue";
+                       break;
                }
                break;
-
        default:
                break;
        }
 
        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);
        }
 }
@@ -903,7 +1069,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::InverseGroup;
+       }
+
+       fader.set_value (position, gcd);
 
        /* From the Mackie Control MIDI implementation docs:
 
@@ -929,113 +1101,120 @@ Strip::handle_pot (Pot& pot, float delta)
        if (!ac) {
                return;
        }
-       double p = pot.get_value ();
-       p += delta;
-       // fader and pot should be the same and fader is hard coded 0 -> 1
-       p = max (0.0, p);
-       p = min (1.0, p);
-       pot.set_value (p);
-}
 
-void
-Strip::periodic (ARDOUR::microseconds_t now)
-{
-       bool reshow_vpot_mode = false;
-       bool reshow_name = false;
+       Controllable::GroupControlDisposition gcd;
 
-       if (!_route) {
-               return;
+       if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+               gcd = Controllable::InverseGroup;
+       } else {
+               gcd = Controllable::UseGroup;
        }
 
-       if (_block_screen_redisplay_until >= now) {
-               if (_surface->mcp().device_info().has_separate_meters()) {
-                       goto meters;
+       if (ac->toggled()) {
+
+               /* make it like a single-step, directional switch */
+
+               if (delta > 0) {
+                       ac->set_value (1.0, gcd);
+               } else {
+                       ac->set_value (0.0, gcd);
                }
-               /* no drawing here, for now */
-               return;
 
-       } else if (_block_screen_redisplay_until) {
+       } else if (ac->desc().enumeration || ac->desc().integer_step) {
 
-               /* timeout reached, reset */
+               /* use Controllable::get_value() to avoid the
+                * "scaling-to-interface" that takes place in
+                * Control::get_value() via the pot member.
+                *
+                * an enumeration with 4 values will have interface values of
+                * 0.0, 0.25, 0.5 and 0.75 or some similar oddness. Lets not
+                * deal with that.
+                */
 
-               _block_screen_redisplay_until = 0;
-               reshow_vpot_mode = true;
-               reshow_name = true;
-       }
+               if (delta > 0) {
+                       ac->set_value (min (ac->upper(), ac->get_value() + 1.0), gcd);
+               } else {
+                       ac->set_value (max (ac->lower(), ac->get_value() - 1.0), gcd);
+               }
 
-       if (_block_vpot_mode_redisplay_until >= now) {
-               return;
-       } else if (_block_vpot_mode_redisplay_until) {
+       } else {
 
-               /* timeout reached, reset */
+               double p = ac->get_interface();
 
-               _block_vpot_mode_redisplay_until = 0;
-               reshow_vpot_mode = true;
-       }
+               p += delta;
 
-       if (reshow_name) {
-               show_route_name ();
-       }
+               p = max (0.0, p);
+               p = min (1.0, p);
 
-       if (reshow_vpot_mode) {
-               return_to_vpot_mode_display ();
-       } else {
-               /* no point doing this if we just switched back to vpot mode
-                  display */
-               update_automation ();
+               ac->set_value ( ac->interface_to_internal(p), gcd);
        }
+}
 
-  meters:
+void
+Strip::periodic (ARDOUR::microseconds_t now)
+{
        update_meter ();
+       update_automation ();
 }
 
 void
-Strip::redisplay (ARDOUR::microseconds_t now)
+Strip::redisplay (ARDOUR::microseconds_t now, bool force)
 {
-       RedisplayRequest req;
-       bool have_request = false;
+       if (_block_screen_redisplay_until >= now) {
+               /* no drawing allowed */
+               return;
+       }
 
-       while (redisplay_requests.read (&req, 1) == 1) {
-               /* read them all */
-               have_request = 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 (_block_screen_redisplay_until >= now) {
-               return;
+       if (force || (current_display[0] != pending_display[0])) {
+               _surface->write (display (0, pending_display[0]));
+               current_display[0] = pending_display[0];
        }
 
-       if (have_request) {
-               do_parameter_display (req.type, req.val);
+       if (return_to_vpot_mode_display_at <= now) {
+               return_to_vpot_mode_display_at = UINT64_MAX;
+               return_to_vpot_mode_display ();
+       }
+
+       if (force || (current_display[1] != pending_display[1])) {
+               _surface->write (display (1, pending_display[1]));
+               current_display[1] = pending_display[1];
        }
 }
 
 void
 Strip::update_automation ()
 {
-       ARDOUR::AutoState gain_state = _route->gain_control()->automation_state();
+       if (!_route) {
+               return;
+       }
+
+       ARDOUR::AutoState state = _route->gain_control()->automation_state();
 
-       if (gain_state == Touch || gain_state == Play) {
+       if (state == Touch || state == Play) {
                notify_gain_changed (false);
        }
 
-if ( Profile->get_mixbus() ) {
-       ARDOUR::AutoState panner_state = mb_pan_controllable->automation_state();
-       if (panner_state == Touch || panner_state == Play) {
-               notify_panner_azi_changed (false);
-       }
-} else {
-       if (_route->panner()) {
-               ARDOUR::AutoState panner_state = _route->panner()->automation_state();
-               if (panner_state == Touch || panner_state == Play) {
+       boost::shared_ptr<AutomationControl> pan_control = _route->pan_azimuth_control ();
+       if (pan_control) {
+               state = pan_control->automation_state ();
+               if (state == Touch || state == Play) {
                        notify_panner_azi_changed (false);
-                       notify_panner_width_changed (false);
                }
        }
-}
-       if (_route->trim() && route()->trim()->active()) {
-               ARDOUR::AutoState trim_state = _route->trim_control()->automation_state();
-               if (trim_state == Touch || trim_state == Play) {
-                       notify_trim_changed (false);
+
+       pan_control = _route->pan_width_control ();
+       if (pan_control) {
+               state = pan_control->automation_state ();
+               if (state == Touch || state == Play) {
+                       notify_panner_width_changed (false);
                }
        }
 }
@@ -1043,9 +1222,18 @@ if ( Profile->get_mixbus() ) {
 void
 Strip::update_meter ()
 {
+       if (!_route) {
+               return;
+       }
+
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+               return;
+       }
+
        if (_meter && _transport_is_rolling && _metering_active) {
-               float dB = const_cast<PeakMeter&> (_route->peak_meter()).meter_level (0, MeterMCP);
+               float dB = _route->peak_meter()->meter_level (0, MeterMCP);
                _meter->send_update (*_surface, dB);
+               return;
        }
 }
 
@@ -1058,6 +1246,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
@@ -1135,66 +1327,64 @@ Strip::gui_selection_changed (const ARDOUR::StrongRouteNotificationList& rl)
 string
 Strip::vpot_mode_string ()
 {
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+               return string();
+       }
+
        boost::shared_ptr<AutomationControl> ac = _vpot->control();
+
        if (!ac) {
                return string();
        }
 
-       if (control_by_parameter.find (GainAutomation)->second == _vpot) {
-               return "Fader";
-       } else if (control_by_parameter.find (TrimAutomation)->second == _vpot) {
-               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) {
+       switch (ac->desc().type) {
+       case PanAzimuthAutomation:
                return "Pan";
-       } else if (control_by_parameter.find (PanWidthAutomation)->second == _vpot) {
+       case PanWidthAutomation:
                return "Width";
-       } else if (control_by_parameter.find (PanElevationAutomation)->second == _vpot) {
+       case PanElevationAutomation:
                return "Elev";
-       } else if (control_by_parameter.find (PanFrontBackAutomation)->second == _vpot) {
+       case PanFrontBackAutomation:
                return "F/Rear";
-       } else if (control_by_parameter.find (PanLFEAutomation)->second == _vpot) {
+       case PanLFEAutomation:
                return "LFE";
+       default:
+               break;
        }
 
        return "???";
 }
 
- void
-Strip::potmode_changed (bool notify)
+void
+Strip::flip_mode_changed ()
 {
-       if (!_route) {
-               return;
-       }
+       if (_surface->mcp().subview_mode() == MackieControlProtocol::Sends) {
 
-       // WIP
-       int pm = _surface->mcp().pot_mode();
-       switch (pm) {
-       case MackieControlProtocol::Pan:
-               // This needs to set current pan mode (azimuth or width... or whatever)
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Assign pot to Pan mode %1\n", enum_2_string (_pan_mode)));
-               set_vpot_parameter (_pan_mode);
-               break;
-       case MackieControlProtocol::Trim:
-               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;
-       }
+               boost::shared_ptr<AutomationControl> pot_control = _vpot->control();
+               boost::shared_ptr<AutomationControl> fader_control = _fader->control();
 
-       if (notify) {
-               notify_all ();
+               if (pot_control && fader_control) {
+                       _vpot->set_control (fader_control);
+                       _fader->set_control (pot_control);
+               }
+
+               if (_surface->mcp().flip_mode() == MackieControlProtocol::Normal) {
+                       do_parameter_display (GainAutomation, fader_control->get_value());
+               } else {
+                       do_parameter_display (BusSendLevel, fader_control->get_value());
+               }
+
+               /* update fader */
+
+               _surface->write (_fader->set_position (pot_control->internal_to_interface (pot_control->get_value ())));
+
+               /* update pot */
+
+               _surface->write (_vpot->set (fader_control->internal_to_interface (fader_control->get_value()), true, Pot::wrap));
+
+
+       } else {
+               /* do nothing */
        }
 }
 
@@ -1207,7 +1397,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
@@ -1217,22 +1407,25 @@ Strip::return_to_vpot_mode_display ()
           back the mode where it shows what the VPot controls.
        */
 
-       if (_route) {
-               _surface->write (display (1, vpot_mode_string()));
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+               /* do nothing - second line shows value of current subview parameter */
+               return;
+       } else if (_route) {
+               pending_display[1] = vpot_mode_string();
        } else {
-               _surface->write (blank_display (1));
+               pending_display[1] = string();
        }
 }
 
 void
 Strip::next_pot_mode ()
 {
-       vector<Evoral::Parameter>::iterator i;
+       vector<AutomationType>::iterator i;
 
        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;
        }
@@ -1243,252 +1436,458 @@ 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())) {
-                       return;
-               }
 
-               for (i = possible_pot_parameters.begin(); i != possible_pot_parameters.end(); ++i) {
-                       if ((*i) == ac->parameter()) {
-                               break;
-                       }
+
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+               return;
+       }
+
+       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().type()) {
+                       break;
                }
+       }
 
-               /* move to the next mode in the list, or back to the start (which will
-               also happen if the current mode is not in the current pot mode list)
-               */
+       /* move to the next mode in the list, or back to the start (which will
+          also happen if the current mode is not in the current pot mode list)
+       */
+
+       if (i != possible_pot_parameters.end()) {
+               ++i;
+       }
 
-               if (i != possible_pot_parameters.end()) {
-                       ++i;
+       if (i == possible_pot_parameters.end()) {
+               i = possible_pot_parameters.begin();
+       }
+
+       set_vpot_parameter (*i);
+}
+
+void
+Strip::subview_mode_changed ()
+{
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
+
+       subview_connections.drop_connections ();
+
+       switch (_surface->mcp().subview_mode()) {
+       case MackieControlProtocol::None:
+               set_vpot_parameter (_pan_mode);
+               /* need to show strip name again */
+               show_route_name ();
+               if (!_route) {
+                       _surface->write (_vpot->set (0, true, Pot::wrap));
+                       _surface->write (_fader->set_position (0.0));
                }
+               notify_metering_state_changed ();
+               eq_band = -1;
+               break;
 
-               if (i == possible_pot_parameters.end()) {
-                       i = possible_pot_parameters.begin();
+       case MackieControlProtocol::EQ:
+               if (r) {
+                       setup_eq_vpot (r);
+               } else {
+                       /* leave it as it was */
                }
-               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())) {
-                       return;
+               break;
+
+       case MackieControlProtocol::Dynamics:
+               if (r) {
+                       setup_dyn_vpot (r);
+               } else {
+                       /* leave it as it was */
                }
+               eq_band = -1;
+               break;
 
-               for (i = possible_trim_parameters.begin(); i != possible_trim_parameters.end(); ++i) {
-                       if ((*i) == ac->parameter()) {
-                               break;
-                       }
+       case MackieControlProtocol::Sends:
+               if (r) {
+                       setup_sends_vpot (r);
+               } else {
+                       /* leave it as it was */
                }
-               if ((*i).type() == PhaseAutomation && _route->phase_invert().size() > 1) {
-                       // There are more than one channel of phase
-                       if ((_route->phase_control()->channel() + 1) < _route->phase_invert().size()) {
-                               _route->phase_control()->set_channel(_route->phase_control()->channel() + 1);
-                               set_vpot_parameter (*i);
-                               return;
-                       } else {
-                               _route->phase_control()->set_channel(0);
-                       }
+               eq_band = -1;
+               break;
+       case MackieControlProtocol::TrackView:
+               if (r) {
+                       setup_trackview_vpot (r);
+               } else {
+                       /* leave it as it was */
                }
-               /* move to the next mode in the list, or back to the start (which will
-               also happen if the current mode is not in the current pot mode list)
-               */
+               eq_band = -1;
+               break;
+       }
+}
+
+void
+Strip::setup_dyn_vpot (boost::shared_ptr<Route> r)
+{
+       if (!r) {
+               return;
+       }
+
+       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.
+        */
 
-               if (i != possible_trim_parameters.end()) {
-                       ++i;
+       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
+Strip::setup_eq_vpot (boost::shared_ptr<Route> r)
+{
+       uint32_t bands = r->eq_band_cnt ();
+
+       if (bands == 0) {
+               /* should never get here */
+               return;
+       }
+
+       /* figure out how many params per band are available */
+
+       boost::shared_ptr<AutomationControl> pc;
+       uint32_t params_per_band = 0;
 
-               if (i == possible_trim_parameters.end()) {
-                       i = possible_trim_parameters.begin();
+       if ((pc = r->eq_gain_controllable (0))) {
+               params_per_band += 1;
+       }
+       if ((pc = r->eq_freq_controllable (0))) {
+               params_per_band += 1;
+       }
+       if ((pc = r->eq_q_controllable (0))) {
+               params_per_band += 1;
+       }
+       if ((pc = r->eq_shape_controllable (0))) {
+               params_per_band += 1;
+       }
+
+       /* pick the one for this strip, based on its global position across
+        * all surfaces
+        */
+
+       pc.reset ();
+
+       const uint32_t total_band_parameters = bands * params_per_band;
+       const uint32_t global_pos = _surface->mcp().global_index (*this);
+       AutomationType param = NullAutomation;
+       string band_name;
+
+       eq_band = -1;
+
+       if (global_pos < total_band_parameters) {
+
+               /* show a parameter for an EQ band */
+
+               const uint32_t parameter = global_pos % params_per_band;
+               eq_band = global_pos / params_per_band;
+               band_name = r->eq_band_name (eq_band);
+
+               switch (parameter) {
+               case 0:
+                       pc = r->eq_gain_controllable (eq_band);
+                       param = EQGain;
+                       break;
+               case 1:
+                       pc = r->eq_freq_controllable (eq_band);
+                       param = EQFrequency;
+                       break;
+               case 2:
+                       pc = r->eq_q_controllable (eq_band);
+                       param = EQQ;
+                       break;
+               case 3:
+                       pc = r->eq_shape_controllable (eq_band);
+                       param = EQShape;
+                       break;
                }
-               set_vpot_parameter (*i);
-       } else if (_surface->mcp().pot_mode() == MackieControlProtocol::Send) {
-               boost::shared_ptr<Processor> p = _route->nth_send (_current_send);
-               if (!p) {
+
+       } else {
+
+               /* show a non-band parameter (HPF or enable)
+                */
+
+               uint32_t parameter = global_pos - total_band_parameters;
+
+               switch (parameter) {
+               case 0: /* first control after band parameters */
+                       pc = r->eq_hpf_controllable();
+                       param = EQHPF;
+                       break;
+               case 1: /* second control after band parameters */
+                       pc = r->eq_enable_controllable();
+                       param = EQEnable;
+                       break;
+               default:
+                       /* nothing to control */
+                       _vpot->set_control (boost::shared_ptr<AutomationControl>());
+                       pending_display[0] = string();
+                       pending_display[1] = string();
+                       /* done */
                        return;
+                       break;
                }
-               p = _route->nth_send (_current_send + 1);
-               if (p && p->name() != "Monitor 1") {
-                       _current_send++;
+
+       }
+
+       if (pc) {
+               pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_eq_change, this, param, eq_band, false), ui_context());
+               _vpot->set_control (pc);
+
+               string pot_id;
+
+               switch (param) {
+               case EQGain:
+                       pot_id = band_name + "Gain";
+                       break;
+               case EQFrequency:
+                       pot_id = band_name + "Freq";
+                       break;
+               case EQQ:
+                       pot_id = band_name + " Q";
+                       break;
+               case EQShape:
+                       pot_id = band_name + " Shp";
+                       break;
+               case EQHPF:
+                       pot_id = "HPFreq";
+                       break;
+               case EQEnable:
+                       pot_id = "on/off";
+                       break;
+               default:
+                       break;
+               }
+
+               if (!pot_id.empty()) {
+                       pending_display[0] = pot_id;
                } else {
-                       _current_send = 0;
+                       pending_display[0] = string();
                }
-               set_vpot_parameter (SendAutomation);
+
+               notify_eq_change (param, eq_band, true);
        }
 }
 
 void
-Strip::set_vpot_parameter (Evoral::Parameter p)
+Strip::setup_sends_vpot (boost::shared_ptr<Route> r)
 {
-       boost::shared_ptr<Pannable> pannable;
+       if (!r) {
+               return;
+       }
 
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch to vpot mode %1\n", p.type()));
+       const uint32_t global_pos = _surface->mcp().global_index (*this);
 
-       reset_saved_values ();
+       boost::shared_ptr<AutomationControl> pc = r->send_level_controllable (global_pos);
+
+       if (!pc) {
+               pending_display[0] = string();
+               pending_display[1] = string();
+               return;
+       }
 
-       /* unset any mapping between the vpot and any existing parameters */
+       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);
 
-       for (ControlParameterMap::iterator i = control_by_parameter.begin(); i != control_by_parameter.end(); ++i) {
+       pending_display[0] = PBD::short_version (r->send_name (global_pos), 6);
 
-               if (i != control_by_parameter.end() && i->second == _vpot) {
-                       i->second = 0;
-               }
+       notify_send_level_change (BusSendLevel, global_pos, true);
+}
+
+void
+Strip::setup_trackview_vpot (boost::shared_ptr<Route> r)
+{
+       if (!r) {
+               return;
        }
 
-       switch (p.type()) {
-       case PanAzimuthAutomation:
-               _pan_mode = PanAzimuthAutomation;
-               pannable = _route->pannable ();
-               if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                       /* gain to vpot, pan azi to fader */
-                       _vpot->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _vpot;
-                       if (pannable) {
-                               _fader->set_control (mb_pan_controllable);
-                               control_by_parameter[PanAzimuthAutomation] = _fader;
-                       } else {
-                               _fader->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[PanAzimuthAutomation] = 0;
-                       }
-               } else {
-                       /* gain to fader, pan azi to vpot */
-                       _fader->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _fader;
-                       if (pannable) {
-                               _vpot->set_control (mb_pan_controllable);
-                               control_by_parameter[PanAzimuthAutomation] = _vpot;
-                       } else {
-                               _vpot->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[PanAzimuthAutomation] = 0;
-                       }
+       const uint32_t global_pos = _surface->mcp().global_index (*this);
+
+       if (global_pos >= 8) {
+               pending_display[0] = string();
+               pending_display[1] = string();
+               return;
+       }
+
+       boost::shared_ptr<AutomationControl> pc;
+       boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (r);
+       string label;
+
+       switch (global_pos) {
+       case 0:
+               pc = r->trim_control ();
+               if (pc) {
+                       pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_trackview_change, this, TrimAutomation, global_pos, false), ui_context());
+                       pending_display[0] = "Trim";
+                       notify_trackview_change (TrimAutomation, global_pos, true);
                }
                break;
-       case PanWidthAutomation:
-               _pan_mode = PanWidthAutomation;
-               pannable = _route->pannable ();
-               if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                       /* gain to vpot, pan width to fader */
-                       _vpot->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _vpot;
-                       if (pannable) {
-                               _fader->set_control (pannable->pan_width_control);
-                               control_by_parameter[PanWidthAutomation] = _fader;
-                       } else {
-                               _fader->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[PanWidthAutomation] = 0;
-                       }
-               } else {
-                       /* gain to fader, pan width to vpot */
-                       _fader->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _fader;
-                       if (pannable) {
-                               _vpot->set_control (pannable->pan_width_control);
-                               control_by_parameter[PanWidthAutomation] = _vpot;
-                       } else {
-                               _vpot->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[PanWidthAutomation] = 0;
+       case 1:
+               if (track) {
+                       pc = track->monitoring_control();
+                       if (pc) {
+                               pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_trackview_change, this, MonitoringAutomation, global_pos, false), ui_context());
+                               pending_display[0] = "Mon";
+                               notify_trackview_change (MonitoringAutomation, global_pos, true);
                        }
                }
                break;
-       case PanElevationAutomation:
-               break;
-       case PanFrontBackAutomation:
-               break;
-       case PanLFEAutomation:
-               break;
-       case TrimAutomation:
-               _trim_mode = TrimAutomation;
-               if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                       /* gain to vpot, trim to fader */
-                       _vpot->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _vpot;
-                       if (_route->trim() && route()->trim()->active()) {
-                               _fader->set_control (_route->trim_control());
-                               control_by_parameter[TrimAutomation] = _fader;
-                       } else {
-                               _fader->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[TrimAutomation] = 0;
-                       }
-               } else {
-                       /* gain to fader, trim to vpot */
-                       _fader->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _fader;
-                       if (_route->trim() && route()->trim()->active()) {
-                               _vpot->set_control (_route->trim_control());
-                               control_by_parameter[TrimAutomation] = _vpot;
-                       } else {
-                               _vpot->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[TrimAutomation] = 0;
-                       }
+       case 2:
+               pc = r->solo_isolate_control ();
+               if (pc) {
+                       pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_trackview_change, this, SoloIsolateAutomation, global_pos, false), ui_context());
+                       notify_trackview_change (SoloIsolateAutomation, global_pos, true);
+                       pending_display[0] = "S-Iso";
                }
                break;
-       case PhaseAutomation:
-               _trim_mode = PhaseAutomation;
-               if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                       /* gain to vpot, phase to fader */
-                       _vpot->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _vpot;
-                       if (_route->phase_invert().size()) {
-                               _fader->set_control (_route->phase_control());
-                               control_by_parameter[PhaseAutomation] = _fader;
-                       } else {
-                               _fader->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[PhaseAutomation] = 0;
-                       }
-               } else {
-                       /* gain to fader, phase to vpot */
-                       _fader->set_control (_route->group_gain_control());
-                       control_by_parameter[GainAutomation] = _fader;
-                       if (_route->phase_invert().size()) {
-                               _vpot->set_control (_route->phase_control());
-                               control_by_parameter[PhaseAutomation] = _vpot;
-                       } else {
-                               _vpot->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[PhaseAutomation] = 0;
-                       }
+       case 3:
+               pc = r->solo_safe_control ();
+               if (pc) {
+                       pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_trackview_change, this, SoloSafeAutomation, global_pos, false), ui_context());
+                       notify_trackview_change (SoloSafeAutomation, global_pos, true);
+                       pending_display[0] = "S-Safe";
                }
                break;
-       case SendAutomation:
-               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 {
-                               _vpot->set_control (boost::shared_ptr<AutomationControl>());
-                               control_by_parameter[SendAutomation] = 0;
-                       }
+       case 4:
+               pc = r->phase_control();
+               if (pc) {
+                       pc->Changed.connect (subview_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_trackview_change, this, PhaseAutomation, global_pos, false), ui_context());
+                       notify_trackview_change (PhaseAutomation, global_pos, true);
+                       pending_display[0] = "Phase";
                }
                break;
-       default:
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("vpot mode %1 not known.\n", p));
+       case 5:
+               // pc = r->trim_control ();
+               break;
+       case 6:
+               // pc = r->trim_control ();
+               break;
+       case 7:
+               // pc = r->trim_control ();
                break;
+       }
 
+       if (!pc) {
+               pending_display[0] = string();
+               pending_display[1] = string();
+               return;
        }
 
-       _surface->write (display (1, vpot_mode_string()));
+       _vpot->set_control (pc);
+}
+
+void
+Strip::set_vpot_parameter (AutomationType p)
+{
+       if (!_route || (p == NullAutomation)) {
+               _vpot->set_control (boost::shared_ptr<AutomationControl>());
+               pending_display[1] = string();
+               return;
+       }
+
+       boost::shared_ptr<AutomationControl> pan_control;
+
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch to vpot mode %1\n", p));
+
+       reset_saved_values ();
+
+       switch (p) {
+       case PanAzimuthAutomation:
+               pan_control = _route->pan_azimuth_control ();
+               break;
+       case PanWidthAutomation:
+               pan_control = _route->pan_width_control ();
+               break;
+       case PanElevationAutomation:
+               break;
+       case PanFrontBackAutomation:
+               break;
+       case PanLFEAutomation:
+               break;
+       default:
+               return;
+       }
+
+       if (pan_control) {
+               _pan_mode = p;
+               _vpot->set_control (pan_control);
+       }
+
+       pending_display[1] = vpot_mode_string ();
 }
 
 bool
@@ -1510,6 +1909,10 @@ Strip::reset_saved_values ()
 void
 Strip::notify_metering_state_changed()
 {
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+               return;
+       }
+
        if (!_route || !_meter) {
                return;
        }