remove Route::listening_via_monitor()
[ardour.git] / libs / surfaces / mackie / strip.cc
index 4528e7b1551be64e655febd509888b53d860741a..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"
+#include "ardour/profile.h"
 
 #include "mackie_control_protocol.h"
 #include "surface_port.h"
 #include "surface.h"
+#include "strip.h"
 #include "button.h"
 #include "led.h"
 #include "pot.h"
@@ -92,11 +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)
-       , _reset_display_at (0)
+       , _block_screen_redisplay_until (0)
+       , return_to_vpot_mode_display_at (UINT64_MAX)
+       , eq_band (-1)
+       , _pan_mode (PanAzimuthAutomation)
        , _last_gain_position_written (-1.0)
        , _last_pan_azi_position_written (-1.0)
        , _last_pan_width_position_written (-1.0)
-       , redisplay_requests (256)
+       , _last_trim_position_written (-1.0)
 {
        _fader = dynamic_cast<Fader*> (Fader::factory (*_surface, index, "fader", *this));
        _vpot = dynamic_cast<Pot*> (Pot::factory (*_surface, Pot::ID + index, "vpot", *this));
@@ -160,6 +172,8 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
                return;
        }
 
+       mb_pan_controllable.reset();
+
        route_connections.drop_connections ();
 
        _solo->set_control (boost::shared_ptr<AutomationControl>());
@@ -171,10 +185,10 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
 
        _route = r;
 
-       control_by_parameter.clear ();
        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;
        }
@@ -185,19 +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());
 
-       set_vpot_parameter (PanAzimuthAutomation);
-
-       _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());
 
-       boost::shared_ptr<Pannable> pannable = _route->pannable();
+       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 (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());
+       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());
        }
+
        _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());
 
@@ -206,8 +220,6 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
        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
@@ -216,32 +228,35 @@ Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
        _route->active_changed.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_active_changed, this), ui_context());
        _route->DropReferences.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_route_deleted, this), ui_context());
 
-       /* Update */
-
-       notify_all ();
-
        /* setup legal VPot modes for this route */
 
-       build_input_list (_route->input()->n_ports());
-       build_output_list (_route->output()->n_ports());
-
        possible_pot_parameters.clear();
 
-       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 (_route->pan_azimuth_control()) {
+               possible_pot_parameters.push_back (PanAzimuthAutomation);
+       }
+       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);
+       }
 
-                       if ((a = automatable.find (PanAzimuthAutomation)) != automatable.end()) {
-                               possible_pot_parameters.push_back (PanAzimuthAutomation);
-                       }
+       _pan_mode = PanAzimuthAutomation;
 
-                       if ((a = automatable.find (PanWidthAutomation)) != automatable.end()) {
-                               possible_pot_parameters.push_back (PanWidthAutomation);
-                       }
-               }
+       if (_surface->mcp().subview_mode() == MackieControlProtocol::None) {
+               set_vpot_parameter (_pan_mode);
        }
+
+       _fader->set_control (_route->gain_control());
+
+       notify_all ();
 }
 
 void
@@ -251,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 ();
@@ -259,13 +278,14 @@ Strip::notify_all()
        notify_panner_azi_changed ();
        notify_panner_width_changed ();
        notify_record_enable_changed ();
+       notify_processor_changed ();
 }
 
 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));
        }
 }
 
@@ -285,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));
+               }
        }
 }
 
@@ -304,42 +327,53 @@ 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));
                        }
-
-                       queue_display_reset (2000);
-                       _last_gain_position_written = normalized_position;
                }
+
+               do_parameter_display (GainAutomation, gain_coefficient);
+               _last_gain_position_written = normalized_position;
        }
 }
 
+void
+Strip::notify_processor_changed (bool force_update)
+{
+}
+
 void
 Strip::notify_property_changed (const PropertyChange& what_changed)
 {
@@ -347,100 +381,285 @@ Strip::notify_property_changed (const PropertyChange& what_changed)
                return;
        }
 
-       if (_route) {
-               string line1;
-               string fullname = _route->name();
+       show_route_name ();
+}
 
