merge (w/fix) with master
[ardour.git] / libs / surfaces / mackie / strip.cc
index 6c0427e8671edc22080bff02fb6f5f508d014375..ef4447d900906d6a92f34957de7e1523a35b2014 100644 (file)
 #include <stdint.h>
 #include "strip.h"
 
+#include <sys/time.h>
+
 #include "midi++/port.h"
 
 #include "pbd/compose.h"
 #include "pbd/convert.h"
 
+#include "ardour/amp.h"
+#include "ardour/bundle.h"
 #include "ardour/debug.h"
 #include "ardour/midi_ui.h"
-#include "ardour/route.h"
-#include "ardour/track.h"
+#include "ardour/meter.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 #include "ardour/rc_configuration.h"
-#include "ardour/meter.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/send.h"
+#include "ardour/track.h"
+#include "ardour/user_bundle.h"
 
 #include "mackie_control_protocol.h"
 #include "surface_port.h"
@@ -52,12 +59,8 @@ using namespace ARDOUR;
 using namespace PBD;
 
 #define ui_context() MackieControlProtocol::instance() /* a UICallback-derived object that specifies the event loop for signal handling */
-#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__))
-
-extern PBD::EventLoop::InvalidationRecord* __invalidator (sigc::trackable& trackable, const char*, int);
-#define invalidator() __invalidator (*(MackieControlProtocol::instance()), __FILE__, __LINE__)
 
-Strip::Strip (Surface& s, const std::string& name, int index, StripControlDefinition* ctls)
+Strip::Strip (Surface& s, const std::string& name, int index, const map<Button::ID,StripButtonInfo>& strip_buttons)
        : Group (name)
        , _solo (0)
        , _recenable (0)
@@ -67,157 +70,177 @@ Strip::Strip (Surface& s, const std::string& name, int index, StripControlDefini
        , _fader_touch (0)
        , _vpot (0)
        , _fader (0)
+       , _meter (0)
        , _index (index)
        , _surface (&s)
        , _controls_locked (false)
+       , _transport_is_rolling (false)
+       , _metering_active (true)
+       , _reset_display_at (0)
        , _last_gain_position_written (-1.0)
-       , _last_pan_position_written (-1.0)
+       , _last_pan_azi_position_written (-1.0)
+       , _last_pan_width_position_written (-1.0)
 {
-       /* build the controls for this track, which will automatically add them
-          to the Group 
-       */
+       _fader = dynamic_cast<Fader*> (Fader::factory (*_surface, index, "fader", *this));
+       _vpot = dynamic_cast<Pot*> (Pot::factory (*_surface, Pot::ID + index, "vpot", *this));
+
+       if (s.mcp().device_info().has_meters()) {
+               _meter = dynamic_cast<Meter*> (Meter::factory (*_surface, index, "meter", *this));
+       }
 
-       for (uint32_t i = 0; ctls[i].name[0]; ++i) {
-               ctls[i].factory (*_surface, ctls[i].base_id + index, ctls[i].name, *this);
+       for (map<Button::ID,StripButtonInfo>::const_iterator b = strip_buttons.begin(); b != strip_buttons.end(); ++b) {
+               Button* bb = dynamic_cast<Button*> (Button::factory (*_surface, b->first, b->second.base_id + index, b->second.name, *this));
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 strip %2 new button BID %3 id %4 from base %5\n",
+                                                                  _surface->number(), index, Button::id_to_name (bb->bid()), 
+                                                                  bb->id(), b->second.base_id));
        }
 }      
 
 Strip::~Strip ()
 {
+       /* surface is responsible for deleting all controls */
 }
 
