MCP: ctrl-select toggle selections status, analogous to GUI op
[ardour.git] / libs / surfaces / mackie / mackie_control_protocol.cc
index 96de6b222d0853a9968b180a24e3c848b3af82df..a5bcefcb1785a1c98ffc69017261935fbb455ac8 100644 (file)
@@ -1,5 +1,6 @@
 /*
        Copyright (C) 2006,2007 John Anderson
+       Copyright (C) 2012 Paul Davis
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
 
 #include "midi++/types.h"
 #include "midi++/port.h"
-#include "midi++/manager.h"
+#include "midi++/ipmidi_port.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/error.h"
 #include "pbd/memento_command.h"
 #include "pbd/convert.h"
 
+#include "ardour/automation_control.h"
 #include "ardour/dB.h"
 #include "ardour/debug.h"
 #include "ardour/location.h"
-#include "ardour/midi_ui.h"
 #include "ardour/meter.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
+#include "ardour/track.h"
 #include "ardour/types.h"
 #include "ardour/audioengine.h"
 
 
 #include "midi_byte_array.h"
 #include "mackie_control_exception.h"
-#include "route_signal.h"
-#include "mackie_midi_builder.h"
+#include "device_profile.h"
 #include "surface_port.h"
 #include "surface.h"
-#include "bcf_surface.h"
-#include "mackie_surface.h"
-
 #include "strip.h"
 #include "control_group.h"
 #include "meter.h"
@@ -75,46 +73,51 @@ using namespace ARDOUR;
 using namespace std;
 using namespace Mackie;
 using namespace PBD;
+using namespace Glib;
 
 #include "i18n.h"
 
 #include "pbd/abstract_ui.cc" // instantiate template
 
-#define NUCLEUS_DEBUG 1
-
-MackieMidiBuilder builder;
-
-#define midi_ui_context() MidiControlUI::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(x) __invalidator ((x), __FILE__, __LINE__)
-
 const int MackieControlProtocol::MODIFIER_OPTION = 0x1;
 const int MackieControlProtocol::MODIFIER_CONTROL = 0x2;
-const int MackieControlProtocol::MODIFIER_SHIFT = 0x3;
-const int MackieControlProtocol::MODIFIER_CMDALT = 0x4;
+const int MackieControlProtocol::MODIFIER_SHIFT = 0x4;
+const int MackieControlProtocol::MODIFIER_CMDALT = 0x8;
+
+MackieControlProtocol* MackieControlProtocol::_instance = 0;
+
+bool MackieControlProtocol::probe()
+{
+       return true;
+}
 
 MackieControlProtocol::MackieControlProtocol (Session& session)
-       : ControlProtocol (session, X_("Mackie"), MidiControlUI::instance())
+       : ControlProtocol (session, X_("Mackie"))
        , AbstractUI<MackieControlUIRequest> ("mackie")
        , _current_initial_bank (0)
-       , _surface (0)
-       , _jog_wheel (*this)
        , _timecode_type (ARDOUR::AnyTime::BBT)
        , _input_bundle (new ARDOUR::Bundle (_("Mackie Control In"), true))
        , _output_bundle (new ARDOUR::Bundle (_("Mackie Control Out"), false))
        , _gui (0)
        , _zoom_mode (false)
        , _scrub_mode (false)
+       , _flip_mode (false)
+       , _view_mode (Mixer)
        , _current_selected_track (-1)
+       , _modifier_state (0)
+       , _ipmidi_base (MIDI::IPMIDIPort::lowest_ipmidi_port_default)
+       , needs_ipmidi_restart (false)
 {
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
 
-       AudioEngine::instance()->PortConnectedOrDisconnected.connect (
-               audio_engine_connections, invalidator (*this), ui_bind (&MackieControlProtocol::port_connected_or_disconnected, this, _2, _4, _5),
-               midi_ui_context ()
-               );
+       DeviceInfo::reload_device_info ();
+       DeviceProfile::reload_device_profiles ();
+
+       TrackSelectionChanged.connect (gui_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::gui_track_selection_changed, this, _1), this);
+
+       _instance = this;
+
+       build_button_map ();
 }
 
 MackieControlProtocol::~MackieControlProtocol()
@@ -123,6 +126,10 @@ MackieControlProtocol::~MackieControlProtocol()
 
        _active = false;
 
+       /* stop event loop */
+
+       BaseUI::quit ();
+
        try {
                close();
        }
@@ -134,41 +141,33 @@ MackieControlProtocol::~MackieControlProtocol()
        }
 
        DEBUG_TRACE (DEBUG::MackieControl, "finished ~MackieControlProtocol::MackieControlProtocol\n");
+
+       _instance = 0;
 }
 
 void
 MackieControlProtocol::thread_init ()
 {
+       struct sched_param rtparam;
+
+       pthread_set_name (X_("MackieControl"));
+
        PBD::notify_gui_about_thread_creation (X_("gui"), pthread_self(), X_("MackieControl"), 2048);
        ARDOUR::SessionEvent::create_per_thread_pool (X_("MackieControl"), 128);
-}
 
-Mackie::Surface& 
-MackieControlProtocol::surface()
-{
-       if (_surface == 0) {
-               throw MackieControlException ("_surface is 0 in MackieControlProtocol::surface");
-       }
-       return *_surface;
-}
+       memset (&rtparam, 0, sizeof (rtparam));
+       rtparam.sched_priority = 9; /* XXX should be relative to audio (JACK) thread */
 
-const Mackie::SurfacePort& 
-MackieControlProtocol::mcu_port() const
-{
-       if (_ports.size() < 1) {
-               return _dummy_port;
-       } else {
-               return dynamic_cast<const MackiePort &> (*_ports[0]);
+       if (pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam) != 0) {
+               // do we care? not particularly.
        }
 }
 
-Mackie::SurfacePort& 
-MackieControlProtocol::mcu_port()
+void
+MackieControlProtocol::midi_connectivity_established ()
 {
-       if (_ports.size() < 1) {
-               return _dummy_port;
-       } else {
-               return dynamic_cast<MackiePort &> (*_ports[0]);
+       for (Surfaces::const_iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
+               (*si)->say_hello ();
        }
 }
 
@@ -178,7 +177,6 @@ void
 MackieControlProtocol::prev_track()
 {
        if (_current_initial_bank >= 1) {
-               session->set_dirty();
                switch_banks (_current_initial_bank - 1);
        }
 }
@@ -189,43 +187,20 @@ void
 MackieControlProtocol::next_track()
 {
        Sorted sorted = get_sorted_routes();
-       if (_current_initial_bank + route_table.size() < sorted.size()) {
-               session->set_dirty();
+       if (_current_initial_bank + n_strips() < sorted.size()) {
                switch_banks (_current_initial_bank + 1);
        }
 }
 
-void 
-MackieControlProtocol::clear_route_signals()
-{
-       Glib::Mutex::Lock lm (route_signals_lock);
-
-       for (RouteSignals::iterator it = route_signals.begin(); it != route_signals.end(); ++it) {
-               delete *it;
-       }
-
-       route_signals.clear();
-}
-
-// return the port for a given id - 0 based
-// throws an exception if no port found
-MackiePort& 
-MackieControlProtocol::port_for_id (uint32_t index)
+bool
+MackieControlProtocol::route_is_locked_to_strip (boost::shared_ptr<Route> r) const
 {
-       uint32_t current_max = 0;
-
-       for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-               current_max += (*it)->strips();
-               if (index < current_max) { 
-                       return **it;
+       for (Surfaces::const_iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
+               if ((*si)->route_is_locked_to_strip (r)) {
+                       return true;
                }
        }
-
-       // oops - no matching port
-       ostringstream os;
-       os << "No port for index " << index;
-       cerr << "No port for index " << index << endl;
-       throw MackieControlException (os.str());
+       return false;
 }
 
 // predicate for sort call in get_sorted_routes
@@ -262,19 +237,50 @@ MackieControlProtocol::get_sorted_routes()
 
        // sort in remote_id order, and exclude master, control and hidden routes
        // and any routes that are already set.
+
        for (RouteList::iterator it = routes->begin(); it != routes->end(); ++it) {
-               Route & route = **it;
-               if (
-                       route.active()
-                       && !route.is_master()
-                       && !route.is_hidden()
-                       && !route.is_monitor()
-                       && remote_ids.find (route.remote_control_id()) == remote_ids.end()
-                       ) {
-                       sorted.push_back (*it);
-                       remote_ids.insert (route.remote_control_id());
+
+               boost::shared_ptr<Route> route = *it;
+
+               if (remote_ids.find (route->remote_control_id()) != remote_ids.end()) {
+                       continue;
+               }
+
+               if (route->is_hidden() || route->is_master() || route->is_monitor()) {
+                       continue;
+               }
+
+               /* don't include locked routes */
+
+               if (route_is_locked_to_strip(route)) {
+                       continue;
+               }
+
+               switch (_view_mode) {
+               case Mixer:
+                       break;
+               case AudioTracks:
+                       break;
+               case Busses:
+                       break;
+               case MidiTracks:
+                       break;
+               case Dynamics:
+                       break;
+               case EQ:
+                       break;
+               case Loop:
+                       break;
+               case Sends:
+                       break;
+               case Plugins:
+                       break;
                }
+
+               sorted.push_back (*it);
+               remote_ids.insert (route->remote_control_id());
        }
+
        sort (sorted.begin(), sorted.end(), RouteByRemoteId());
        return sorted;
 }
@@ -282,99 +288,77 @@ MackieControlProtocol::get_sorted_routes()
 void 
 MackieControlProtocol::refresh_current_bank()
 {
-       switch_banks (_current_initial_bank);
+       switch_banks (_current_initial_bank, true);
+}
+
+uint32_t
+MackieControlProtocol::n_strips (bool with_locked_strips) const
+{
+       uint32_t strip_count = 0;
+
+       for (Surfaces::const_iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
+               strip_count += (*si)->n_strips (with_locked_strips);
+       }
+
+       return strip_count;
 }
 
 void 
-MackieControlProtocol::switch_banks (int initial)
+MackieControlProtocol::switch_banks (uint32_t initial, bool force)
 {
-       // DON'T prevent bank switch if initial == _current_initial_bank
-       // because then this method can't be used as a refresh
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch banking to start at %1 force ? %2 current = %3\n", initial, force, _current_initial_bank));
+
+       if (initial == _current_initial_bank && !force) {
+               return;
+       }
 
        Sorted sorted = get_sorted_routes();
-       int delta = sorted.size() - route_table.size();
+       uint32_t strip_cnt = n_strips (false); // do not include locked strips
+                                              // in this count
 
-       if (initial < 0 || (delta > 0 && initial > delta)) {
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("not switching to %1\n", initial));
+       if (sorted.size() <= strip_cnt && !force) {
+               /* no banking - not enough routes to fill all strips */
                return;
        }
 
        _current_initial_bank = initial;
        _current_selected_track = -1;
 
-       clear_route_signals();
+       // Map current bank of routes onto each surface(+strip)
 
-       // now set the signals for new routes
        if (_current_initial_bank <= sorted.size()) {
 
-               uint32_t end_pos = min (route_table.size(), sorted.size());
-               uint32_t i = 0;
-               Sorted::iterator it = sorted.begin() + _current_initial_bank;
-               Sorted::iterator end = sorted.begin() + _current_initial_bank + end_pos;
-
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch to %1, %2\n", _current_initial_bank, end_pos));
-
-               route_table.clear ();
-               set_route_table_size (surface().strips.size());
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch to %1, %2, available routes %3\n", _current_initial_bank, strip_cnt, sorted.size()));
 
                // link routes to strips
 
-               Glib::Mutex::Lock lm (route_signals_lock);
+               Sorted::iterator r = sorted.begin() + _current_initial_bank;
+               
+               for (Surfaces::iterator si = surfaces.begin(); si != surfaces.end(); ++si) {
+                       vector<boost::shared_ptr<Route> > routes;
+                       uint32_t added = 0;
 
-               for (; it != end && it != sorted.end(); ++it, ++i) {
-                       boost::shared_ptr<Route> route = *it;
+                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface has %1 unlockedstrips\n", (*si)->n_strips (false)));
 
-                       assert (surface().strips[i]);
-                       Strip & strip = *surface().strips[i];
+                       for (; r != sorted.end() && added < (*si)->n_strips (false); ++r, ++added) {
+                               routes.push_back (*r);
+                       }
 
-                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("remote id %1 connecting %2 to %3 with port %4\n", 
-                                                                          route->remote_control_id(), route->name(), strip.name(), port_for_id(i)));
-                       set_route_table (i, route);
-                       RouteSignal * rs = new RouteSignal (route, *this, strip, port_for_id(i));
-                       route_signals.push_back (rs);
-                       rs->notify_all ();
-               }
+                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("give surface %1 routes\n", routes.size()));
 
-               // create dead strips if there aren't enough routes to
-               // fill a bank
-               for (; i < route_table.size(); ++i) {
-                       Strip & strip = *surface().strips[i];
-                       // send zero for this strip
-                       MackiePort & port = port_for_id(i);
-                       port.write (builder.zero_strip (port, strip));
+                       (*si)->map_routes (routes);
                }
        }
 
-       // display the current start bank.
-       surface().display_bank_start (mcu_port(), builder, _current_initial_bank);
-}
-
-void 
-MackieControlProtocol::zero_all()
-{
-       // TODO turn off Timecode displays
-
-       // zero all strips
-       for (Surface::Strips::iterator it = surface().strips.begin(); it != surface().strips.end(); ++it) {
-               MackiePort & port = port_for_id ((*it)->index());
-               port.write (builder.zero_strip (port, **it));
-       }
-
-       // and the master strip
-       mcu_port().write (builder.zero_strip (dynamic_cast<MackiePort&> (mcu_port()), master_strip()));
-
-       // turn off global buttons and leds
-       // global buttons are only ever on mcu_port, so we don't have
-       // to figure out which port.
-       for (Surface::Controls::iterator it = surface().controls.begin(); it != surface().controls.end(); ++it) {
-               Control & control = **it;
-               if (!control.group().is_strip() && control.accepts_feedback()) {
-                       mcu_port().write (builder.zero_control (control));
-               }
-       }
+       /* reset this to get the right display of view mode after the switch */
+       set_view_mode (_view_mode);
 
-       // any hardware-specific stuff
-       surface().zero_all (mcu_port(), builder);
+       /* make sure selection is correct */
+       
+       // gui_track_selection_changed (_last_selected_routes);
+       
+       /* current bank has not been saved */
+       session->set_dirty();
 }
 
 int 
@@ -384,65 +368,30 @@ MackieControlProtocol::set_active (bool yn)
                return 0;
        }
 
-       try
-       {
-               // the reason for the locking and unlocking is that
-               // glibmm can't do a condition wait on a RecMutex
-               if (yn) {
-                       // TODO what happens if this fails half way?
-
-                       // start an event loop
-
-                       BaseUI::run ();
-                       
-                       // create MackiePorts
-                       {
-                               Glib::Mutex::Lock lock (update_mutex);
-                               create_ports();
-                       }
-                       
-                       // now initialise MackiePorts - ie exchange sysex messages
-                       for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-                               (*it)->open();
-                       }
-                       
-                       // wait until all ports are active
-                       // TODO a more sophisticated approach would
-                       // allow things to start up with only an MCU, even if
-                       // extenders were specified but not responding.
-                       for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-                               (*it)->wait_for_init();
-                       }
-                       
-                       // create surface object. This depends on the ports being
-                       // correctly initialised
-                       initialize_surface();
-                       connect_session_signals();
-                       
-                       // yeehah!
-                       _active = true;
-                       
-                       // send current control positions to surface
-                       // must come after _active = true otherwise it won't run
-                       update_surface();
-
-                       Glib::RefPtr<Glib::TimeoutSource> periodic_timeout = Glib::TimeoutSource::create (100); // milliseconds
-
-                       periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::periodic));
-
-                       periodic_timeout->attach (main_loop()->get_context());
+       if (yn) {
+               
+               /* start event loop */
+               
+               BaseUI::run ();
+               
+               create_surfaces ();
+               connect_session_signals ();
+               _active = true;
+               update_surfaces ();
+               
+               /* set up periodic task for metering and automation
+                */
+               
+               Glib::RefPtr<Glib::TimeoutSource> periodic_timeout = Glib::TimeoutSource::create (100); // milliseconds
+               periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::periodic));
+               periodic_timeout->attach (main_loop()->get_context());
+               
+       } else {
 
-               } else {
-                       BaseUI::quit ();
-                       close();
-                       _active = false;
-               }
-       }
-       
-       catch (exception & e) {
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("set_active to false because exception caught: %1\n", e.what()));
+               BaseUI::quit ();
+               close ();
                _active = false;