-               if (fullname.length() <= 6) {
-                       line1 = fullname;
-               } else {
-                       line1 = PBD::short_version (fullname, 6);
-               }
+void
+Strip::show_route_name ()
+{
+       MackieControlProtocol::SubViewMode svm = _surface->mcp().subview_mode();
+
+       if (svm != MackieControlProtocol::None) {
+               /* subview mode is responsible for upper line */
+               return;
+       }
+
+       string fullname = string();
+       if (!_route) {
+               fullname = string();
+       } else {
+               fullname = _route->name();
+       }
 
-               _surface->write (display (0, line1));
+       if (fullname.length() <= 6) {
+               pending_display[0] = fullname;
+       } else {
+               pending_display[0] = PBD::short_version (fullname, 6);
        }
 }
 
 void
-Strip::notify_panner_azi_changed (bool force_update)
+Strip::notify_send_level_change (AutomationType type, uint32_t send_num, bool force_update)
 {
-       if (_route) {
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
 
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan change for strip %1\n", _index));
+       if (!r) {
+               /* not in subview mode */
+               return;
+       }
 
-               boost::shared_ptr<Pannable> pannable = _route->pannable();
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::Sends) {
+               /* no longer in Sends subview mode */
+               return;
+       }
 
-               if (!pannable || !_route->panner()) {
-                       _surface->write (_vpot->zero());
-                       return;
-               }
+       boost::shared_ptr<AutomationControl> control = r->send_level_controllable (send_num);
+       if (!control) {
+               return;
+       }
 
-               Control* control = control_by_parameter[PanAzimuthAutomation];
+       if (control) {
+               float val = control->get_value();
+               do_parameter_display (type, val);
 
-               if (!control) {
-                       return;
+               if (_vpot->control() == control) {
+                       /* update pot/encoder */
+                       _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
                }
+       }
+}
 
-               double pos = pannable->pan_azimuth_control->internal_to_interface (pannable->pan_azimuth_control->get_value());
+void
+Strip::notify_trackview_change (AutomationType type, uint32_t send_num, bool force_update)
+{
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
 
-               if (force_update || pos != _last_pan_azi_position_written) {
+       if (!r) {
+               /* not in subview mode */
+               return;
+       }
 
-                       if (control == _fader) {
-                               if (!_fader->in_use()) {
-                                       _surface->write (_fader->set_position (pos));
-                               }
-                       } else if (control == _vpot) {
-                               _surface->write (_vpot->set (pos, true, Pot::dot));
-                       }
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::TrackView) {
+               /* no longer in TrackViewsubview mode */
+               return;
+       }
 
-                       queue_parameter_display (PanAzimuthAutomation, pos);
-                       queue_display_reset (2000);
-                       _last_pan_azi_position_written = pos;
+       boost::shared_ptr<AutomationControl> control;
+       boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (r);
+
+       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;
+       }
+
+       if (control) {
+               float val = control->get_value();
+
+               /* 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.
+                */
+
+               do_parameter_display (type, val);
+               /* update pot/encoder */
+               _surface->write (_vpot->set (control->internal_to_interface (val), true, Pot::wrap));
        }
 }
 
 void
-Strip::notify_panner_width_changed (bool force_update)
+Strip::notify_eq_change (AutomationType type, uint32_t band, bool force_update)
 {
-       if (_route) {
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
 
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan width change for strip %1\n", _index));
+       if (!r) {
+               /* not in subview mode */
+               return;
+       }
 
-               boost::shared_ptr<Pannable> pannable = _route->pannable();
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::EQ) {
+               /* no longer in EQ subview mode */
+               return;
+       }
 
-               if (!pannable || !_route->panner()) {
-                       _surface->write (_vpot->zero());
-                       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;
+       }
 
-               Control* control = control_by_parameter[PanWidthAutomation];
+       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));
+       }
+}
 