-/**
-       TODO could optimise this to use enum, but it's only
-       called during the protocol class instantiation.
-*/
-void Strip::add (Control & control)
+void 
+Strip::add (Control & control)
 {
-       Group::add (control);
-
-       Fader* fader;
-       Pot* pot;
        Button* button;
-       Meter* meter;
-
-       if ((fader = dynamic_cast<Fader*>(&control)) != 0) {
 
-               _fader = fader;
-
-       } else if ((pot = dynamic_cast<Pot*>(&control)) != 0) {
-
-               _vpot = pot;
+       Group::add (control);
 
-       } else if ((button = dynamic_cast<Button*>(&control)) != 0) {
+       /* fader, vpot, meter were all set explicitly */
 
-               if (control.id() >= Button::recenable_base_id &&
-                   control.id() < Button::recenable_base_id + 8) {
-                       
+       if ((button = dynamic_cast<Button*>(&control)) != 0) {
+               switch (button->bid()) {
+               case Button::RecEnable:
                        _recenable = button;
-
-               } else if (control.id() >= Button::mute_base_id &&
-                          control.id() < Button::mute_base_id + 8) {
-
+                       break;
+               case Button::Mute:
                        _mute = button;
-
-               } else if (control.id() >= Button::solo_base_id &&
-                          control.id() < Button::solo_base_id + 8) {
-
+                       break;
+               case Button::Solo:
                        _solo = button;
-
-               } else if (control.id() >= Button::select_base_id &&
-                          control.id() < Button::select_base_id + 8) {
-
+                       break;
+               case Button::Select:
                        _select = button;
-
-               } else if (control.id() >= Button::vselect_base_id &&
-                          control.id() < Button::vselect_base_id + 8) {
-
+                       break;
+               case Button::VSelect:
                        _vselect = button;
-
-               } else if (control.id() >= Button::fader_touch_base_id &&
-                          control.id() < Button::fader_touch_base_id + 8) {
-
+                       break;
+               case Button::FaderTouch:
                        _fader_touch = button;
+                       break;
+               default:
+                       break;
                }
-
-       } else if ((meter = dynamic_cast<Meter*>(&control)) != 0) {
-               _meter = meter;
        }
 }
 
 void
-Strip::set_route (boost::shared_ptr<Route> r)
+Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/)
 {
        if (_controls_locked) {
                return;
        }
 
        route_connections.drop_connections ();
+       
+       _solo->set_control (boost::shared_ptr<AutomationControl>());
+       _mute->set_control (boost::shared_ptr<AutomationControl>());
+       _select->set_control (boost::shared_ptr<AutomationControl>());
+       _recenable->set_control (boost::shared_ptr<AutomationControl>());
+       _fader->set_control (boost::shared_ptr<AutomationControl>());
+       _vpot->set_control (boost::shared_ptr<AutomationControl>());
 
        _route = r;
 
-       if (r) {
+       control_by_parameter.clear ();
+       reset_saved_values ();
 
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface %1 strip %2 now mapping route %3\n",
-                                                                  _surface->number(), _index, _route->name()));
-               
+       if (!r) {
+               zero ();
+               return;
+       }
 
-               if (_solo) {
-                       _solo->set_normal_control (_route->solo_control());
-                       _route->solo_control()->Changed.connect(route_connections, invalidator(), ui_bind (&Strip::notify_solo_changed, this), ui_context());
-               }
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface %1 strip %2 now mapping route %3\n",
+                                                          _surface->number(), _index, _route->name()));
+       
+       _solo->set_control (_route->solo_control());
+       _mute->set_control (_route->mute_control());
 
-               if (_mute) {
-                       _mute->set_normal_control (_route->mute_control());
-                       _route->mute_control()->Changed.connect(route_connections, invalidator(), ui_bind (&Strip::notify_mute_changed, this), ui_context());
-               }
-               
-               _route->gain_control()->Changed.connect(route_connections, invalidator(), ui_bind (&Strip::notify_gain_changed, this, false), ui_context());
-               
-               _route->PropertyChanged.connect (route_connections, invalidator(), ui_bind (&Strip::notify_property_changed, this, _1), ui_context());
-               
-               if (_route->pannable()) {
-                       _route->pannable()->pan_azimuth_control->Changed.connect(route_connections, invalidator(), ui_bind (&Strip::notify_panner_changed, this, false), ui_context());
-                       _route->pannable()->pan_width_control->Changed.connect(route_connections, invalidator(), ui_bind (&Strip::notify_panner_changed, this, false), ui_context());
-               }
+       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());
 