-               throw;
+
        }
 
        return 0;
@@ -455,96 +404,38 @@ MackieControlProtocol::periodic ()
                return false;
        }
 
-       {
-               Glib::Mutex::Lock lm (route_signals_lock);
-               for (RouteSignals::iterator rs = route_signals.begin(); rs != route_signals.end(); ++rs) {
-                       update_automation (**rs);
-                       float dB = const_cast<PeakMeter&> ((*rs)->route()->peak_meter()).peak_power (0);
-                       (*rs)->port().write ((*rs)->strip().meter().update_message (dB));
-               }
-
-               // and the master strip
-               if (master_route_signal != 0) {
-                       update_automation (*master_route_signal);
-               }
+       if (needs_ipmidi_restart) {
+               ipmidi_restart ();
+               return true;
        }
 
-       update_timecode_display();
-
-       return true;
-}
-
-bool 
-MackieControlProtocol::handle_strip_button (SurfacePort & port, Control & control, ButtonState bs, boost::shared_ptr<Route> route)
-{
-       bool state = false;
-
-       if (bs == press) {
-               if (control.name() == "recenable") {
-                       state = !route->record_enabled();
-                       route->set_record_enabled (state, this);
-               } else if (control.name() == "mute") {
-                       state = !route->muted();
-                       route->set_mute (state, this);
-               } else if (control.name() == "solo") {
-                       state = !route->soloed();
-                       route->set_solo (state, this);
-               } else if (control.name() == "select") {
-                       Strip* strip = const_cast<Strip*>(dynamic_cast<const Strip*>(&control.group()));
-                       if (strip) {
+       struct timeval now;
+       uint64_t now_usecs;
+       gettimeofday (&now, 0);
 
-                               if ((uint32_t) strip->index() < route_table.size()) {
-                                       boost::shared_ptr<Route> r = route_table[strip->index()];
-
-                                       if (_modifier_state == MODIFIER_SHIFT) {
-                                               r->gain_control()->set_value (0.0);
-                                       } else {
-                                               if (r->remote_control_id() == _current_selected_track) {
-                                                       UnselectTrack (); /* EMIT SIGNAL */
-                                                       _current_selected_track = -1;
-                                               } else {
-                                                       SelectByRID (r->remote_control_id()); /* EMIT SIGNAL */
-                                                       _current_selected_track = r->remote_control_id();;
-                                               }
-                                       }
-                               } 
-                       }
-               } else if (control.name() == "vselect") {
-                       // TODO could be used to select different things to apply the pot to?
-                       //state = default_button_press (dynamic_cast<Button&> (control));
-               }
-       }
+       now_usecs = (now.tv_sec * 1000000) + now.tv_usec;
 
-       if (control.name() == "fader_touch") {
-               state = bs == press;
-               Strip* strip = const_cast<Strip*>(dynamic_cast<const Strip*>(&control.group()));
-               
-               if (strip) {
-                       strip->gain().set_in_use (state);
-
-                       if (ARDOUR::Config->get_mackie_emulation() == "bcf" && state) {
-                               /* BCF faders don't support touch, so add a timeout to reset
-                                  their `in_use' state.
-                               */
-                               add_in_use_timeout (port, strip->gain(), &strip->fader_touch());
-                       }
-               }
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               (*s)->periodic (now_usecs);
        }
 
-       return state;
+       update_timecode_display ();
+       
+       return true;
 }
 
+
 void 
 MackieControlProtocol::update_timecode_beats_led()
 {
        switch (_timecode_type) {
                case ARDOUR::AnyTime::BBT:
-                       update_global_led ("beats", on);
-                       update_global_led ("timecode", off);
+                       update_global_led (Led::Beats, on);
+                       update_global_led (Led::Timecode, off);
                        break;
                case ARDOUR::AnyTime::Timecode:
-                       update_global_led ("timecode", on);
-                       update_global_led ("beats", off);
+                       update_global_led (Led::Timecode, on);
+                       update_global_led (Led::Beats, off);
                        break;
                default:
                        ostringstream os;
@@ -554,30 +445,44 @@ MackieControlProtocol::update_timecode_beats_led()
 }
 
 void 
-MackieControlProtocol::update_global_button (const string & name, LedState ls)
+MackieControlProtocol::update_global_button (int id, LedState ls)
 {
-       if (surface().controls_by_name.find (name) != surface().controls_by_name.end()) {
-               Button * button = dynamic_cast<Button*> (surface().controls_by_name[name]);
-               mcu_port().write (builder.build_led (button->led(), ls));
+       boost::shared_ptr<Surface> surface = surfaces.front();
+
+       if (!surface->type() == mcu) {
+               return;
+       }
+
+       map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (id);
+       if (x != surface->controls_by_device_independent_id.end()) {
+               Button * button = dynamic_cast<Button*> (x->second);
+               surface->write (button->set_state (ls));
        } else {
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Button %1 not found\n", name));
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Button %1 not found\n", id));
        }
 }
 
 void 
-MackieControlProtocol::update_global_led (const string & name, LedState ls)
+MackieControlProtocol::update_global_led (int id, LedState ls)
 {
-       if (surface().controls_by_name.find (name) != surface().controls_by_name.end()) {
-               Led * led = dynamic_cast<Led*> (surface().controls_by_name[name]);
-               mcu_port().write (builder.build_led (*led, ls));
+       boost::shared_ptr<Surface> surface = surfaces.front();
+
+       if (!surface->type() == mcu) {
+               return;
+       }
+
+       map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (id);
+       if (x != surface->controls_by_device_independent_id.end()) {
+               Led * led = dynamic_cast<Led*> (x->second);
+               surface->write (led->set_state (ls));
        } else {
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Led %1 not found\n", name));
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Led %1 not found\n", id));
        }
 }
 
 // send messages to surface to set controls to correct values
 void 
-MackieControlProtocol::update_surface()
+MackieControlProtocol::update_surfaces()
 {
        if (!_active) {
                return;
@@ -585,22 +490,13 @@ MackieControlProtocol::update_surface()
 
        // do the initial bank switch to connect signals
        // _current_initial_bank is initialised by set_state
-       switch_banks (_current_initial_bank);
-       
-       /* Create a RouteSignal for the master route, if we don't already have one */
-       if (!master_route_signal) {
-               boost::shared_ptr<Route> mr = master_route ();
-               if (mr) {
-                       master_route_signal = boost::shared_ptr<RouteSignal> (new RouteSignal (mr, *this, master_strip(), mcu_port()));
-                       // update strip from route
-                       master_route_signal->notify_all();
-               }
-       }
+       switch_banks (_current_initial_bank, true);
        
        // sometimes the jog wheel is a pot
-       surface().blank_jog_ring (mcu_port(), builder);
+       surfaces.front()->blank_jog_ring ();
        
        // update global buttons and displays
+
        notify_record_state_changed();
        notify_transport_state_changed();
        update_timecode_beats_led();
@@ -610,193 +506,164 @@ void
 MackieControlProtocol::connect_session_signals()
 {
        // receive routes added
-       session->RouteAdded.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_route_added, this, _1), midi_ui_context());
+       session->RouteAdded.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_route_added, this, _1), this);
        // receive record state toggled
-       session->RecordStateChanged.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_record_state_changed, this), midi_ui_context());
+       session->RecordStateChanged.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_record_state_changed, this), this);
        // receive transport state changed