-               if (!control) {
-                       return;
-               }
+void
+Strip::notify_dyn_change (AutomationType type, bool force_update, bool propagate_mode)
+{
+       boost::shared_ptr<Route> r = _surface->mcp().subview_route();
 
-               double pos = pannable->pan_width_control->internal_to_interface (pannable->pan_width_control->get_value());
+       if (!r) {
+               /* not in subview mode */
+               return;
+       }
 
-               if (force_update || pos != _last_pan_azi_position_written) {
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::Dynamics) {
+               /* no longer in EQ subview mode */
+               return;
+       }
 
-                       if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
+       boost::shared_ptr<AutomationControl> control;
+       bool reset_all = false;
 
-                               if (control == _fader) {
-                                       if (!control->in_use()) {
-                                               _surface->write (_fader->set_position (pos));
-                                       }
-                               }
+       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;
+       }
 
-                       } else if (control == _vpot) {
-                               _surface->write (_vpot->set (pos, true, Pot::spread));
-                       }
+       if (propagate_mode && reset_all) {
+               _surface->subview_mode_changed ();
+       }
 
-                       queue_parameter_display (PanWidthAutomation, pos);
-                       queue_display_reset (2000);
-                       _last_pan_azi_position_written = pos;
-               }
+       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) {
+               return;
+       }
+
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan change for strip %1\n", _index));
+
+       boost::shared_ptr<AutomationControl> pan_control = _route->pan_azimuth_control ();
+
+       if (!pan_control) {
+               /* basically impossible, since we're here because that control
+                *  changed, but sure, whatever.
+                */
+               return;
+       }
+
+       if (_vpot->control() != pan_control) {
+               return;
+       }
+
+       double normalized_pos = pan_control->internal_to_interface (pan_control->get_value());
+       double internal_pos = pan_control->get_value();
+
+       if (force_update || (normalized_pos != _last_pan_azi_position_written)) {
+
+               _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 = normalized_pos;
+       }
+}
+
+void
+Strip::notify_panner_width_changed (bool force_update)
+{
+       if (!_route) {
+               return;
+       }
+
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan width change for strip %1\n", _index));
+
+       boost::shared_ptr<AutomationControl> pan_control = _route->pan_width_control ();
+
+       if (!pan_control) {
+               /* basically impossible, since we're here because that control
+                *  changed, but sure, whatever.
+                */
+               return;
+       }
+
+       if (_vpot->control() != pan_control) {
+               return;
+       }
+
+       double pos = pan_control->internal_to_interface (pan_control->get_value());
+
+       if (force_update || pos != _last_pan_width_position_written) {
+
+               _surface->write (_vpot->set (pos, true, Pot::spread));
+               do_parameter_display (PanWidthAutomation, pos);
+
+               _last_pan_width_position_written = pos;
        }
 }
 
@@ -456,16 +675,7 @@ Strip::select_event (Button&, ButtonState bs)
                if (ms & MackieControlProtocol::MODIFIER_CMDALT) {
                        _controls_locked = !_controls_locked;
                        _surface->write (display (1,_controls_locked ?  "Locked" : "Unlock"));
-                       queue_display_reset (1000);
-                       return;
-               }
-
-               if (ms & MackieControlProtocol::MODIFIER_SHIFT) {
-                       /* reset to default */
-                       boost::shared_ptr<AutomationControl> ac = _fader->control ();
-                       if (ac) {
-                               ac->set_value (ac->normal());
-                       }
+                       block_vpot_mode_display_for (1000);
                        return;
                }
 
@@ -482,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();
@@ -493,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
                }
 
        }
@@ -514,19 +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->internal_to_interface (ac->get_value()));
-                               queue_display_reset (2000);
-                       }
+               if (ac) {
+                       do_parameter_display ((AutomationType) ac->parameter().type(), ac->get_value());
                }
 
        } else {
@@ -570,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
@@ -591,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 {
@@ -606,53 +909,145 @@ 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)
 {
+       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 (_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 PanWidthAutomation:
+       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) {
+                       float dB = accurate_coefficient_to_dB (val);
+                       snprintf (buf, sizeof (buf), "%6.1f", dB);
+                       pending_display[1] = buf;
+                       screen_hold = true;
+               }
+               break;
+
+       case PhaseAutomation:
+               if (_route) {
+                       if (val < 0.5) {
+                               pending_display[1] = "Normal";
+                       } else {
+                               pending_display[1] = "Invert";
+                       }
+                       screen_hold = true;
                }
                break;
 
+       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 {
+                       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);
+       }
 }
 
 void