-               flip_mode_changed (false);
-               
-               boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<ARDOUR::Track>(_route);
+       _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();
+
+       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());
        
-               if (trk) {
-                       // XXX FIX ME WHEN rec-enable IS-A AutomationControl
-                       // _recenable->set_normal_control (trk->rec_enable_control());
-                       trk->rec_enable_control()->Changed .connect(route_connections, invalidator(), ui_bind (&Strip::notify_record_enable_changed, this), ui_context());
-               }
-               
-               // TODO this works when a currently-banked route is made inactive, but not
-               // when a route is activated which should be currently banked.
+       boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<ARDOUR::Track>(_route);
+       
+       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());
+
                
-               _route->active_changed.connect (route_connections, invalidator(), ui_bind (&Strip::notify_active_changed, this), ui_context());
-               _route->DropReferences.connect (route_connections, invalidator(), ui_bind (&Strip::notify_route_deleted, this), ui_context());
+       }
        
-               // TODO
-               // SelectedChanged
-               // RemoteControlIDChanged. Better handled at Session level.
+       // TODO this works when a currently-banked route is made inactive, but not
+       // when a route is activated which should be currently banked.
+       
+       _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 ();
 
-               /* Update */
+       /* setup legal VPot modes for this route */
+       
+       build_input_list (_route->input()->n_ports());
+       build_output_list (_route->output()->n_ports());
 
-               notify_all ();
-       } else {
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface %1 strip %2 now unmapped\n",
-                                                                  _surface->number(), _index));
+       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 ((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);
+                       }
+               }
        }
 }
 
 void 
 Strip::notify_all()
 {
+       if (!_route) {
+               zero ();
+               return;
+       }
+
        notify_solo_changed ();
        notify_mute_changed ();
        notify_gain_changed ();
        notify_property_changed (PBD::PropertyChange (ARDOUR::Properties::name));
-       notify_panner_changed ();
+       notify_panner_azi_changed ();
+       notify_panner_width_changed ();
        notify_record_enable_changed ();
 }
 
@@ -225,7 +248,7 @@ void
 Strip::notify_solo_changed ()
 {
        if (_route && _solo) {
-               _surface->write (_solo->set_state (_route->soloed() ? on : off));
+               _surface->write (_solo->set_state ((_route->soloed() || _route->listening_via_monitor()) ? on : off));
        }
 }
 
@@ -264,39 +287,38 @@ Strip::notify_route_deleted ()
 void 
 Strip::notify_gain_changed (bool force_update)
 {
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("gain changed for strip %1, flip mode %2\n", _index, _surface->mcp().flip_mode()));
-
        if (_route) {
                
                Control* control;
 
-               if (_surface->mcp().flip_mode()) {
+               if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
                        control = _vpot;
                } else {
                        control = _fader;
                }
 
-               if (!control->in_use()) {
-
-                       float pos = _route->gain_control()->internal_to_interface (_route->gain_control()->get_value());
-
-                       if (force_update || pos != _last_gain_position_written) {
+               boost::shared_ptr<AutomationControl> ac = _route->gain_control();
+               
+               float gain_coefficient = ac->get_value();
+               float normalized_position = ac->internal_to_interface (gain_coefficient);
 
-                               if (_surface->mcp().flip_mode()) {
-                                       _surface->write (_vpot->set_all (pos, true, Pot::wrap));
-                               } else {
-                                       _surface->write (_fader->set_position (pos));
+               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));
                                }
-                               _last_gain_position_written = pos;
-
+                               do_parameter_display (GainAutomation, gain_coefficient);
                        } else {
-                               DEBUG_TRACE (DEBUG::MackieControl, "value is stale, no message sent\n");
+                               if (!control->in_use()) {
+                                       _surface->write (_fader->set_position (normalized_position));
+                               }
+                               do_parameter_display (GainAutomation, gain_coefficient);
                        }