-       session->TransportStateChange.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_transport_state_changed, this), midi_ui_context());
+       session->TransportStateChange.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_transport_state_changed, this), this);
+       session->TransportLooped.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_loop_state_changed, this), this);
        // receive punch-in and punch-out
-       Config->ParameterChanged.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_parameter_changed, this, _1), midi_ui_context());
-       session->config.ParameterChanged.connect (session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_parameter_changed, this, _1), midi_ui_context());
+       Config->ParameterChanged.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_parameter_changed, this, _1), this);
+       session->config.ParameterChanged.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_parameter_changed, this, _1), this);
        // receive rude solo changed
-       session->SoloActive.connect(session_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_solo_active_changed, this, _1), midi_ui_context());
+       session->SoloActive.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_solo_active_changed, this, _1), this);
 
        // make sure remote id changed signals reach here
        // see also notify_route_added
        Sorted sorted = get_sorted_routes();
 
        for (Sorted::iterator it = sorted.begin(); it != sorted.end(); ++it) {
-               (*it)->RemoteControlIDChanged.connect (route_connections, MISSING_INVALIDATOR, ui_bind(&MackieControlProtocol::notify_remote_id_changed, this), midi_ui_context());
+               (*it)->RemoteControlIDChanged.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_remote_id_changed, this), this);
        }
 }
 
-void 
-MackieControlProtocol::add_port (MIDI::Port & midi_input_port, MIDI::Port & midi_output_port, int number, MackiePort::port_type_t port_type)
+void
+MackieControlProtocol::set_profile (const string& profile_name)
 {
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("add port %1 %2\n", midi_input_port.name(), midi_output_port.name()));
+       if (profile_name == "default") {
+               /* reset to default */
+               _device_profile = DeviceProfile (profile_name);
+       }
 
-       MackiePort * sport = new MackiePort (*this, midi_input_port, midi_output_port, number, port_type);
-       _ports.push_back (sport);
-       
-       sport->init_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_init, this, sport));
-       sport->active_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_active, this, sport));
-       sport->inactive_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_inactive, this, sport));
-
-       _input_bundle->add_channel (
-               midi_input_port.name(),
-               ARDOUR::DataType::MIDI,
-               session->engine().make_port_name_non_relative (midi_input_port.name())
-               );
-       
-       _output_bundle->add_channel (
-               midi_output_port.name(),
-               ARDOUR::DataType::MIDI,
-               session->engine().make_port_name_non_relative (midi_output_port.name())
-               );
-}
+       map<string,DeviceProfile>::iterator d = DeviceProfile::device_profiles.find (profile_name);
 
-void 
-MackieControlProtocol::create_ports()
-{
-       MIDI::Manager * mm = MIDI::Manager::instance();
-       MIDI::Port * midi_input_port = mm->add_port (
-               new MIDI::Port (string_compose (_("%1 in"), default_port_name), MIDI::Port::IsInput, session->engine().jack())
-               );
-       MIDI::Port * midi_output_port = mm->add_port (
-               new MIDI::Port (string_compose (_("%1 out"), default_port_name), MIDI::Port::IsOutput, session->engine().jack())
-               );
-
-       /* Create main port */
-
-       if (!midi_input_port->ok() || !midi_output_port->ok()) {
-               ostringstream os;
-               os << _("Mackie control MIDI ports could not be created; Mackie control disabled");
-               error << os.str() << endmsg;
-               throw MackieControlException (os.str());
-       }
-
-       add_port (*midi_input_port, *midi_output_port, 0, MackiePort::mcu);
-
-       /* Create extender ports */
-
-       for (uint32_t index = 1; index <= Config->get_mackie_extenders(); ++index) {
-               MIDI::Port * midi_input_port = mm->add_port (
-                       new MIDI::Port (string_compose (_("mcu_xt_%1 in"), index), MIDI::Port::IsInput, session->engine().jack())
-                       );
-               MIDI::Port * midi_output_port = mm->add_port (
-                       new MIDI::Port (string_compose (_("mcu_xt_%1 out"), index), MIDI::Port::IsOutput, session->engine().jack())
-                       );
-               if (midi_input_port->ok() && midi_output_port->ok()) {
-                       add_port (*midi_input_port, *midi_output_port, index, MackiePort::ext);
-               }
+       if (d == DeviceProfile::device_profiles.end()) {
+               return;
        }
-}
-
-boost::shared_ptr<Route> 
-MackieControlProtocol::master_route()
-{
-       return session->master_out ();
-}
+       
+       _device_profile = d->second;
+}      
 
-Strip& 
-MackieControlProtocol::master_strip()
+void
+MackieControlProtocol::set_device (const string& device_name, bool allow_activation)
 {
-       return dynamic_cast<Strip&> (*surface().groups["master"]);
-}
+       map<string,DeviceInfo>::iterator d = DeviceInfo::device_info.find (device_name);
 
-void 
-MackieControlProtocol::initialize_surface()
-{
-       // set up the route table
-       int strips = 0;
-       for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-               strips += (*it)->strips();
+       if (d == DeviceInfo::device_info.end()) {
+               return;
+       }
+       
+       if (_active) {
+               clear_ports ();
+               surfaces.clear ();      
        }
 
-       set_route_table_size (strips);
+       _device_info = d->second;
 
-       // TODO same as code in mackie_port.cc
-       string emulation = ARDOUR::Config->get_mackie_emulation();
-       if (emulation == "bcf") {
-               _surface = new BcfSurface (strips);
-       } else if (emulation == "mcu") {
-               _surface = new MackieSurface (strips);
+       if (allow_activation) {
+               set_active (true);
        } else {
-               ostringstream os;
-               os << "no Surface class found for emulation: " << emulation;
-               throw MackieControlException (os.str());
+               if (_active) {
+                       create_surfaces ();
+                       switch_banks (0, true);
+               }
        }
-
-       _surface->init();
 }
 
 void 
-MackieControlProtocol::close()
+MackieControlProtocol::create_surfaces ()
 {
+       string device_name;
+       surface_type_t stype = mcu;
+       char buf[128];
 
-       // must be before other shutdown otherwise polling loop
-       // calls methods on objects that are deleted
+       if (_device_info.extenders() == 0) {
+               device_name = X_("mackie control");
+       } else {
+               device_name = X_("mackie control #1");
+       }
 
-       port_connections.drop_connections ();
-       session_connections.drop_connections ();
-       route_connections.drop_connections ();
-       periodic_connection.disconnect ();
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Create %1 surfaces\n", 1 + _device_info.extenders()));
 
-       if (_surface != 0) {
-               // These will fail if the port has gone away.
-               // So catch the exception and do the rest of the
-               // close afterwards
-               // because the bcf doesn't respond to the next 3 sysex messages
-               try {
-                       zero_all();
-               }
+       for (uint32_t n = 0; n < 1 + _device_info.extenders(); ++n) {
+
+               boost::shared_ptr<Surface> surface (new Surface (*this, device_name, n, stype));
+               surfaces.push_back (surface);
 
-               catch (exception & e) {
-                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("MackieControlProtocol::close caught exception: %1\n", e.what()));
+               /* next device will be an extender */
+               
+               if (_device_info.extenders() < 2) {
+                       device_name = X_("mackie control #2");
+               } else {
+                       snprintf (buf, sizeof (buf), X_("mackie control #%d"), n+2);
+                       device_name = buf;
                }
+               stype = ext;
 
-               for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-                       try {
-                               MackiePort & port = **it;
-                               // faders to minimum
-                               port.write_sysex (0x61);
-                               // All LEDs off
-                               port.write_sysex (0x62);
-                               // Reset (reboot into offline mode)
-                               port.write_sysex (0x63);
-                       }
-                       catch (exception & e) {
-                               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("MackieControlProtocol::close caught exception: %1\n", e.what()));
-                       }
+               if (!_device_info.uses_ipmidi()) {
+                       _input_bundle->add_channel (
+                               surface->port().input_port().name(),
+                               ARDOUR::DataType::MIDI,
+                               session->engine().make_port_name_non_relative (surface->port().input_port().name())
+                               );
+                       
+                       _output_bundle->add_channel (
+                               surface->port().output_port().name(),
+                               ARDOUR::DataType::MIDI,
+                               session->engine().make_port_name_non_relative (surface->port().output_port().name())
+                               );
                }
 
-               // disconnect routes from strips
-               clear_route_signals();
-               delete _surface;
-               _surface = 0;
-       }
+               int fd;
+               MIDI::Port& input_port (surface->port().input_port());
 
-       // shut down MackiePorts
-       for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-               delete *it;
+               if ((fd = input_port.selectable ()) >= 0) {
+                       Glib::RefPtr<IOSource> psrc = IOSource::create (fd, IO_IN|IO_HUP|IO_ERR);
+
+                       psrc->connect (sigc::bind (sigc::mem_fun (this, &MackieControlProtocol::midi_input_handler), &input_port));
+                       psrc->attach (main_loop()->get_context());
+                       
+                       // glibmm hack: for now, store only the GSource*
+
+                       port_sources.push_back (psrc->gobj());
+                       g_source_ref (psrc->gobj());
+               }
        }
+}
+
+void 
+MackieControlProtocol::close()
+{
+       clear_ports ();
+
+       port_connections.drop_connections ();
+       session_connections.drop_connections ();
+       route_connections.drop_connections ();
+       periodic_connection.disconnect ();
 
-       _ports.clear();
+       surfaces.clear ();
 }
 
 XMLNode& 
 MackieControlProtocol::get_state()
 {
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state\n");
+       char buf[16];
 
        // add name of protocol
        XMLNode* node = new XMLNode (X_("Protocol"));
        node->add_property (X_("name"), ARDOUR::ControlProtocol::_name);
 
        // add current bank
-       ostringstream os;
-       os << _current_initial_bank;
-       node->add_property (X_("bank"), os.str());
+       snprintf (buf, sizeof (buf), "%d", _current_initial_bank);
+       node->add_property (X_("bank"), buf);
+
+       // ipMIDI base port (possibly not used)
+       snprintf (buf, sizeof (buf), "%d", _ipmidi_base);
+       node->add_property (X_("ipmidi-base"), buf);
+
+       node->add_property (X_("device-profile"), _device_profile.name());
+       node->add_property (X_("device-name"), _device_info.name());
 
        return *node;
 }