@@ -669,8 +1064,18 @@ void
 Strip::handle_fader (Fader& fader, float position)
 {
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader to %1\n", position));
+       boost::shared_ptr<AutomationControl> ac = fader.control();
+       if (!ac) {
+               return;
+       }
+
+       Controllable::GroupControlDisposition gcd = Controllable::UseGroup;
 
-       fader.set_value (position);
+       if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+               gcd = Controllable::InverseGroup;
+       }
+
+       fader.set_value (position, gcd);
 
        /* From the Mackie Control MIDI implementation docs:
 
@@ -693,57 +1098,122 @@ Strip::handle_pot (Pot& pot, float delta)
        */
 
        boost::shared_ptr<AutomationControl> ac = pot.control();
-       double p = pot.get_value ();
-       p += delta;
-       p = max (ac->lower(), p);
-       p = min (ac->upper(), p);
-       pot.set_value (p);
-}
-
-void
-Strip::periodic (uint64_t usecs)
-{
-       if (!_route) {
+       if (!ac) {
                return;
        }
 
-       update_automation ();
-       update_meter ();
+       Controllable::GroupControlDisposition gcd;
 
-       if (_reset_display_at && _reset_display_at < usecs) {
-               reset_display ();
+       if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
+               gcd = Controllable::InverseGroup;
+       } else {
+               gcd = Controllable::UseGroup;
+       }
+
+       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);
+               }
+
+       } else if (ac->desc().enumeration || ac->desc().integer_step) {
+
+               /* 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.
+                */
+
+               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);
+               }
+
+       } else {
+
+               double p = ac->get_interface();
+
+               p += delta;
+
+               p = max (0.0, p);
+               p = min (1.0, p);
+
+               ac->set_value ( ac->interface_to_internal(p), gcd);
        }
 }
 
 void
-Strip::redisplay ()
+Strip::periodic (ARDOUR::microseconds_t now)
 {
-       RedisplayRequest req;
-       bool have_request = false;
+       update_meter ();
+       update_automation ();
+}
+
+void
+Strip::redisplay (ARDOUR::microseconds_t now, bool force)
+{
+       if (_block_screen_redisplay_until >= now) {
+               /* no drawing allowed */
+               return;
+       }
+
+       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 (force || (current_display[0] != pending_display[0])) {
+               _surface->write (display (0, pending_display[0]));
+               current_display[0] = pending_display[0];
+       }
 
-       while (redisplay_requests.read (&req, 1) == 1) {
-               /* read them all */
-               have_request = true;
+       if (return_to_vpot_mode_display_at <= now) {
+               return_to_vpot_mode_display_at = UINT64_MAX;
+               return_to_vpot_mode_display ();
        }
 
-       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];
        }
 }
 
 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 (_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);
+               }
+       }
+
+       pan_control = _route->pan_width_control ();
+       if (pan_control) {
+               state = pan_control->automation_state ();
+               if (state == Touch || state == Play) {
                        notify_panner_width_changed (false);
                }
        }
@@ -752,9 +1222,18 @@ Strip::update_automation ()
 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;
        }
 }
 
@@ -767,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
@@ -842,17 +1325,19 @@ Strip::gui_selection_changed (const ARDOUR::StrongRouteNotificationList& rl)
 }
 
 string
-Strip::vpot_mode_string () const
+Strip::vpot_mode_string ()
 {
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+               return string();
+       }
+
        boost::shared_ptr<AutomationControl> ac = _vpot->control();
 
        if (!ac) {
                return string();
        }
 