-               } else {
-                       DEBUG_TRACE (DEBUG::MackieControl, "fader in use, no message sent\n");
+
+                       queue_display_reset (2000);
+                       _last_gain_position_written = normalized_position;
                }
-       } else {
-               DEBUG_TRACE (DEBUG::MackieControl, "no route or no fader\n");
        }
 }
 
@@ -316,13 +338,13 @@ Strip::notify_property_changed (const PropertyChange& what_changed)
                } else {
                        line1 = PBD::short_version (fullname, 6);
                }
-               
+
                _surface->write (display (0, line1));
        }
 }
 
 void 
-Strip::notify_panner_changed (bool force_update)
+Strip::notify_panner_azi_changed (bool force_update)
 {
        if (_route) {
 
@@ -330,83 +352,277 @@ Strip::notify_panner_changed (bool force_update)
 
                boost::shared_ptr<Pannable> pannable = _route->pannable();
 
-               if (!pannable) {
+               if (!pannable || !_route->panner()) {
                        _surface->write (_vpot->zero());
                        return;
                }
 
-               Control* control;
+               Control* control = control_by_parameter[PanAzimuthAutomation];
 
-               if (_surface->mcp().flip_mode()) {
-                       control = _fader;
-               } else {
-                       control = _vpot;
+               if (!control) {
+                       return;
                }
 
-               if (!control->in_use()) {
-                       
-                       double pos = pannable->pan_azimuth_control->internal_to_interface (pannable->pan_azimuth_control->get_value());
-                       
-                       if (force_update || pos != _last_pan_position_written) {
-                               if (_surface->mcp().flip_mode()) {
+               double pos = pannable->pan_azimuth_control->internal_to_interface (pannable->pan_azimuth_control->get_value());
+               
+               if (force_update || pos != _last_pan_azi_position_written) {
+
+                       if (control == _fader) {
+                               if (!_fader->in_use()) {
                                        _surface->write (_fader->set_position (pos));
-                               } else {
-                                       _surface->write (_vpot->set_all (pos, true, Pot::dot));
                                }
-                               _last_pan_position_written = pos;
+                       } else if (control == _vpot) {
+                               _surface->write (_vpot->set (pos, true, Pot::dot));
                        }
+                       
+                       do_parameter_display (PanAzimuthAutomation, pos);
+                       queue_display_reset (2000);
+                       _last_pan_azi_position_written = pos;
                }
        }
 }
 
-void
-Strip::handle_button (Button& button, ButtonState bs)
+void 
+Strip::notify_panner_width_changed (bool force_update)
 {
-       button.set_in_use (bs == press);
+       if (_route) {
 
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("strip %1 handling button %2\n", _index, button.id()));
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("pan width change for strip %1\n", _index));
 
-       if (bs != press) {
-               return;
+               boost::shared_ptr<Pannable> pannable = _route->pannable();
+
+               if (!pannable || !_route->panner()) {
+                       _surface->write (_vpot->zero());
+                       return;
+               }
+
+
+               Control* control = control_by_parameter[PanWidthAutomation];
+
+               if (!control) {
+                       return;
+               }       
+                       
+               double pos = pannable->pan_width_control->internal_to_interface (pannable->pan_width_control->get_value());
+               
+               if (force_update || pos != _last_pan_azi_position_written) {
+                       
+                       if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
+
+                               if (control == _fader) {
+                                       if (!control->in_use()) {
+                                               _surface->write (_fader->set_position (pos));
+                                       }
+                               }
+
+                       } else if (control == _vpot) {
+                               _surface->write (_vpot->set (pos, true, Pot::spread));
+                       }
+                       
+                       do_parameter_display (PanWidthAutomation, pos);
+                       queue_display_reset (2000);
+                       _last_pan_azi_position_written = pos;
+               }
        }
+}
 
-       int lock_mod = (MackieControlProtocol::MODIFIER_CONTROL|MackieControlProtocol::MODIFIER_SHIFT);
-       int ms = _surface->mcp().modifier_state();
-       bool modified = (ms & MackieControlProtocol::MODIFIER_CONTROL);
+void
+Strip::select_event (Button&, ButtonState bs)
+{
+       DEBUG_TRACE (DEBUG::MackieControl, "select button\n");
+       
+       if (bs == press) {
+               
+               int ms = _surface->mcp().modifier_state();
 
-       if (button.id() >= Button::select_base_id &&
-           button.id() < Button::select_base_id + 8) {
-               if ((ms & lock_mod) == lock_mod) {
+               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());
+                       }
+                       return;
+               }
+               
+               DEBUG_TRACE (DEBUG::MackieControl, "add select button on press\n");
+               _surface->mcp().add_down_select_button (_surface->number(), _index);                    
+               _surface->mcp().select_range ();
+               
+       } else {
+               DEBUG_TRACE (DEBUG::MackieControl, "remove select button on release\n");
+               _surface->mcp().remove_down_select_button (_surface->number(), _index);                 
        }
+}
 
-       if (button.id() >= Button::fader_touch_base_id &&
-           button.id() < Button::fader_touch_base_id + 8) {
+void
+Strip::vselect_event (Button&, ButtonState bs)
+{
+       if (bs == press) {
+
+               int ms = _surface->mcp().modifier_state();
+                               
+               if (ms & MackieControlProtocol::MODIFIER_SHIFT) {
+
+                       boost::shared_ptr<AutomationControl> ac = _vpot->control ();
+                               
+                       if (ac) {
+                               
+                               /* reset to default/normal value */
+                               ac->set_value (ac->normal());
+                       }
 
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader touch, press ? %1\n", (bs == press)));
+               }  else {
 
-               bool state = (bs == press);
-               
-               _fader->set_in_use (state);
-               _fader->start_touch (_surface->mcp().transport_frame(), modified);
+                       DEBUG_TRACE (DEBUG::MackieControl, "switching to next pot mode\n");
+                       next_pot_mode ();
+               }
 
-               if (!_surface->mcp().device_info().has_touch_sense_faders()) {
-                       _surface->mcp().add_in_use_timeout (*_surface, *_fader, _fader->control (modified));
+       }
+}
+
+void
+Strip::fader_touch_event (Button&, ButtonState bs)
+{
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader touch, press ? %1\n", (bs == press)));
+       
+       if (bs == press) {
+
+               boost::shared_ptr<AutomationControl> ac = _fader->control ();
+
+               if (_surface->mcp().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());
+                       
+                       if (ac) {
+                               do_parameter_display ((AutomationType) ac->parameter().type(), ac->internal_to_interface (ac->get_value()));
+                               queue_display_reset (2000);
+                       }
                }
+                       
+       } else {
+               
+               _fader->set_in_use (false);
+               _fader->stop_touch (_surface->mcp().transport_frame(), true);
+               
+       }
+}      
 
-               return;
+
+void
+Strip::handle_button (Button& button, ButtonState bs)
+{
+       boost::shared_ptr<AutomationControl> control;
+
+       if (bs == press) {
+               button.set_in_use (true);
+       } else {
+               button.set_in_use (false);
        }
 
-       if (ms & MackieControlProtocol::MODIFIER_OPTION) {
-               /* reset to default/normal value */
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("strip %1 handling button %2 press ? %3\n", _index, button.bid(), (bs == press)));
+       
+       switch (button.bid()) {
+       case Button::Select:
+               select_event (button, bs);
+               break;
+               
+       case Button::VSelect:
+               vselect_event (button, bs);
+               break;
+
+       case Button::FaderTouch:
+               fader_touch_event (button, bs);
+               break;
+
+       default:
+               if ((control = button.control ())) {
+                       if (bs == press) {
+                               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().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;
+                               }
+                               
+                               /* get all controls that either have their
+                                * button down or are within a range of
+                                * several down buttons
+                                */
+                               
+                               MackieControlProtocol::ControlList controls = _surface->mcp().down_controls ((AutomationType) control->parameter().type());
+                               
+                               
+                               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 */
+                               
+                               for (MackieControlProtocol::ControlList::iterator c = controls.begin(); c != controls.end(); ++c) {
+                                       (*c)->set_value (new_value);
+                               }
+                               
+                       } else {
+                               DEBUG_TRACE (DEBUG::MackieControl, "remove button on release\n");
+                               _surface->mcp().remove_down_button ((AutomationType) control->parameter().type(), _surface->number(), _index);
+                       }
+               }
+               break;
+       }
+}
 
-               boost::shared_ptr<AutomationControl> control = button.control (modified);
+void
+Strip::do_parameter_display (AutomationType type, float val)
+{
+       switch (type) {
+       case GainAutomation:
+               if (val == 0.0) {
+                       _surface->write (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));
+               }               
+               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));
+                       }
+               }
+               break;
 