@@ -807,142 +674,41 @@ MackieControlProtocol::set_state (const XMLNode & node, int /*version*/)
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("MackieControlProtocol::set_state: active %1\n", _active));
 
        int retval = 0;
+       const XMLProperty* prop;
+       uint32_t bank;
+       bool active = _active;
 
-       // fetch current bank
-
-       if (node.property (X_("bank")) != 0) {
-               string bank = node.property (X_("bank"))->value();
-               try {
-                       set_active (true);
-                       uint32_t new_bank = atoi (bank.c_str());
-                       if (_current_initial_bank != new_bank) {
-                               switch_banks (new_bank);
-                       }
-               }
-               catch (exception & e) {
-                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("exception in MackieControlProtocol::set_state: %1\n", e.what()));
-                       return -1;
-               }
+       if ((prop = node.property (X_("ipmidi-base"))) != 0) {
+               set_ipmidi_base (atoi (prop->value()));
        }
 
-       return retval;
-}
-
-void 
-MackieControlProtocol::handle_control_event (SurfacePort & port, Control & control, const ControlState & state)
-{
-       // find the route for the control, if there is one
-       boost::shared_ptr<Route> route;
-
-       if (control.group().is_strip()) {
-               if (control.group().is_master()) {
-                       DEBUG_TRACE (DEBUG::MackieControl, "master strip control event\n");
-                       route = master_route();
-               } else {
-                       uint32_t index = control.ordinal() - 1 + (port.number() * port.strips());
-                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("strip control event, index = %1, rt size = %2\n",
-                                                                          index, route_table.size()));
-                       if (index < route_table.size()) {
-                               route = route_table[index];
-                               if (route) {
-                                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("modifying %1\n", route->name()));
-                               } else {
-                                       DEBUG_TRACE (DEBUG::MackieControl, "no route found!\n");
-                               }
-                       } else {
-                               cerr << "Warning: index is " << index << " which is not in the route table, size: " << route_table.size() << endl;
-                               DEBUG_TRACE (DEBUG::MackieControl, "illegal route index found!\n");
-                       }
-               }
+       // fetch current bank
+       if ((prop = node.property (X_("bank"))) != 0) {
+               bank = atoi (prop->value());
+       }
+       
+       if ((prop = node.property (X_("active"))) != 0) {
+               active = string_is_affirmative (prop->value());
        }
 
-       // This handles control element events from the surface
-       // the state of the controls on the surface is usually updated
-       // from UI events.
-       switch (control.type()) {
-               case Control::type_fader:
-                       // find the route in the route table for the id
-                       // if the route isn't available, skip it
-                       // at which point the fader should just reset itself
-                       if (route != 0)
-                       {
-                               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader to %1\n", state.pos));
-
-                               route->gain_control()->set_value (slider_position_to_gain (state.pos));
-
-                               if (ARDOUR::Config->get_mackie_emulation() == "bcf") {
-                                       /* reset the timeout while we're still moving the fader */
-                                       add_in_use_timeout (port, control, control.in_use_touch_control);
-                               }
-
-                               // 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.
-                               port.write (builder.build_fader ((Fader&)control, state.pos));
-                       }
-                       break;
-
-               case Control::type_button:
-                       if (control.group().is_strip()) {
-                               // strips
-                               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("strip button %1\n", control.id()));
-                               if (route != 0) {
-                                       handle_strip_button (port, control, state.button_state, route);
-                               } else {
-                                       // no route so always switch the light off
-                                       // because no signals will be emitted by a non-route
-                                       port.write (builder.build_led (control.led(), off));
-                               }
-                       } else if (control.group().is_master()) {
-                               // master fader touch
-                               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("master strip button %1\n", control.id()));
-                               if (route != 0) {
-                                       handle_strip_button (port, control, state.button_state, route);
-                               }
-                       } else {
-                               // handle all non-strip buttons
-                               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("global button %1\n", control.id()));
-                               handle_button_event (dynamic_cast<Button&>(control), state.button_state);
+       if ((prop = node.property (X_("device-name"))) != 0) {
+               set_device (prop->value(), false);
+       }
 
-                       }
-                       break;
+       if ((prop = node.property (X_("device-profile"))) != 0) {
+               set_profile (prop->value());
+       }
 
-               // pot (jog wheel, external control)
-               case Control::type_pot:
-                       if (control.group().is_strip()) {
-                               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("strip pot %1\n", control.id()));
-                               if (route) {
-                                        boost::shared_ptr<Panner> panner = route->panner_shell()->panner();
-                                       // pan for mono input routes, or stereo linked panners
-                                        if (panner) {
-                                               double p = panner->position ();
-                                                
-                                               // calculate new value, and adjust
-                                               p += state.delta * state.sign;
-                                               p = min (1.0, p);
-                                               p = max (0.0, p);
-                                               panner->set_position (p);
-                                       }
-                               } else {
-                                       // it's a pot for an umnapped route, so turn all the lights off
-                                       port.write (builder.build_led_ring (dynamic_cast<Pot &> (control), off));
-                               }
-                       } else {
-                               if (control.is_jog()) {
-                                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Jog wheel moved %1\n", state.ticks));
-                                       _jog_wheel.jog_event (port, control, state);
-                               } else {
-                                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("External controller moved %1\n", state.ticks));
-                                       cout << "external controller" << state.ticks * state.sign << endl;
-                               }
-                       }
-                       break;
+       set_active (active);
 
-               default:
-                       cout << "Control::type not handled: " << control.type() << endl;
+       if (_active) {
+               switch_banks (bank, true);
        }
+
+       return retval;
 }
 
+
 /////////////////////////////////////////////////
 // handlers for Route signals
 // TODO should these be part of RouteSignal?