-       switch (ac->parameter().type()) {
-       case GainAutomation:
-               return "Fader";
+       switch (ac->desc().type) {
        case PanAzimuthAutomation:
                return "Pan";
        case PanWidthAutomation:
@@ -863,257 +1348,529 @@ Strip::vpot_mode_string () const
                return "F/Rear";
        case PanLFEAutomation:
                return "LFE";
+       default:
+               break;
        }
 
        return "???";
 }
 
 void
-Strip::flip_mode_changed (bool notify)
+Strip::flip_mode_changed ()
 {
-       if (!_route) {
-               return;
-       }
+       if (_surface->mcp().subview_mode() == MackieControlProtocol::Sends) {
 
-       reset_saved_values ();
+               boost::shared_ptr<AutomationControl> pot_control = _vpot->control();
+               boost::shared_ptr<AutomationControl> fader_control = _fader->control();
 
-       boost::shared_ptr<AutomationControl> fader_controllable = _fader->control ();
-       boost::shared_ptr<AutomationControl> vpot_controllable = _vpot->control ();
+               if (pot_control && fader_control) {
+                       _vpot->set_control (fader_control);
+                       _fader->set_control (pot_control);
+               }
 
-       _fader->set_control (vpot_controllable);
-       _vpot->set_control (fader_controllable);
+               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 ())));
 
-       control_by_parameter[fader_controllable->parameter()] = _vpot;
-       control_by_parameter[vpot_controllable->parameter()] = _fader;
+               /* update pot */
 
-       _surface->write (display (1, vpot_mode_string ()));
+               _surface->write (_vpot->set (fader_control->internal_to_interface (fader_control->get_value()), true, Pot::wrap));
 
-       if (notify) {
-               notify_all ();
+
+       } else {
+               /* do nothing */
        }
 }
 
 void
-Strip::queue_display_reset (uint32_t msecs)
+Strip::block_screen_display_for (uint32_t msecs)
 {
-       struct timeval now;
-       struct timeval delta;
-       struct timeval when;
-       gettimeofday (&now, 0);
-
-       delta.tv_sec = msecs/1000;
-       delta.tv_usec = (msecs - ((msecs/1000) * 1000)) * 1000;
-
-       timeradd (&now, &delta, &when);
-
-       _reset_display_at = (when.tv_sec * 1000000) + when.tv_usec;
+       _block_screen_redisplay_until = ARDOUR::get_microseconds() + (msecs * 1000);
 }
 
 void
-Strip::clear_display_reset ()
+Strip::block_vpot_mode_display_for (uint32_t msecs)
 {
-       _reset_display_at = 0;
+       return_to_vpot_mode_display_at = ARDOUR::get_microseconds() + (msecs * 1000);
 }
 
 void
-Strip::reset_display ()
+Strip::return_to_vpot_mode_display ()
 {
-       if (_route) {
-               _surface->write (display (1, vpot_mode_string()));
+       /* returns the second line of the two-line per-strip display
+          back the mode where it shows what the VPot controls.
+       */
+
+       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();
        }
-
-       clear_display_reset ();
 }
 
-struct RouteCompareByName {
-       bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-               return a->name().compare (b->name()) < 0;
-       }
-};
-
 void
-Strip::maybe_add_to_bundle_map (BundleMap& bm, boost::shared_ptr<Bundle> b, bool for_input, const ChanCount& channels)
+Strip::next_pot_mode ()
 {
-       if (b->ports_are_outputs() == !for_input  || b->nchannels() != channels) {
+       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");
+               pending_display[1] = "Flip";
+               block_vpot_mode_display_for (1000);
                return;
        }
 
-       bm[b->name()] = b;
+
+       boost::shared_ptr<AutomationControl> ac = _vpot->control();
+
+       if (!ac) {
+               return;
+       }
+
+
+       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)
+       */
+
+       if (i != possible_pot_parameters.end()) {
+               ++i;
+       }
+
+       if (i == possible_pot_parameters.end()) {
+               i = possible_pot_parameters.begin();
+       }
+
+       set_vpot_parameter (*i);
 }
 
 void