-               if (control) {
-                       control->set_value (!control->get_value());
+       case PanWidthAutomation:
+               if (_route) {
+                       char buf[16];
+                       snprintf (buf, sizeof (buf), "%5ld%%", lrintf (val * 100.0));
+                       _surface->write (display (1, buf));
                }
+               break;
+
+       default:
+               break;
        }
 }
 
@@ -415,15 +631,10 @@ Strip::handle_fader (Fader& fader, float position)
 {
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader to %1\n", position));
 
-       bool modified = (_surface->mcp().modifier_state() & MackieControlProtocol::MODIFIER_CONTROL);
+       fader.set_value (position);
+       fader.start_touch (_surface->mcp().transport_frame());
+       queue_display_reset (2000);
 
-       fader.set_value (position, modified);
-       fader.start_touch (_surface->mcp().transport_frame(), modified);
-
-       if (!_surface->mcp().device_info().has_touch_sense_faders()) {
-               _surface->mcp().add_in_use_timeout (*_surface, fader, fader.control (modified));
-       }
-       
        // must echo bytes back to slider now, because
        // the notifier only works if the fader is not being
        // touched. Which it is if we're getting input.
@@ -438,19 +649,16 @@ Strip::handle_pot (Pot& pot, float delta)
           stop moving. So to get a stop event, we need to use a timeout.
        */
        
-       bool modified = (_surface->mcp().modifier_state() & MackieControlProtocol::MODIFIER_CONTROL);
-       pot.start_touch (_surface->mcp().transport_frame(), modified);
-       _surface->mcp().add_in_use_timeout (*_surface, pot, pot.control (modified));
-
-       double p = pot.get_value (modified);
+       boost::shared_ptr<AutomationControl> ac = pot.control();
+       double p = pot.get_value ();
        p += delta;
-       p = min (1.0, p);
-       p = max (0.0, p);
-       pot.set_value (p, modified);
+       p = max (ac->lower(), p);
+       p = min (ac->upper(), p);
+       pot.set_value (p);
 }
 
 void