@@ -950,158 +716,9 @@ MackieControlProtocol::handle_control_event (SurfacePort & port, Control & contr
 // from Route, but they're also used in polling for automation
 /////////////////////////////////////////////////
 
-void 
-MackieControlProtocol::notify_solo_changed (RouteSignal * route_signal)
-{
-       try {
-               Button & button = route_signal->strip().solo();
-               route_signal->port().write (builder.build_led (button, route_signal->route()->soloed()));
-       }
-       catch (exception & e) {
-               cout << e.what() << endl;
-       }
-}
-
-void 
-MackieControlProtocol::notify_mute_changed (RouteSignal * route_signal)
-{
-       try {
-               Button & button = route_signal->strip().mute();
-               route_signal->port().write (builder.build_led (button, route_signal->route()->muted()));
-       }
-       catch (exception & e) {
-               cout << e.what() << endl;
-       }
-}
-
-void 
-MackieControlProtocol::notify_record_enable_changed (RouteSignal * route_signal)
-{
-       try {
-               Button & button = route_signal->strip().recenable();
-               route_signal->port().write (builder.build_led (button, route_signal->route()->record_enabled()));
-       }
-       catch (exception & e) {
-               cout << e.what() << endl;
-       }
-}
-
-void MackieControlProtocol::notify_active_changed (RouteSignal *)
-{
-       try {
-               DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::notify_active_changed\n");
-               refresh_current_bank();
-       }
-       catch (exception & e) {
-               cout << e.what() << endl;
-       }
-}
-
-void 
-MackieControlProtocol::notify_gain_changed (RouteSignal * route_signal, bool force_update)
-{
-       try {
-               Fader & fader = route_signal->strip().gain();
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("route %1 gain change, update fader %2 on port %3\n", 
-                                                                  route_signal->route()->name(), 
-                                                                  fader.raw_id(),
-                                                                  route_signal->port().output_port().name()));
-               if (!fader.in_use()) {
-                       float gain_value = gain_to_slider_position (route_signal->route()->gain_control()->get_value());
-                       // check that something has actually changed
-                       if (force_update || gain_value != route_signal->last_gain_written()) {
-                               route_signal->port().write (builder.build_fader (fader, gain_value));
-                               route_signal->last_gain_written (gain_value);
-                       }
-               }
-       }
-       catch (exception & e) {
-               cout << e.what() << endl;
-       }
-}
-
-void 
-MackieControlProtocol::notify_property_changed (const PropertyChange& what_changed, RouteSignal * route_signal)
-{
-       if (!what_changed.contains (Properties::name)) {
-               return;
-       }
-
-       try {
-               Strip & strip = route_signal->strip();
-               
-               if (!strip.is_master()) {
-                       string line1;
-                       string fullname = route_signal->route()->name();
-
-                       if (fullname.length() <= 6) {
-                               line1 = fullname;
-                       } else {
-                               line1 = PBD::short_version (fullname, 6);
-                       }
-
-#ifdef NUCLEUS_DEBUG
-                       cerr << "show strip name from " << fullname << " as " << line1 << endl;
-#endif
-
-                       SurfacePort & port = route_signal->port();
-                       port.write (builder.strip_display (port, strip, 0, line1));
-                       port.write (builder.strip_display_blank (port, strip, 1));
-               }
-       }
-       catch (exception & e) {
-               cout << e.what() << endl;
-       }
-}
-
-void 
-MackieControlProtocol::notify_panner_changed (RouteSignal * route_signal, bool force_update)
-{
-       try {
-               Pot & pot = route_signal->strip().vpot();
-               boost::shared_ptr<Panner> panner = route_signal->route()->panner();
-               if (panner) {
-                       double pos = panner->position ();
-
-                       // cache the MidiByteArray here, because the mackie led control is much lower
-                       // resolution than the panner control. So we save lots of byte
-                       // sends in spite of more work on the comparison
-                       MidiByteArray bytes = builder.build_led_ring (pot, ControlState (on, pos), MackieMidiBuilder::midi_pot_mode_dot);
-                       // check that something has actually changed
-                       if (force_update || bytes != route_signal->last_pan_written())
-                       {
-                               route_signal->port().write (bytes);
-                               route_signal->last_pan_written (bytes);
-                       }
-               } else {
-                       route_signal->port().write (builder.zero_control (pot));
-               }
-       }
-       catch (exception & e) {
-               cout << e.what() << endl;
-       }
-}
-
-// TODO handle plugin automation polling
-void 
-MackieControlProtocol::update_automation (RouteSignal & rs)
-{
-       ARDOUR::AutoState gain_state = rs.route()->gain_control()->automation_state();
-
-       if (gain_state == Touch || gain_state == Play) {
-               notify_gain_changed (&rs, false);
-       }
-
-       if (rs.route()->panner()) {
-               ARDOUR::AutoState panner_state = rs.route()->panner()->automation_state();
-               if (panner_state == Touch || panner_state == Play) {
-                       notify_panner_changed (&rs, false);
-               }
-       }
-}
-
-string 
-MackieControlProtocol::format_bbt_timecode (framepos_t now_frame)
+// TODO handle plugin automation polling
+string 
+MackieControlProtocol::format_bbt_timecode (framepos_t now_frame)
 {
        Timecode::BBT_Time bbt_time;
        session->bbt_time (now_frame, bbt_time);
@@ -1150,33 +767,38 @@ MackieControlProtocol::format_timecode_timecode (framepos_t now_frame)
 void 
 MackieControlProtocol::update_timecode_display()
 {
-       if (surface().has_timecode_display()) {
-               // do assignment here so current_frame is fixed
-               framepos_t current_frame = session->transport_frame();
-               string timecode;
-
-               switch (_timecode_type) {
-                       case ARDOUR::AnyTime::BBT:
-                               timecode = format_bbt_timecode (current_frame);
-                               break;
-                       case ARDOUR::AnyTime::Timecode:
-                               timecode = format_timecode_timecode (current_frame);
-                               break;
-                       default:
-                               ostringstream os;
-                               os << "Unknown timecode: " << _timecode_type;
-                               throw runtime_error (os.str());
-               }
+       if (surfaces.empty()) {
+               return;
+       }
 
-               // only write the timecode string to the MCU if it's changed
-               // since last time. This is to reduce midi bandwidth used.
-               if (timecode != _timecode_last) {
-                       surface().display_timecode (mcu_port(), builder, timecode, _timecode_last);
-                       _timecode_last = timecode;
-               }
+       boost::shared_ptr<Surface> surface = surfaces.front();
+
+       if (surface->type() != mcu || !_device_info.has_timecode_display()) {
+               return;
        }
-}
 
+       // do assignment here so current_frame is fixed
+       framepos_t current_frame = session->transport_frame();
+       string timecode;
+
+       switch (_timecode_type) {
+       case ARDOUR::AnyTime::BBT:
+               timecode = format_bbt_timecode (current_frame);
+               break;
+       case ARDOUR::AnyTime::Timecode:
+               timecode = format_timecode_timecode (current_frame);
+               break;
+       default:
+               return;
+       }
+       
+       // only write the timecode string to the MCU if it's changed
+       // since last time. This is to reduce midi bandwidth used.
+       if (timecode != _timecode_last) {
+               surface->display_timecode (timecode, _timecode_last);
+               _timecode_last = timecode;
+       }
+}
 
 ///////////////////////////////////////////
 // Session signals
@@ -1185,11 +807,11 @@ MackieControlProtocol::update_timecode_display()
 void MackieControlProtocol::notify_parameter_changed (std::string const & p)
 {
        if (p == "punch-in") {
-               update_global_button ("punch_in", session->config.get_punch_in());
+               update_global_button (Button::PunchIn, session->config.get_punch_in());
        } else if (p == "punch-out") {
-               update_global_button ("punch_out", session->config.get_punch_out());
+               update_global_button (Button::PunchOut, session->config.get_punch_out());
        } else if (p == "clicking") {
-               update_global_button ("clicking", Config->get_clicking());
+               // update_global_button (Button::RelayClick, Config->get_clicking());
        } else {
                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("parameter changed: %1\n", p));
        }
@@ -1202,12 +824,7 @@ MackieControlProtocol::notify_route_added (ARDOUR::RouteList & rl)
        // currently assigned banks are less than the full set of
        // strips, so activate the new strip now.
 
-       {
-               Glib::Mutex::Lock lm (route_signals_lock);
-               if (route_signals.size() < route_table.size()) {
-                       refresh_current_bank();
-               }
-       }
+       refresh_current_bank();
 
        // otherwise route added, but current bank needs no updating
 
@@ -1215,32 +832,33 @@ MackieControlProtocol::notify_route_added (ARDOUR::RouteList & rl)
        typedef ARDOUR::RouteList ARS;
 
        for (ARS::iterator it = rl.begin(); it != rl.end(); ++it) {
-               (*it)->RemoteControlIDChanged.connect (route_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_remote_id_changed, this), midi_ui_context());
+               (*it)->RemoteControlIDChanged.connect (route_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_remote_id_changed, this), this);
        }
 }
 
 void 
 MackieControlProtocol::notify_solo_active_changed (bool active)
 {
-       Button * rude_solo = reinterpret_cast<Button*> (surface().controls_by_name["solo"]);
-       mcu_port().write (builder.build_led (*rude_solo, active ? flashing : off));
+       boost::shared_ptr<Surface> surface = surfaces.front();
+       
+       map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Led::RudeSolo);
+       if (x != surface->controls_by_device_independent_id.end()) {
+               Led* rude_solo = dynamic_cast<Led*> (x->second);
+               if (rude_solo) {
+                       surface->write (rude_solo->set_state (active ? flashing : off));
+               }
+       }
 }
 
 void 
 MackieControlProtocol::notify_remote_id_changed()
 {
        Sorted sorted = get_sorted_routes();
+       uint32_t sz = n_strips();
 
        // if a remote id has been moved off the end, we need to shift
        // the current bank backwards.
 
-       uint32_t sz;
-
-       {
-               Glib::Mutex::Lock lm (route_signals_lock);
-               sz = route_signals.size();
-       }
-
        if (sorted.size() - _current_initial_bank < sz) {
                // but don't shift backwards past the zeroth channel
                switch_banks (max((Sorted::size_type) 0, sorted.size() - sz));
@@ -1255,55 +873,57 @@ MackieControlProtocol::notify_remote_id_changed()
 ///////////////////////////////////////////
 
 void 
-MackieControlProtocol::notify_record_state_changed()
+MackieControlProtocol::notify_loop_state_changed()
 {
-       // switch rec button on / off / flashing
-       Button * rec = reinterpret_cast<Button*> (surface().controls_by_name["record"]);
-       mcu_port().write (builder.build_led (*rec, record_release (*rec)));
+       update_global_button (Button::Loop, session->get_play_loop());
 }
 
 void 
 MackieControlProtocol::notify_transport_state_changed()
 {
        // switch various play and stop buttons on / off
-       update_global_button ("play", session->transport_rolling());
-       update_global_button ("stop", !session->transport_rolling());
-       update_global_button ("loop", session->get_play_loop());
+       update_global_button (Button::Loop, session->get_play_loop());
+       update_global_button (Button::Play, session->transport_speed() == 1.0);
+       update_global_button (Button::Stop, !session->transport_rolling());
+       update_global_button (Button::Rewind, session->transport_speed() < 0.0);
+       update_global_button (Button::Ffwd, session->transport_speed() > 1.0);
 
        _transport_previously_rolling = session->transport_rolling();
-
-       // rec is special because it's tristate
-       Button * rec = reinterpret_cast<Button*> (surface().controls_by_name["record"]);
-       mcu_port().write (builder.build_led (*rec, record_release (*rec)));
 }
 
-
-void 
-jog_wheel_state_display (JogWheel::State state, SurfacePort & port)
+void
+MackieControlProtocol::notify_record_state_changed ()
 {
-       switch (state) {
-               case JogWheel::zoom:
-                       port.write (builder.two_char_display ("Zm"));
-                       break;
-               case JogWheel::scroll:
-                       port.write (builder.two_char_display ("Sc"));
-                       break;
-               case JogWheel::scrub:
-                       port.write (builder.two_char_display ("Sb"));
-                       break;
-               case JogWheel::shuttle:
-                       port.write (builder.two_char_display ("Sh"));
-                       break;
-               case JogWheel::speed:
-                       port.write (builder.two_char_display ("Sp"));
-                       break;
-               case JogWheel::select:
-                       port.write (builder.two_char_display ("Se"));
-                       break;
+       boost::shared_ptr<Surface> surface = surfaces.front();
+
+       /* rec is a tristate */
+
+       map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (Button::Record);
+       if (x != surface->controls_by_device_independent_id.end()) {
+               Button * rec = dynamic_cast<Button*> (x->second);
+               if (rec) {
+                       LedState ls;
+                       
+                       switch (session->record_status()) {
+                       case Session::Disabled:
+                               DEBUG_TRACE (DEBUG::MackieControl, "record state changed to disabled, LED off\n");
+                               ls = off;
+                               break;
+                       case Session::Recording:
+                               DEBUG_TRACE (DEBUG::MackieControl, "record state changed to recording, LED on\n");
+                               ls = on;
+                               break;
+                       case Session::Enabled:
+                               DEBUG_TRACE (DEBUG::MackieControl, "record state changed to enabled, LED flashing\n");
+                               ls = flashing;
+                               break;
+                       }
+                       
+                       surface->write (rec->set_state (ls));
+               }
        }
 }
 
-
 list<boost::shared_ptr<ARDOUR::Bundle> >
 MackieControlProtocol::bundles ()
 {
@@ -1313,34 +933,6 @@ MackieControlProtocol::bundles ()
        return b;
 }
 
-void
-MackieControlProtocol::port_connected_or_disconnected (string a, string b, bool connected)
-{
-       /* If something is connected to one of our output ports, send MIDI to update the surface
-          to whatever state it should have.
-       */
-
-       if (!connected) {
-               return;
-       }
-
-       MackiePorts::const_iterator i = _ports.begin();
-       while (i != _ports.end()) {
-
-               string const n = AudioEngine::instance()->make_port_name_non_relative ((*i)->output_port().name ());
-
-               if (a == n || b == n) {
-                       break;
-               }
-
-               ++i;
-       }
-
-       if (i != _ports.end ()) {
-               update_surface ();
-       }
-}
-
 void
 MackieControlProtocol::do_request (MackieControlUIRequest* req)
 {
@@ -1362,593 +954,486 @@ MackieControlProtocol::stop ()
        return 0;
 }
 
-/** Add a timeout so that a control's in_use flag will be reset some time in the future.
- *  @param in_use_control the control whose in_use flag to reset.
- *  @param touch_control a touch control to emit an event for, or 0.
- */
-void
-MackieControlProtocol::add_in_use_timeout (SurfacePort& port, Control& in_use_control, Control* touch_control)
-{
-       Glib::RefPtr<Glib::TimeoutSource> timeout (Glib::TimeoutSource::create (250)); // milliseconds
-
-       in_use_control.in_use_connection.disconnect ();
-       in_use_control.in_use_connection = timeout->connect (
-               sigc::bind (sigc::mem_fun (*this, &MackieControlProtocol::control_in_use_timeout), &port, &in_use_control, touch_control));
-       in_use_control.in_use_touch_control = touch_control;
-
-       timeout->attach (main_loop()->get_context());
-
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("timeout queued for port %1, control %2 touch control %3\n",
-                                                          &port, &in_use_control, touch_control));}
-
-/** Handle timeouts to reset in_use for controls that can't
- *  do this by themselves (e.g. pots, and faders without touch support).
- *  @param in_use_control the control whose in_use flag to reset.
- *  @param touch_control a touch control to emit an event for, or 0.
- */
-bool
-MackieControlProtocol::control_in_use_timeout (SurfacePort* port, Control* in_use_control, Control* touch_control)
+void 
+MackieControlProtocol::update_led (Surface& surface, Button& button, Mackie::LedState ls)
 {
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("timeout elapsed for port %1, control %2 touch control %3\n",
-                                                          port, in_use_control, touch_control));
-
-       in_use_control->set_in_use (false);
-
-       if (touch_control) {
-               // empty control_state
-               ControlState control_state;
-               handle_control_event (*port, *touch_control, control_state);
+       if (ls != none) {
+               surface.port().write (button.set_state (ls));
        }
-       
-       // only call this method once from the timer
-       return false;
 }
 
-void 
-MackieControlProtocol::update_led (Button& button, Mackie::LedState ls)
+void
+MackieControlProtocol::build_button_map ()
 {
-       if (ls != none) {
-               SurfacePort * port = 0;
-
-               if (button.group().is_strip()) {
-                       if (button.group().is_master()) {
-                               port = &mcu_port();
-                       } else {
-                               port = &port_for_id (dynamic_cast<const Strip&> (button.group()).index());
-                       }
-               } else {
-                       port = &mcu_port();
-               }
-               port->write (builder.build_led (button, ls));
-       }
+       /* this maps our device-independent button codes to the methods that handle them.
+        */
+
+#define DEFINE_BUTTON_HANDLER(b,p,r) button_map.insert (pair<Button::ID,ButtonHandlers> ((b), ButtonHandlers ((p),(r))));
+
+       DEFINE_BUTTON_HANDLER (Button::IO, &MackieControlProtocol::io_press, &MackieControlProtocol::io_release);
+       DEFINE_BUTTON_HANDLER (Button::Sends, &MackieControlProtocol::sends_press, &MackieControlProtocol::sends_release);
+       DEFINE_BUTTON_HANDLER (Button::Pan, &MackieControlProtocol::pan_press, &MackieControlProtocol::pan_release);
+       DEFINE_BUTTON_HANDLER (Button::Plugin, &MackieControlProtocol::plugin_press, &MackieControlProtocol::plugin_release);
+       DEFINE_BUTTON_HANDLER (Button::Eq, &MackieControlProtocol::eq_press, &MackieControlProtocol::eq_release);
+       DEFINE_BUTTON_HANDLER (Button::Dyn, &MackieControlProtocol::dyn_press, &MackieControlProtocol::dyn_release);
+       DEFINE_BUTTON_HANDLER (Button::Left, &MackieControlProtocol::left_press, &MackieControlProtocol::left_release);
+       DEFINE_BUTTON_HANDLER (Button::Right, &MackieControlProtocol::right_press, &MackieControlProtocol::right_release);
+       DEFINE_BUTTON_HANDLER (Button::ChannelLeft, &MackieControlProtocol::channel_left_press, &MackieControlProtocol::channel_left_release);
+       DEFINE_BUTTON_HANDLER (Button::ChannelRight, &MackieControlProtocol::channel_right_press, &MackieControlProtocol::channel_right_release);
+       DEFINE_BUTTON_HANDLER (Button::Flip, &MackieControlProtocol::flip_press, &MackieControlProtocol::flip_release);
+       DEFINE_BUTTON_HANDLER (Button::Edit, &MackieControlProtocol::edit_press, &MackieControlProtocol::edit_release);
+       DEFINE_BUTTON_HANDLER (Button::NameValue, &MackieControlProtocol::name_value_press, &MackieControlProtocol::name_value_release);
+       DEFINE_BUTTON_HANDLER (Button::TimecodeBeats, &MackieControlProtocol::timecode_beats_press, &MackieControlProtocol::timecode_beats_release);
+       DEFINE_BUTTON_HANDLER (Button::F1, &MackieControlProtocol::F1_press, &MackieControlProtocol::F1_release);
+       DEFINE_BUTTON_HANDLER (Button::F2, &MackieControlProtocol::F2_press, &MackieControlProtocol::F2_release);
+       DEFINE_BUTTON_HANDLER (Button::F3, &MackieControlProtocol::F3_press, &MackieControlProtocol::F3_release);
+       DEFINE_BUTTON_HANDLER (Button::F4, &MackieControlProtocol::F4_press, &MackieControlProtocol::F4_release);
+       DEFINE_BUTTON_HANDLER (Button::F5, &MackieControlProtocol::F5_press, &MackieControlProtocol::F5_release);
+       DEFINE_BUTTON_HANDLER (Button::F6, &MackieControlProtocol::F6_press, &MackieControlProtocol::F6_release);
+       DEFINE_BUTTON_HANDLER (Button::F7, &MackieControlProtocol::F7_press, &MackieControlProtocol::F7_release);
+       DEFINE_BUTTON_HANDLER (Button::F8, &MackieControlProtocol::F8_press, &MackieControlProtocol::F8_release);
+       DEFINE_BUTTON_HANDLER (Button::F9, &MackieControlProtocol::F9_press, &MackieControlProtocol::F9_release);
+       DEFINE_BUTTON_HANDLER (Button::F10, &MackieControlProtocol::F10_press, &MackieControlProtocol::F10_release);
+       DEFINE_BUTTON_HANDLER (Button::F11, &MackieControlProtocol::F11_press, &MackieControlProtocol::F11_release);
+       DEFINE_BUTTON_HANDLER (Button::F12, &MackieControlProtocol::F12_press, &MackieControlProtocol::F12_release);
+       DEFINE_BUTTON_HANDLER (Button::F13, &MackieControlProtocol::F13_press, &MackieControlProtocol::F13_release);
+       DEFINE_BUTTON_HANDLER (Button::F14, &MackieControlProtocol::F14_press, &MackieControlProtocol::F14_release);
+       DEFINE_BUTTON_HANDLER (Button::F15, &MackieControlProtocol::F15_press, &MackieControlProtocol::F15_release);
+       DEFINE_BUTTON_HANDLER (Button::F16, &MackieControlProtocol::F16_press, &MackieControlProtocol::F16_release);
+       DEFINE_BUTTON_HANDLER (Button::Shift, &MackieControlProtocol::shift_press, &MackieControlProtocol::shift_release);
+       DEFINE_BUTTON_HANDLER (Button::Option, &MackieControlProtocol::option_press, &MackieControlProtocol::option_release);
+       DEFINE_BUTTON_HANDLER (Button::Ctrl, &MackieControlProtocol::control_press, &MackieControlProtocol::control_release);
+       DEFINE_BUTTON_HANDLER (Button::CmdAlt, &MackieControlProtocol::cmd_alt_press, &MackieControlProtocol::cmd_alt_release);
+       DEFINE_BUTTON_HANDLER (Button::On, &MackieControlProtocol::on_press, &MackieControlProtocol::on_release);
+       DEFINE_BUTTON_HANDLER (Button::RecReady, &MackieControlProtocol::rec_ready_press, &MackieControlProtocol::rec_ready_release);
+       DEFINE_BUTTON_HANDLER (Button::Undo, &MackieControlProtocol::undo_press, &MackieControlProtocol::undo_release);
+       DEFINE_BUTTON_HANDLER (Button::Save, &MackieControlProtocol::save_press, &MackieControlProtocol::save_release);
+       DEFINE_BUTTON_HANDLER (Button::Touch, &MackieControlProtocol::touch_press, &MackieControlProtocol::touch_release);
+       DEFINE_BUTTON_HANDLER (Button::Redo, &MackieControlProtocol::redo_press, &MackieControlProtocol::redo_release);
+       DEFINE_BUTTON_HANDLER (Button::Marker, &MackieControlProtocol::marker_press, &MackieControlProtocol::marker_release);
+       DEFINE_BUTTON_HANDLER (Button::Enter, &MackieControlProtocol::enter_press, &MackieControlProtocol::enter_release);
+       DEFINE_BUTTON_HANDLER (Button::Cancel, &MackieControlProtocol::cancel_press, &MackieControlProtocol::cancel_release);
+       DEFINE_BUTTON_HANDLER (Button::Mixer, &MackieControlProtocol::mixer_press, &MackieControlProtocol::mixer_release);
+       DEFINE_BUTTON_HANDLER (Button::FrmLeft, &MackieControlProtocol::frm_left_press, &MackieControlProtocol::frm_left_release);
+       DEFINE_BUTTON_HANDLER (Button::FrmRight, &MackieControlProtocol::frm_right_press, &MackieControlProtocol::frm_right_release);
+       DEFINE_BUTTON_HANDLER (Button::Loop, &MackieControlProtocol::loop_press, &MackieControlProtocol::loop_release);
+       DEFINE_BUTTON_HANDLER (Button::PunchIn, &MackieControlProtocol::punch_in_press, &MackieControlProtocol::punch_in_release);
+       DEFINE_BUTTON_HANDLER (Button::PunchOut, &MackieControlProtocol::punch_out_press, &MackieControlProtocol::punch_out_release);
+       DEFINE_BUTTON_HANDLER (Button::Home, &MackieControlProtocol::home_press, &MackieControlProtocol::home_release);
+       DEFINE_BUTTON_HANDLER (Button::End, &MackieControlProtocol::end_press, &MackieControlProtocol::end_release);
+       DEFINE_BUTTON_HANDLER (Button::Rewind, &MackieControlProtocol::rewind_press, &MackieControlProtocol::rewind_release);
+       DEFINE_BUTTON_HANDLER (Button::Ffwd, &MackieControlProtocol::ffwd_press, &MackieControlProtocol::ffwd_release);
+       DEFINE_BUTTON_HANDLER (Button::Stop, &MackieControlProtocol::stop_press, &MackieControlProtocol::stop_release);
+       DEFINE_BUTTON_HANDLER (Button::Play, &MackieControlProtocol::play_press, &MackieControlProtocol::play_release);
+       DEFINE_BUTTON_HANDLER (Button::Record, &MackieControlProtocol::record_press, &MackieControlProtocol::record_release);
+       DEFINE_BUTTON_HANDLER (Button::CursorUp, &MackieControlProtocol::cursor_up_press, &MackieControlProtocol::cursor_up_release);
+       DEFINE_BUTTON_HANDLER (Button::CursorDown, &MackieControlProtocol::cursor_down_press, &MackieControlProtocol::cursor_down_release);
+       DEFINE_BUTTON_HANDLER (Button::CursorLeft, &MackieControlProtocol::cursor_left_press, &MackieControlProtocol::cursor_left_release);
+       DEFINE_BUTTON_HANDLER (Button::CursorRight, &MackieControlProtocol::cursor_right_press, &MackieControlProtocol::cursor_right_release);
+       DEFINE_BUTTON_HANDLER (Button::Zoom, &MackieControlProtocol::zoom_press, &MackieControlProtocol::zoom_release);
+       DEFINE_BUTTON_HANDLER (Button::Scrub, &MackieControlProtocol::scrub_press, &MackieControlProtocol::scrub_release);
+       DEFINE_BUTTON_HANDLER (Button::UserA, &MackieControlProtocol::user_a_press, &MackieControlProtocol::user_a_release);
+       DEFINE_BUTTON_HANDLER (Button::UserB, &MackieControlProtocol::user_b_press, &MackieControlProtocol::user_b_release);
+
+       DEFINE_BUTTON_HANDLER (Button::Snapshot, &MackieControlProtocol::snapshot_press, &MackieControlProtocol::snapshot_release);
+       DEFINE_BUTTON_HANDLER (Button::Read, &MackieControlProtocol::read_press, &MackieControlProtocol::read_release);
+       DEFINE_BUTTON_HANDLER (Button::Write, &MackieControlProtocol::write_press, &MackieControlProtocol::write_release);
+       DEFINE_BUTTON_HANDLER (Button::FdrGroup, &MackieControlProtocol::fdrgroup_press, &MackieControlProtocol::fdrgroup_release);
+       DEFINE_BUTTON_HANDLER (Button::ClearSolo, &MackieControlProtocol::clearsolo_press, &MackieControlProtocol::clearsolo_release);
+       DEFINE_BUTTON_HANDLER (Button::Track, &MackieControlProtocol::track_press, &MackieControlProtocol::track_release);
+       DEFINE_BUTTON_HANDLER (Button::Send, &MackieControlProtocol::send_press, &MackieControlProtocol::send_release);
+       DEFINE_BUTTON_HANDLER (Button::MidiTracks, &MackieControlProtocol::miditracks_press, &MackieControlProtocol::miditracks_release);
+       DEFINE_BUTTON_HANDLER (Button::Inputs, &MackieControlProtocol::inputs_press, &MackieControlProtocol::inputs_release);
+       DEFINE_BUTTON_HANDLER (Button::AudioTracks, &MackieControlProtocol::audiotracks_press, &MackieControlProtocol::audiotracks_release);
+       DEFINE_BUTTON_HANDLER (Button::AudioInstruments, &MackieControlProtocol::audioinstruments_press, &MackieControlProtocol::audioinstruments_release);
+       DEFINE_BUTTON_HANDLER (Button::Aux, &MackieControlProtocol::aux_press, &MackieControlProtocol::aux_release);
+       DEFINE_BUTTON_HANDLER (Button::Busses, &MackieControlProtocol::busses_press, &MackieControlProtocol::busses_release);
+       DEFINE_BUTTON_HANDLER (Button::Outputs, &MackieControlProtocol::outputs_press, &MackieControlProtocol::outputs_release);
+       DEFINE_BUTTON_HANDLER (Button::User, &MackieControlProtocol::user_press, &MackieControlProtocol::user_release);
+       DEFINE_BUTTON_HANDLER (Button::Trim, &MackieControlProtocol::trim_press, &MackieControlProtocol::trim_release);
+       DEFINE_BUTTON_HANDLER (Button::Latch, &MackieControlProtocol::latch_press, &MackieControlProtocol::latch_release);
+       DEFINE_BUTTON_HANDLER (Button::Grp, &MackieControlProtocol::grp_press, &MackieControlProtocol::grp_release);
+       DEFINE_BUTTON_HANDLER (Button::Nudge, &MackieControlProtocol::nudge_press, &MackieControlProtocol::nudge_release);
+       DEFINE_BUTTON_HANDLER (Button::Drop, &MackieControlProtocol::drop_press, &MackieControlProtocol::drop_release);
+       DEFINE_BUTTON_HANDLER (Button::Replace, &MackieControlProtocol::replace_press, &MackieControlProtocol::replace_release);
+       DEFINE_BUTTON_HANDLER (Button::Click, &MackieControlProtocol::click_press, &MackieControlProtocol::click_release);
+       DEFINE_BUTTON_HANDLER (Button::View, &MackieControlProtocol::view_press, &MackieControlProtocol::view_release);
 }
 
 void 
-MackieControlProtocol::handle_button_event (Button& button, ButtonState bs)
+MackieControlProtocol::handle_button_event (Surface& surface, Button& button, ButtonState bs)
 {
        if  (bs != press && bs != release) {
-               update_led (button, none);
+               update_led (surface, button, none);
                return;
        }
        
-       LedState ls;
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Handling %1 for button %2 (%3)\n", (bs == press ? "press" : "release"), button.id(),
+                                                          Button::id_to_name (button.bid())));
 
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Handling %1 for button %2\n", (bs == press ? "press" : "release"), button.raw_id()));
-
-       switch  (button.raw_id()) {
-       case 0x28: // io
-               switch  (bs) {
-               case press: ls = io_press (button); break;
-               case release: ls = io_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x29: // sends
-               switch  (bs) {
-               case press: ls = sends_press (button); break;
-               case release: ls = sends_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x2a: // pan
-               switch  (bs) {
-               case press: ls = pan_press (button); break;
-               case release: ls = pan_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x2b: // plugin
-               switch  (bs) {
-               case press: ls = plugin_press (button); break;
-               case release: ls = plugin_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x2c: // eq
-               switch  (bs) {
-               case press: ls = eq_press (button); break;
-               case release: ls = eq_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x2d: // dyn
-               switch  (bs) {
-               case press: ls = dyn_press (button); break;
-               case release: ls = dyn_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x2e: // left
-               switch  (bs) {
-               case press: ls = left_press (button); break;
-               case release: ls = left_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x2f: // right
-               switch  (bs) {
-               case press: ls = right_press (button); break;
-               case release: ls = right_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x30: // channel_left
-               switch  (bs) {
-               case press: ls = channel_left_press (button); break;
-               case release: ls = channel_left_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x31: // channel_right
-               switch  (bs) {
-               case press: ls = channel_right_press (button); break;
-               case release: ls = channel_right_release (button); break;
-               case neither: break;
-               }
-               break;
-               
-       case 0x32: // flip
-               switch  (bs) {
-               case press: ls = flip_press (button); break;
-               case release: ls = flip_release (button); break;
-               case neither: break;
+       /* check profile first */
+       
+       string action = _device_profile.get_button_action (button.bid(), _modifier_state);
+       
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Looked up action for button %1 with modifier %2, got [%3]\n",
+                                                          button.bid(), _modifier_state, action));
+
+       if (!action.empty()) {
+               /* if there is a bound action for this button, and this is a press event,
+                  carry out the action. If its a release event, do nothing since we 
+                  don't bind to them at all but don't want any other handling to 
+                  occur either.
+               */
+               if (bs == press) {
+                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("executing action %1\n", action));
+                       access_action (action);
                }
-               break;
+               return;
+       }
 
-       case 0x33: // edit
-               switch  (bs) {
-               case press: ls = edit_press (button); break;
-               case release: ls = edit_release (button); break;
-               case neither: break;
-               }
-               break;
+       /* lookup using the device-INDEPENDENT button ID */
 
-       case 0x34: // name_value
-               switch  (bs) {
-               case press: ls = name_value_press (button); break;
-               case release: ls = name_value_release (button); break;
-               case neither: break;
-               }
-               break;
+       ButtonMap::iterator b = button_map.find (button.bid());
 
-       case 0x35: // timecode_beats
-               switch  (bs) {
-               case press: ls = timecode_beats_press (button); break;
-               case release: ls = timecode_beats_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (b != button_map.end()) {
 
-       case 0x36: // F1
-               switch  (bs) {
-               case press: ls = F1_press (button); break;
-               case release: ls = F1_release (button); break;
-               case neither: break;
-               }
-               break;
+               ButtonHandlers& bh (b->second);
 
-       case 0x37: // F2
                switch  (bs) {
-               case press: ls = F2_press (button); break;
-               case release: ls = F2_release (button); break;
-               case neither: break;
+               case press: 
+                       surface.write (button.set_state ((this->*(bh.press)) (button)));
+                       break;
+               case release: 
+                       surface.write (button.set_state ((this->*(bh.release)) (button)));
+                       break;
+               default:
+                       break;
                }
-               break;
+       } else {
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("no button handlers for button ID %1 (device ID %2)\n", 
+                                                                  button.bid(), button.id()));
+               error << string_compose ("no button handlers for button ID %1 (device ID %2)\n", 
+                                        button.bid(), button.id()) << endmsg;
+       }
+}
 
-       case 0x38: // F3
-               switch  (bs) {
-               case press: ls = F3_press (button); break;
-               case release: ls = F3_release (button); break;
-               case neither: break;
-               }
-               break;
+bool
+MackieControlProtocol::midi_input_handler (IOCondition ioc, MIDI::Port* port)
+{
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("something happend on  %1\n", port->name()));
 
-       case 0x39: // F4
-               switch  (bs) {
-               case press: ls = F4_press (button); break;
-               case release: ls = F4_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (ioc & ~IO_IN) {
+               return false;
+       }
 
-       case 0x3a: // F5
-               switch  (bs) {
-               case press: ls = F5_press (button); break;
-               case release: ls = F5_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (ioc & IO_IN) {
 
-       case 0x3b: // F6
-               switch  (bs) {
-               case press: ls = F6_press (button); break;
-               case release: ls = F6_release (button); break;
-               case neither: break;
-               }
-               break;
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("data available on %1\n", port->name()));
+               framepos_t now = session->engine().frame_time();
+               port->parse (now);
+       }
 
-       case 0x3c: // F7
-               switch  (bs) {
-               case press: ls = F7_press (button); break;
-               case release: ls = F7_release (button); break;
-               case neither: break;
-               }
-               break;
+       return true;
+}
 
-       case 0x3d: // F8
-               switch  (bs) {
-               case press: ls = F8_press (button); break;
-               case release: ls = F8_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::clear_ports ()
+{
+       _input_bundle->remove_channels ();
+       _output_bundle->remove_channels ();
 
-       case 0x3e: // F9
-               switch  (bs) {
-               case press: ls = F9_press (button); break;
-               case release: ls = F9_release (button); break;
-               case neither: break;
-               }
-               break;
+       for (PortSources::iterator i = port_sources.begin(); i != port_sources.end(); ++i) {
+               g_source_destroy (*i);
+               g_source_unref (*i);
+       }
 
-       case 0x3f: // F10
-               switch  (bs) {
-               case press: ls = F10_press (button); break;
-               case release: ls = F10_release (button); break;
-               case neither: break;
-               }
-               break;
+       port_sources.clear ();
+}
 
-       case 0x40: // F11
-               switch  (bs) {
-               case press: ls = F11_press (button); break;
-               case release: ls = F11_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::set_view_mode (ViewMode m)
+{
+       _view_mode = m;
 
-       case 0x41: // F12
-               switch  (bs) {
-               case press: ls = F12_press (button); break;
-               case release: ls = F12_release (button); break;
-               case neither: break;
-               }
-               break;
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               (*s)->update_view_mode_display ();
+       }
+       
+}
 
-       case 0x42: // F13
-               switch  (bs) {
-               case press: ls = F13_press (button); break;
-               case release: ls = F13_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::set_flip_mode (bool yn)
+{
+       _flip_mode = yn;
+       
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               (*s)->update_flip_mode_display ();
+       }
+}
+       
+void
+MackieControlProtocol::set_master_on_surface_strip (uint32_t surface, uint32_t strip_number)
+{
+       force_special_route_to_strip (session->master_out(), surface, strip_number);
+}
 
-       case 0x43: // F14
-               switch  (bs) {
-               case press: ls = F14_press (button); break;
-               case release: ls = F14_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::set_monitor_on_surface_strip (uint32_t surface, uint32_t strip_number)
+{
+       force_special_route_to_strip (session->monitor_out(), surface, strip_number);
+}
 
-       case 0x44: // F15
-               switch  (bs) {
-               case press: ls = F15_press (button); break;
-               case release: ls = F15_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::force_special_route_to_strip (boost::shared_ptr<Route> r, uint32_t surface, uint32_t strip_number)
+{
+       if (!r) {
+               return;
+       }
 
-       case 0x45: // F16
-               switch  (bs) {
-               case press: ls = F16_press (button); break;
-               case release: ls = F16_release (button); break;
-               case neither: break;
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               if ((*s)->number() == surface) {
+                       Strip* strip = (*s)->nth_strip (strip_number);
+                       if (strip) {
+                               strip->set_route (session->master_out());
+                               strip->lock_controls ();
+                       }
                }
-               break;
+       }
+}
 
-       case 0x46: // shift
-               switch  (bs) {
-               case press: ls = shift_press (button); break;
-               case release: ls = shift_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::gui_track_selection_changed (ARDOUR::RouteNotificationListPtr rl)
+{
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               (*s)->gui_selection_changed (rl);
+       }
+       
+       // _last_selected_routes = *rl;
+}
 
-       case 0x47: // option
-               switch  (bs) {
-               case press: ls = option_press (button); break;
-               case release: ls = option_release (button); break;
-               case neither: break;
-               }
-               break;
+framepos_t
+MackieControlProtocol::transport_frame() const
+{
+       return session->transport_frame();
+}
 
-       case 0x48: // control
-               switch  (bs) {
-               case press: ls = control_press (button); break;
-               case release: ls = control_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::add_down_select_button (int surface, int strip)
+{
+       _down_select_buttons.insert ((surface<<8)|(strip&0xf));
+}
 
-       case 0x49: // cmd_alt
-               switch  (bs) {
-               case press: ls = cmd_alt_press (button); break;
-               case release: ls = cmd_alt_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::remove_down_select_button (int surface, int strip)
+{
+       DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (surface<<8)|(strip&0xf));
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down select buttons\n", surface, strip));
+       if (x != _down_select_buttons.end()) {
+               _down_select_buttons.erase (x);
+       } else {
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 strip %2 not found in down select buttons\n",
+                                                                  surface, strip));
+       }
+}
 
-       case 0x4a: // on
-               switch  (bs) {
-               case press: ls = on_press (button); break;
-               case release: ls = on_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::select_range ()
+{
+       RouteList routes;
 
-       case 0x4b: // rec_ready
-               switch  (bs) {
-               case press: ls = rec_ready_press (button); break;
-               case release: ls = rec_ready_release (button); break;
-               case neither: break;
-               }
-               break;
+       pull_route_range (_down_select_buttons, routes);
 
-       case 0x4c: // undo
-               switch  (bs) {
-               case press: ls = undo_press (button); break;
-               case release: ls = undo_release (button); break;
-               case neither: break;
-               }
-               break;
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("select range: found %1 routes\n", routes.size()));
 
-       case 0x4d: // snapshot
-               switch  (bs) {
-               case press: ls = snapshot_press (button); break;
-               case release: ls = snapshot_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (!routes.empty()) {
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
 
-       case 0x4e: // touch
-               switch  (bs) {
-               case press: ls = touch_press (button); break;
-               case release: ls = touch_release (button); break;
-               case neither: break;
+                       if (_modifier_state == MODIFIER_CONTROL) {
+                               ToggleRouteSelection ((*r)->remote_control_id ());
+                       } else {
+                               if (r == routes.begin()) {
+                                       SetRouteSelection ((*r)->remote_control_id());
+                               } else {
+                                       AddRouteToSelection ((*r)->remote_control_id());
+                               }
+                       }
                }
-               break;
+       }
+}
 
-       case 0x4f: // redo
-               switch  (bs) {
-               case press: ls = redo_press (button); break;
-               case release: ls = redo_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::add_down_button (AutomationType a, int surface, int strip)
+{
+       DownButtonMap::iterator m = _down_buttons.find (a);
 
-       case 0x50: // marker
-               switch  (bs) {
-               case press: ls = marker_press (button); break;
-               case release: ls = marker_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (m == _down_buttons.end()) {
+               _down_buttons[a] = DownButtonList();
+       }
 
-       case 0x51: // enter
-               switch  (bs) {
-               case press: ls = enter_press (button); break;
-               case release: ls = enter_release (button); break;
-               case neither: break;
-               }
-               break;
+       _down_buttons[a].insert ((surface<<8)|(strip&0xf));
+}
 
-       case 0x52: // cancel
-               switch  (bs) {
-               case press: ls = cancel_press (button); break;
-               case release: ls = cancel_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::remove_down_button (AutomationType a, int surface, int strip)
+{
+       DownButtonMap::iterator m = _down_buttons.find (a);
 
-       case 0x53: // mixer
-               switch  (bs) {
-               case press: ls = mixer_press (button); break;
-               case release: ls = mixer_release (button); break;
-               case neither: break;
-               }
-               break;
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down buttons for %3\n", surface, strip, (int) a));
 
-       case 0x54: // frm_left
-               switch  (bs) {
-               case press: ls = frm_left_press (button); break;
-               case release: ls = frm_left_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (m == _down_buttons.end()) {
+               return;
+       }
 
-       case 0x55: // frm_right
-               switch  (bs) {
-               case press: ls = frm_right_press (button); break;
-               case release: ls = frm_right_release (button); break;
-               case neither: break;
-               }
-               break;
+       DownButtonList& l (m->second);
+       DownButtonList::iterator x = find (l.begin(), l.end(), (surface<<8)|(strip&0xf));
 
-       case 0x56: // loop
-               switch  (bs) {
-               case press: ls = loop_press (button); break;
-               case release: ls = loop_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (x != l.end()) {
+               l.erase (x);
+       } else {
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("surface %1 strip %2 not found in down buttons for %3\n",
+                                                                  surface, strip, (int) a));
+       }
+}
 
-       case 0x57: // punch_in
-               switch  (bs) {
-               case press: ls = punch_in_press (button); break;
-               case release: ls = punch_in_release (button); break;
-               case neither: break;
-               }
-               break;
+MackieControlProtocol::ControlList
+MackieControlProtocol::down_controls (AutomationType p)
+{
+       ControlList controls;
+       RouteList routes;
 
-       case 0x58: // punch_out
-               switch  (bs) {
-               case press: ls = punch_out_press (button); break;
-               case release: ls = punch_out_release (button); break;
-               case neither: break;
-               }
-               break;
+       DownButtonMap::iterator m = _down_buttons.find (p);
 
-       case 0x59: // home
-               switch  (bs) {
-               case press: ls = home_press (button); break;
-               case release: ls = home_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (m == _down_buttons.end()) {
+               return controls;
+       }
+       
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("looking for down buttons for %1, got %2\n",
+                                                          p, m->second.size()));
 
-       case 0x5a: // end
-               switch  (bs) {
-               case press: ls = end_press (button); break;
-               case release: ls = end_release (button); break;
-               case neither: break;
+       pull_route_range (m->second, routes);
+       
+       switch (p) {
+       case GainAutomation:
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+                       controls.push_back ((*r)->gain_control());
                }
                break;
-
-       case 0x5b: // rewind
-               switch  (bs) {
-               case press: ls = rewind_press (button); break;
-               case release: ls = rewind_release (button); break;
-               case neither: break;
+       case SoloAutomation:
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+                       controls.push_back ((*r)->solo_control());
                }
                break;
-
-       case 0x5c: // ffwd
-               switch  (bs) {
-               case press: ls = ffwd_press (button); break;
-               case release: ls = ffwd_release (button); break;
-               case neither: break;
+       case MuteAutomation:
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+                       controls.push_back ((*r)->mute_control());
                }
                break;
-
-       case 0x5d: // stop
-               switch  (bs) {
-               case press: ls = stop_press (button); break;
-               case release: ls = stop_release (button); break;
-               case neither: break;
+       case RecEnableAutomation:
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+                       boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<Track> (*r);
+                       if (trk) {
+                               controls.push_back (trk->rec_enable_control());
+                       }
                }
                break;
-
-       case 0x5e: // play
-               switch  (bs) {
-               case press: ls = play_press (button); break;
-               case release: ls = play_release (button); break;
-               case neither: break;
-               }
+       default:
                break;
+       }
 
-       case 0x5f: // record
-               switch  (bs) {
-               case press: ls = record_press (button); break;
-               case release: ls = record_release (button); break;
-               case neither: break;
-               }
-               break;
+       return controls;
 
-       case 0x60: // cursor_up
-               switch  (bs) {
-               case press: ls = cursor_up_press (button); break;
-               case release: ls = cursor_up_release (button); break;
-               case neither: break;
-               }
-               break;
+}
+       
+struct ButtonRangeSorter {
+    bool operator() (const uint32_t& a, const uint32_t& b) {
+           return (a>>8) < (b>>8) // a.surface < b.surface
+                   ||
+                   ((a>>8) == (b>>8) && (a&0xf) < (b&0xf)); // a.surface == b.surface && a.strip < b.strip
+    }
+};
 
-       case 0x61: // cursor_down
-               switch  (bs) {
-               case press: ls = cursor_down_press (button); break;
-               case release: ls = cursor_down_release (button); break;
-               case neither: break;
-               }
-               break;
+void
+MackieControlProtocol::pull_route_range (DownButtonList& down, RouteList& selected)
+{
+       ButtonRangeSorter cmp;
 
-       case 0x62: // cursor_left
-               switch  (bs) {
-               case press: ls = cursor_left_press (button); break;
-               case release: ls = cursor_left_release (button); break;
-               case neither: break;
-               }
-               break;
+       if (down.empty()) {
+               return;
+       }
 
-       case 0x63: // cursor_right
-               switch  (bs) {
-               case press: ls = cursor_right_press (button); break;
-               case release: ls = cursor_right_release (button); break;
-               case neither: break;
-               }
-               break;
+       list<uint32_t> ldown;
+       ldown.insert (ldown.end(), down.begin(), down.end());
+       ldown.sort (cmp);
 
-       case 0x64: // zoom
-               switch  (bs) {
-               case press: ls = zoom_press (button); break;
-               case release: ls = zoom_release (button); break;
-               case neither: break;
-               }
-               break;
+       uint32_t first = ldown.front();
+       uint32_t last = ldown.back ();
+       
+       uint32_t first_surface = first>>8;
+       uint32_t first_strip = first&0xf;
 
-       case 0x65: // scrub
-               switch  (bs) {
-               case press: ls = scrub_press (button); break;
-               case release: ls = scrub_release (button); break;
-               case neither: break;
-               }
-               break;
+       uint32_t last_surface = last>>8;
+       uint32_t last_strip = last&0xf;
 
-       case 0x66: // user_a
-               switch  (bs) {
-               case press: ls = user_a_press (button); break;
-               case release: ls = user_a_release (button); break;
-               case neither: break;
-               }
-               break;
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("PRR %5 in list %1.%2 - %3.%4\n", first_surface, first_strip, last_surface, last_strip,
+                                                          down.size()));
+       
+       for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               
+               if ((*s)->number() >= first_surface && (*s)->number() <= last_surface) {
 
-       case 0x67: // user_b
-               switch  (bs) {
-               case press: ls = user_b_press (button); break;
-               case release: ls = user_b_release (button); break;
-               case neither: break;
+                       uint32_t fs;
+                       uint32_t ls;
+
+                       if ((*s)->number() == first_surface) {
+                               fs = first_strip;
+                       } else {
+                               fs = 0;
+                       }
+
+                       if ((*s)->number() == last_surface) {
+                               ls = last_strip;
+                               ls += 1;
+                       } else {
+                               ls = (*s)->n_strips ();
+                       }
+
+                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("adding strips for surface %1 (%2 .. %3)\n",
+                                                                          (*s)->number(), fs, ls));
+
+                       for (uint32_t n = fs; n < ls; ++n) {
+                               boost::shared_ptr<Route> r = (*s)->nth_strip (n)->route();
+                               if (r) {
+                                       selected.push_back (r);
+                               }
+                       }
                }
-               break;
+       }
+}
+
+void
+MackieControlProtocol::set_ipmidi_base (int16_t portnum)
+{
+       /* this will not be saved without a session save, so .. */
 
+       session->set_dirty ();
+
+       _ipmidi_base = portnum;
+
+       /* if the current device uses ipMIDI we need
+          to restart.
+       */
+
+       if (_active && _device_info.uses_ipmidi()) {
+               needs_ipmidi_restart = true;
        }
+}
 
-       update_led (button, ls);
+void
+MackieControlProtocol::ipmidi_restart ()
+{
+       clear_ports ();
+       surfaces.clear ();      
+       create_surfaces ();
+       switch_banks (_current_initial_bank, true);
+       needs_ipmidi_restart = false;
 }