-Strip::build_input_list (const ChanCount& channels)
+Strip::subview_mode_changed ()
 {
-       boost::shared_ptr<ARDOUR::BundleList> b = _surface->mcp().get_session().bundles ();
+       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;
 
-       input_bundles.clear ();
+       case MackieControlProtocol::EQ:
+               if (r) {
+                       setup_eq_vpot (r);
+               } else {
+                       /* leave it as it was */
+               }
+               break;
 
-       /* give user bundles first chance at being in the menu */
+       case MackieControlProtocol::Dynamics:
+               if (r) {
+                       setup_dyn_vpot (r);
+               } else {
+                       /* leave it as it was */
+               }
+               eq_band = -1;
+               break;
 
-       for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
-               if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
-                       maybe_add_to_bundle_map (input_bundles, *i, true, channels);
+       case MackieControlProtocol::Sends:
+               if (r) {
+                       setup_sends_vpot (r);
+               } else {
+                       /* leave it as it was */
+               }
+               eq_band = -1;
+               break;
+       case MackieControlProtocol::TrackView:
+               if (r) {
+                       setup_trackview_vpot (r);
+               } else {
+                       /* leave it as it was */
                }
+               eq_band = -1;
+               break;
        }
+}
 
-       for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
-               if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) {
-                       maybe_add_to_bundle_map (input_bundles, *i, true, channels);
-               }
+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.
+        */
+
+       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<ARDOUR::RouteList> routes = _surface->mcp().get_session().get_routes ();
-       RouteList copy = *routes;
-       copy.sort (RouteCompareByName ());
+       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;
+       }
 
-       for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
-               maybe_add_to_bundle_map (input_bundles, (*i)->output()->bundle(), true, channels);
+       if (!pot_id.empty()) {
+               pending_display[0] = pot_id;
+       } else {
+               pending_display[0] = string();
        }
 
+       notify_dyn_change (param, true, false);
 }
 
 void
-Strip::build_output_list (const ChanCount& channels)
+Strip::setup_eq_vpot (boost::shared_ptr<Route> r)
 {
-       boost::shared_ptr<ARDOUR::BundleList> b = _surface->mcp().get_session().bundles ();
+       uint32_t bands = r->eq_band_cnt ();
 
-       output_bundles.clear ();
+       if (bands == 0) {
+               /* should never get here */
+               return;
+       }
 
-       /* give user bundles first chance at being in the menu */
+       /* figure out how many params per band are available */
 
-       for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
-               if (boost::dynamic_pointer_cast<UserBundle> (*i)) {
-                       maybe_add_to_bundle_map (output_bundles, *i, false, channels);
-               }
+       boost::shared_ptr<AutomationControl> pc;
+       uint32_t params_per_band = 0;
+
+       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
+        */
 
-       for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
-               if (boost::dynamic_pointer_cast<UserBundle> (*i) == 0) {
-                       maybe_add_to_bundle_map (output_bundles, *i, false, channels);
+       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;
                }
+
+       } 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;
+               }
+
        }
 
-       boost::shared_ptr<ARDOUR::RouteList> routes = _surface->mcp().get_session().get_routes ();
-       RouteList copy = *routes;
-       copy.sort (RouteCompareByName ());
+       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 {
+                       pending_display[0] = string();
+               }
 
-       for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
-               maybe_add_to_bundle_map (output_bundles, (*i)->input()->bundle(), false, channels);
+               notify_eq_change (param, eq_band, true);
        }
 }
 
 void