-Strip::periodic ()
+Strip::periodic (uint64_t usecs)
 {
        if (!_route) {
                return;
@@ -458,6 +666,10 @@ Strip::periodic ()
 
        update_automation ();
        update_meter ();
+
+       if (_reset_display_at && _reset_display_at < usecs) {
+               reset_display ();
+       }
 }
 
 void 
@@ -472,7 +684,8 @@ Strip::update_automation ()
        if (_route->panner()) {
                ARDOUR::AutoState panner_state = _route->panner()->automation_state();
                if (panner_state == Touch || panner_state == Play) {
-                       notify_panner_changed (false);
+                       notify_panner_azi_changed (false);
+                       notify_panner_width_changed (false);
                }
        }
 }
@@ -480,25 +693,21 @@ Strip::update_automation ()
 void
 Strip::update_meter ()
 {
-       if (_meter) {
+       if (_meter && _transport_is_rolling && _metering_active) {
                float dB = const_cast<PeakMeter&> (_route->peak_meter()).peak_power (0);
-               _surface->write (_meter->update_message (dB));
+               _meter->send_update (*_surface, dB);
        }
 }
 
-MidiByteArray
+void
 Strip::zero ()
 {
-       MidiByteArray retval;
-
        for (Group::Controls::const_iterator it = _controls.begin(); it != _controls.end(); ++it) {
-               retval << (*it)->zero ();
+               _surface->write ((*it)->zero ());
        }
 
-       retval << blank_display (0);
-       retval << blank_display (1);
-       
-       return retval;
+       _surface->write (blank_display (0));
+       _surface->write (blank_display (1));
 }
 
 MidiByteArray
@@ -539,8 +748,6 @@ Strip::display (uint32_t line_number, const std::string& line)
        // sysex trailer
        retval << MIDI::eox;
        
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("MackieMidiBuilder::strip_display midi: %1\n", retval));
-
        return retval;
 }
 
@@ -556,16 +763,44 @@ Strip::unlock_controls ()
        _controls_locked = false;
 }
 
-MidiByteArray
-Strip::gui_selection_changed (ARDOUR::RouteNotificationListPtr rl)
+void
+Strip::gui_selection_changed (const ARDOUR::StrongRouteNotificationList& rl)
 {
-       for (ARDOUR::RouteNotificationList::iterator i = rl->begin(); i != rl->end(); ++i) {
+       for (ARDOUR::StrongRouteNotificationList::const_iterator i = rl.begin(); i != rl.end(); ++i) {
                if ((*i) == _route) {
-                       return _select->set_state (on);
+                       _surface->write (_select->set_state (on));
+                       return;
                }
        }
 
-       return _select->set_state (off);
+       _surface->write (_select->set_state (off));
+}
+
+string
+Strip::vpot_mode_string () const
+{
+       boost::shared_ptr<AutomationControl> ac = _vpot->control();
+       
+       if (!ac) {
+               return string();
+       }
+
+       switch (ac->parameter().type()) {
+       case GainAutomation:
+               return "Fader";
+       case PanAzimuthAutomation:
+               return "Pan";
+       case PanWidthAutomation:
+               return "Width";
+       case PanElevationAutomation:
+               return "Elev";
+       case PanFrontBackAutomation:
+               return "F/Rear";
+       case PanLFEAutomation:
+               return "LFE";
+       }
+
+       return "???";
 }
 
 void
@@ -575,32 +810,287 @@ Strip::flip_mode_changed (bool notify)
                return;
        }
 
-       boost::shared_ptr<Pannable> pannable = _route->pannable();
+       reset_saved_values ();
 
-       if (_surface->mcp().flip_mode()) {
+       boost::shared_ptr<AutomationControl> fader_controllable = _fader->control ();
+       boost::shared_ptr<AutomationControl> vpot_controllable = _vpot->control ();
 
-               if (pannable) {
-                       _fader->set_normal_control (pannable->pan_azimuth_control);
-                       _fader->set_modified_control (pannable->pan_width_control);
-               }
-               _vpot->set_normal_control (_route->gain_control());
-               _vpot->set_modified_control (boost::shared_ptr<AutomationControl>());
+       _fader->set_control (vpot_controllable);
+       _vpot->set_control (fader_controllable);
+
+       control_by_parameter[fader_controllable->parameter()] = _vpot;
+       control_by_parameter[vpot_controllable->parameter()] = _fader;
 
-               _surface->write (display (1, "Fader"));
+       _surface->write (display (1, vpot_mode_string ()));
 
+       if (notify) {
+               notify_all ();
+       }
+}
+
+void
+Strip::queue_display_reset (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;
+}
+
+void
+Strip::clear_display_reset ()
+{
+       _reset_display_at = 0;
+}
+
+void
+Strip::reset_display ()
+{
+       if (_route) {
+               _surface->write (display (1, vpot_mode_string()));
        } else {
+               _surface->write (blank_display (1));
+       }
+               
+       clear_display_reset ();
+}
+                        
+struct RouteCompareByName {
+       bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
+               return a->name().compare (b->name()) < 0;
+       }
+};
 