-Strip::next_pot_mode ()
+Strip::setup_sends_vpot (boost::shared_ptr<Route> r)
 {
-       vector<Evoral::Parameter>::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"));
-               queue_display_reset (1000);
+       if (!r) {
                return;
        }
 
+       const uint32_t global_pos = _surface->mcp().global_index (*this);
 
-       boost::shared_ptr<AutomationControl> ac = _vpot->control();
+       boost::shared_ptr<AutomationControl> pc = r->send_level_controllable (global_pos);
 
-       if (!ac) {
+       if (!pc) {
+               pending_display[0] = string();
+               pending_display[1] = string();
                return;
        }
 
-       if (possible_pot_parameters.empty() || (possible_pot_parameters.size() == 1 && possible_pot_parameters.front() == ac->parameter())) {
+       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] = PBD::short_version (r->send_name (global_pos), 6);
+
+       notify_send_level_change (BusSendLevel, global_pos, true);
+}
+
+void
+Strip::setup_trackview_vpot (boost::shared_ptr<Route> r)
+{
+       if (!r) {
                return;
        }
 
-       for (i = possible_pot_parameters.begin(); i != possible_pot_parameters.end(); ++i) {
-               if ((*i) == ac->parameter()) {
-                       break;
-               }
-       }
+       const uint32_t global_pos = _surface->mcp().global_index (*this);
 
-       /* 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 (global_pos >= 8) {
+               pending_display[0] = string();
+               pending_display[1] = string();
+               return;
+       }
 
-       if (i != possible_pot_parameters.end()) {
-               ++i;
+       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 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 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 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 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;
+       case 5:
+               // pc = r->trim_control ();
+               break;
+       case 6:
+               // pc = r->trim_control ();
+               break;
+       case 7:
+               // pc = r->trim_control ();
+               break;
        }
 
-       if (i == possible_pot_parameters.end()) {
-               i = possible_pot_parameters.begin();
+       if (!pc) {
+               pending_display[0] = string();
+               pending_display[1] = string();
+               return;
        }
 
-       set_vpot_parameter (*i);
+       _vpot->set_control (pc);
 }
 
 void
-Strip::set_vpot_parameter (Evoral::Parameter p)
+Strip::set_vpot_parameter (AutomationType p)
 {
-       boost::shared_ptr<Pannable> pannable;
+       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.type()) {
+       switch (p) {
        case PanAzimuthAutomation:
-               pannable = _route->pannable ();
-               if (pannable) {
-                       if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                               /* gain to vpot, pan azi to fader */
-                               _vpot->set_control (_route->gain_control());
-                               control_by_parameter[GainAutomation] = _vpot;
-                               if (pannable) {
-                                       _fader->set_control (pannable->pan_azimuth_control);
-                                       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->gain_control());
-                               control_by_parameter[GainAutomation] = _fader;
-                               if (pannable) {
-                                       _vpot->set_control (pannable->pan_azimuth_control);
-                                       control_by_parameter[PanAzimuthAutomation] = _vpot;
-                               } else {
-                                       _vpot->set_control (boost::shared_ptr<AutomationControl>());
-                                       control_by_parameter[PanAzimuthAutomation] = 0;
-                               }
-                       }
-               }
+               pan_control = _route->pan_azimuth_control ();
                break;
        case PanWidthAutomation:
-               pannable = _route->pannable ();
-               if (pannable) {
-                       if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
-                               /* gain to vpot, pan width to fader */
-                               _vpot->set_control (_route->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->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;
-                               }
-                       }
-               }
+               pan_control = _route->pan_width_control ();
                break;
        case PanElevationAutomation:
                break;
@@ -1121,9 +1878,22 @@ Strip::set_vpot_parameter (Evoral::Parameter p)
                break;
        case PanLFEAutomation:
                break;
+       default:
+               return;
+       }
+
+       if (pan_control) {
+               _pan_mode = p;
+               _vpot->set_control (pan_control);
        }
 
-       _surface->write (display (1, vpot_mode_string()));
+       pending_display[1] = vpot_mode_string ();
+}
+
+bool
+Strip::is_midi_track () const
+{
+       return boost::dynamic_pointer_cast<MidiTrack>(_route) != 0;
 }
 
 void
@@ -1132,12 +1902,17 @@ Strip::reset_saved_values ()
        _last_pan_azi_position_written = -1.0;
        _last_pan_width_position_written = -1.0;
        _last_gain_position_written = -1.0;
+       _last_trim_position_written = -1.0;
 
 }
 
 void
 Strip::notify_metering_state_changed()
 {
+       if (_surface->mcp().subview_mode() != MackieControlProtocol::None) {
+               return;
+       }
+
        if (!_route || !_meter) {
                return;
        }