-               if (pannable) {
-                       _vpot->set_normal_control (pannable->pan_azimuth_control);
-                       _vpot->set_modified_control (pannable->pan_width_control);
+void
+Strip::maybe_add_to_bundle_map (BundleMap& bm, boost::shared_ptr<Bundle> b, bool for_input, const ChanCount& channels)
+{
+       if (b->ports_are_outputs() == !for_input  || b->nchannels() != channels) {
+               return;
+       }
+
+       bm[b->name()] = b;
+}
+
+void
+Strip::build_input_list (const ChanCount& channels)
+{
+       boost::shared_ptr<ARDOUR::BundleList> b = _surface->mcp().get_session().bundles ();
+
+       input_bundles.clear ();
+
+       /* give user bundles first chance at being in the menu */
+       
+       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);
+               }
+       }
+       
+       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);
                }
-               _fader->set_normal_control (_route->gain_control());
-               _fader->set_modified_control (boost::shared_ptr<AutomationControl>());
+       }
+       
+       boost::shared_ptr<ARDOUR::RouteList> routes = _surface->mcp().get_session().get_routes ();
+       RouteList copy = *routes;
+       copy.sort (RouteCompareByName ());
 
-               _surface->write (display (1, "Pan"));
+       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 (notify) {
-               notify_all ();
+}
+
+void
+Strip::build_output_list (const ChanCount& channels)
+{
+       boost::shared_ptr<ARDOUR::BundleList> b = _surface->mcp().get_session().bundles ();
+
+       output_bundles.clear ();
+
+       /* give user bundles first chance at being in the menu */
+       
+       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);
+               }
+       }
+       
+       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);
+               }
+       }
+       
+       boost::shared_ptr<ARDOUR::RouteList> routes = _surface->mcp().get_session().get_routes ();
+       RouteList copy = *routes;
+       copy.sort (RouteCompareByName ());
+
+       for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {
+               maybe_add_to_bundle_map (output_bundles, (*i)->input()->bundle(), false, channels);
+       }
+}
+
+void
+Strip::next_pot_mode ()
+{
+       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);
+               return;
+       }
+
+
+       boost::shared_ptr<AutomationControl> ac = _vpot->control();
+
+       if (!ac) {
+               return;
+       }
+
+       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;
+               }
+       }
+
+       /* 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::set_vpot_parameter (Evoral::Parameter p)
+{
+       boost::shared_ptr<Pannable> pannable;
+
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch to vpot mode %1\n", p));
+
+       reset_saved_values ();
+
+       switch (p.type()) {
+       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;
+                               }
+                       }
+               }
+               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;
+                               }
+                       }
+               }
+               break;
+       case PanElevationAutomation:
+               break;
+       case PanFrontBackAutomation:
+               break;
+       case PanLFEAutomation:
+               break;
        }
+
+       _surface->write (display (1, vpot_mode_string()));
+}
+
+void
+Strip::reset_saved_values ()
+{
+       _last_pan_azi_position_written = -1.0;
+       _last_pan_width_position_written = -1.0;
+       _last_gain_position_written = -1.0;
+
+}
+
+void 
+Strip::notify_metering_state_changed()
+{
+       if (!_route || !_meter) {
+               return;
+       }
+       
+       bool transport_is_rolling = (_surface->mcp().get_transport_speed () != 0.0f);
+       bool metering_active = _surface->mcp().metering_active ();
+       
+       if ((_transport_is_rolling == transport_is_rolling) && (_metering_active == metering_active)) {
+               return;
+       }
+       
+       _meter->notify_metering_state_changed (*_surface, transport_is_rolling, metering_active);
+       
+       if (!transport_is_rolling || !metering_active) {
+               notify_property_changed (PBD::PropertyChange (ARDOUR::Properties::name));
+               notify_panner_azi_changed (true);
+       }
+       
+       _transport_is_rolling = transport_is_rolling;
+       _metering_active = metering_active;
 }