MCP:maybe functioning button binding stuff, plus save-to-disk-on-change (still needs...
[ardour.git] / libs / surfaces / mackie / mackie_control_protocol.cc
index bb161808608d37602160d9debb4fa22e120bb995..e75d1824e2f2afb8551340f1d90bc1ec2a10294b 100644 (file)
@@ -39,6 +39,7 @@
 #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"
@@ -48,6 +49,7 @@
 #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 "mackie_midi_builder.h"
+#include "device_profile.h"
 #include "surface_port.h"
 #include "surface.h"
-
 #include "strip.h"
 #include "control_group.h"
 #include "meter.h"
@@ -80,8 +81,8 @@ using namespace Glib;
 
 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;
 
@@ -101,16 +102,28 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
        , _zoom_mode (false)
        , _scrub_mode (false)
        , _flip_mode (false)
+       , _view_mode (Mixer)
        , _current_selected_track (-1)
+       , _modifier_state (0)
 {
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
 
+       DeviceInfo::reload_device_info ();
+       DeviceProfile::reload_device_profiles ();
+
+       set_device (Config->get_mackie_device_name());
+       set_profile (Config->get_mackie_device_profile());
+
        AudioEngine::instance()->PortConnectedOrDisconnected.connect (
                audio_engine_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::port_connected_or_disconnected, this, _2, _4, _5),
                this
                );
 
+       TrackSelectionChanged.connect (gui_connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::gui_track_selection_changed, this, _1), this);
+
        _instance = this;
+
+       build_button_map ();
 }
 
 MackieControlProtocol::~MackieControlProtocol()
@@ -158,7 +171,6 @@ void
 MackieControlProtocol::prev_track()
 {
        if (_current_initial_bank >= 1) {
-               session->set_dirty();
                switch_banks (_current_initial_bank - 1);
        }
 }
@@ -170,7 +182,6 @@ MackieControlProtocol::next_track()
 {
        Sorted sorted = get_sorted_routes();
        if (_current_initial_bank + n_strips() < sorted.size()) {
-               session->set_dirty();
                switch_banks (_current_initial_bank + 1);
        }
 }
@@ -209,19 +220,44 @@ 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());
+
+               if (remote_ids.find (route.remote_control_id()) != remote_ids.end()) {
+                       continue;
+               }
+
+               if (route.is_hidden() || route.is_master() || route.is_monitor()) {
+                       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;
 }
@@ -250,7 +286,6 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
        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) {
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("not switching to %1\n", initial));
                return;
        }
 
@@ -258,8 +293,7 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
        uint32_t strip_cnt = n_strips();
 
        if (sorted.size() <= strip_cnt && !force) {
-               /* no banking */
-               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("not switching to %1\n", initial));
+               /* no banking - not enough routes to fill all strips */
                return;
        }
 
@@ -295,7 +329,6 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
 
                        for (; r != sorted.end() && added < (*si)->n_strips(); ++r, ++added) {
                                routes.push_back (*r);
-                               cerr << "\t\tadded " << (*r)->name() << endl;
                        }
 
                        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("give surface %1 routes\n", routes.size()));
@@ -304,8 +337,11 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
                }
        }
 
-       // display the current start bank.
-       surfaces.front()->display_bank_start (_current_initial_bank);
+       /* reset this to get the right display of view mode after the switch */
+       set_view_mode (_view_mode);
+       
+       /* current bank has not been saved */
+       session->set_dirty();
 }
 
 int 
@@ -325,7 +361,6 @@ MackieControlProtocol::set_active (bool yn)
 
                        create_surfaces ();
                        connect_session_signals ();
-                       
                        _active = true;
                        update_surfaces ();
 
@@ -359,12 +394,16 @@ MackieControlProtocol::periodic ()
                return false;
        }
 
+       struct timeval now;
+       uint64_t now_usecs;
+       gettimeofday (&now, 0);
+
+       now_usecs = (now.tv_sec * 1000000) + now.tv_usec;
+
        for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
-               (*s)->periodic ();
+               (*s)->periodic (now_usecs);
        }
        
-       update_timecode_display();
-
        return true;
 }
 
@@ -374,12 +413,12 @@ 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;
@@ -389,7 +428,7 @@ MackieControlProtocol::update_timecode_beats_led()
 }
 
 void 
-MackieControlProtocol::update_global_button (const string & name, LedState ls)
+MackieControlProtocol::update_global_button (int id, LedState ls)
 {
        boost::shared_ptr<Surface> surface = surfaces.front();
 
@@ -397,16 +436,17 @@ MackieControlProtocol::update_global_button (const string & name, LedState ls)
                return;
        }
 
-       if (surface->controls_by_name.find (name) != surface->controls_by_name.end()) {
-               Button * button = dynamic_cast<Button*> (surface->controls_by_name[name]);
-               surface->write (builder.build_led (button->led(), ls));
+       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)
 {
        boost::shared_ptr<Surface> surface = surfaces.front();
 
@@ -414,11 +454,12 @@ MackieControlProtocol::update_global_led (const string & name, LedState ls)
                return;
        }
 
-       if (surface->controls_by_name.find (name) != surface->controls_by_name.end()) {
-               Led * led = dynamic_cast<Led*> (surface->controls_by_name[name]);
-               surface->write (builder.build_led (*led, ls));
+       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));
        }
 }
 
@@ -469,21 +510,74 @@ MackieControlProtocol::connect_session_signals()
        }
 }
 
+void
+MackieControlProtocol::set_profile (const string& profile_name)
+{
+       if (profile_name == "default") {
+               /* reset to default */
+               _device_profile = DeviceProfile (profile_name);
+       }
+
+       map<string,DeviceProfile>::iterator d = DeviceProfile::device_profiles.find (profile_name);
+
+       if (d == DeviceProfile::device_profiles.end()) {
+               return;
+       }
+       
+       _device_profile = d->second;
+}      
+
+void
+MackieControlProtocol::set_device (const string& device_name)
+{
+       map<string,DeviceInfo>::iterator d = DeviceInfo::device_info.find (device_name);
+
+       if (d == DeviceInfo::device_info.end()) {
+               return;
+       }
+       
+       _device_info = d->second;
+
+       /* store it away in a global location */
+       
+       Config->set_mackie_device_name (device_name);
+
+       if (_active) {
+               clear_ports ();
+               surfaces.clear ();
+               create_surfaces ();
+               switch_banks (0, true);
+       }
+}
+
 void 
 MackieControlProtocol::create_surfaces ()
 {
-       string device_name = "mcu";
+       string device_name;
        surface_type_t stype = mcu;
+       char buf[128];
+
+       if (_device_info.extenders() == 0) {
+               device_name = X_("mackie control");
+       } else {
+               device_name = X_("mackie control #1");
+       }
 
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Create %1 surfaces\n",
-                                                          1 + ARDOUR::Config->get_mackie_extenders()));
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Create %1 surfaces\n", 1 + _device_info.extenders()));
 
-       for (uint32_t n = 0; n < 1 + ARDOUR::Config->get_mackie_extenders(); ++n) {
+       for (uint32_t n = 0; n < 1 + _device_info.extenders(); ++n) {
 
-               boost::shared_ptr<Surface> surface (new Surface (*this, session->engine().jack(), device_name, n, stype));
+               boost::shared_ptr<Surface> surface (new Surface (*this, device_name, n, stype));
                surfaces.push_back (surface);
+
+               /* next device will be an extender */
                
-               device_name = "mcu_xt";
+               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;
 
                _input_bundle->add_channel (
@@ -551,21 +645,15 @@ 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;
 
        // 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_("bank"))) != 0) {
+               string bank = prop->value();
+               set_active (true);
+               uint32_t new_bank = atoi (bank.c_str());
+               if (_current_initial_bank != new_bank) {
+                       switch_banks (new_bank);
                }
        }
 
@@ -667,11 +755,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));
        }
@@ -701,10 +789,12 @@ MackieControlProtocol::notify_solo_active_changed (bool active)
 {
        boost::shared_ptr<Surface> surface = surfaces.front();
        
-       Button * rude_solo = reinterpret_cast<Button*> (surface->controls_by_name["solo"]);
-
-       if (rude_solo) {
-               surface->write (builder.build_led (*rude_solo, active ? flashing : off));
+       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));
+               }
        }
 }
 
@@ -733,17 +823,17 @@ MackieControlProtocol::notify_remote_id_changed()
 void 
 MackieControlProtocol::notify_loop_state_changed()
 {
-       update_global_button ("loop", session->get_play_loop());
+       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 ("rewind", session->transport_speed() < 0.0);
-       update_global_button ("ffwd", session->transport_speed() > 1.0);
+       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();
 }
@@ -751,31 +841,33 @@ MackieControlProtocol::notify_transport_state_changed()
 void
 MackieControlProtocol::notify_record_state_changed ()
 {
-       /* rec is a tristate */
-
+       boost::shared_ptr<Surface> surface = surfaces.front();
 
-       Button * rec = reinterpret_cast<Button*> (surfaces.front()->controls_by_name["record"]);
-       if (rec) {
-               LedState ls;
+       /* rec is a tristate */
 
-               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;
+       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));
                }
-
-               surfaces.front()->write (builder.build_led (*rec, ls));
-       } else {
-               DEBUG_TRACE (DEBUG::MackieControl, "record button control not found\n");
        }
 }
 
@@ -829,123 +921,110 @@ 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 (Surface& surface, 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), &surface, &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 surface %1, control %2 touch control %3\n",
-                                                          surface.number(), &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 (Surface* surface, Control* in_use_control, Control* touch_control)
-{
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("timeout elapsed for surface %1, control %2 touch control %3\n",
-                                                          surface->number(), in_use_control, touch_control));
-
-       in_use_control->set_in_use (false);
-
-       if (touch_control) {
-               // empty control_state
-               ControlState control_state;
-               surface->handle_control_event (*touch_control, control_state);
-       }
-       
-       // only call this method once from the timer
-       return false;
-}
-
 void 
 MackieControlProtocol::update_led (Surface& surface, Button& button, Mackie::LedState ls)
 {
        if (ls != none) {
-               surface.port().write (builder.build_led (button, ls));
+               surface.port().write (button.set_state (ls));
        }
 }
 
 void
 MackieControlProtocol::build_button_map ()
 {
-       button_map.insert (pair<int,ButtonHandlers> (Button::Io, ButtonHandlers (&MackieControlProtocol::io_press, &MackieControlProtocol::io_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Sends, ButtonHandlers (&MackieControlProtocol::sends_press, &MackieControlProtocol::sends_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Pan, ButtonHandlers (&MackieControlProtocol::pan_press, &MackieControlProtocol::pan_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Plugin, ButtonHandlers (&MackieControlProtocol::plugin_press, &MackieControlProtocol::plugin_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Eq, ButtonHandlers (&MackieControlProtocol::eq_press, &MackieControlProtocol::eq_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Dyn, ButtonHandlers (&MackieControlProtocol::dyn_press, &MackieControlProtocol::dyn_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Left, ButtonHandlers (&MackieControlProtocol::left_press, &MackieControlProtocol::left_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Right, ButtonHandlers (&MackieControlProtocol::right_press, &MackieControlProtocol::right_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::ChannelLeft, ButtonHandlers (&MackieControlProtocol::channel_left_press, &MackieControlProtocol::channel_left_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::ChannelRight, ButtonHandlers (&MackieControlProtocol::channel_right_press, &MackieControlProtocol::channel_right_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Flip, ButtonHandlers (&MackieControlProtocol::flip_press, &MackieControlProtocol::flip_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Edit, ButtonHandlers (&MackieControlProtocol::edit_press, &MackieControlProtocol::edit_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::NameValue, ButtonHandlers (&MackieControlProtocol::name_value_press, &MackieControlProtocol::name_value_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::TimecodeBeats, ButtonHandlers (&MackieControlProtocol::timecode_beats_press, &MackieControlProtocol::timecode_beats_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F1, ButtonHandlers (&MackieControlProtocol::F1_press, &MackieControlProtocol::F1_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F2, ButtonHandlers (&MackieControlProtocol::F2_press, &MackieControlProtocol::F2_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F3, ButtonHandlers (&MackieControlProtocol::F3_press, &MackieControlProtocol::F3_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F4, ButtonHandlers (&MackieControlProtocol::F4_press, &MackieControlProtocol::F4_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F5, ButtonHandlers (&MackieControlProtocol::F5_press, &MackieControlProtocol::F5_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F6, ButtonHandlers (&MackieControlProtocol::F6_press, &MackieControlProtocol::F6_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F7, ButtonHandlers (&MackieControlProtocol::F7_press, &MackieControlProtocol::F7_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F8, ButtonHandlers (&MackieControlProtocol::F8_press, &MackieControlProtocol::F8_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F9, ButtonHandlers (&MackieControlProtocol::F9_press, &MackieControlProtocol::F9_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F10, ButtonHandlers (&MackieControlProtocol::F10_press, &MackieControlProtocol::F10_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F11, ButtonHandlers (&MackieControlProtocol::F11_press, &MackieControlProtocol::F11_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F12, ButtonHandlers (&MackieControlProtocol::F12_press, &MackieControlProtocol::F12_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F13, ButtonHandlers (&MackieControlProtocol::F13_press, &MackieControlProtocol::F13_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F14, ButtonHandlers (&MackieControlProtocol::F14_press, &MackieControlProtocol::F14_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F15, ButtonHandlers (&MackieControlProtocol::F15_press, &MackieControlProtocol::F15_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::F16, ButtonHandlers (&MackieControlProtocol::F16_press, &MackieControlProtocol::F16_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Shift, ButtonHandlers (&MackieControlProtocol::shift_press, &MackieControlProtocol::shift_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Option, ButtonHandlers (&MackieControlProtocol::option_press, &MackieControlProtocol::option_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Ctrl, ButtonHandlers (&MackieControlProtocol::control_press, &MackieControlProtocol::control_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::CmdAlt, ButtonHandlers (&MackieControlProtocol::cmd_alt_press, &MackieControlProtocol::cmd_alt_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::On, ButtonHandlers (&MackieControlProtocol::on_press, &MackieControlProtocol::on_release)));
-       //button_map.insert (pair<int,ButtonHandlers> (Button::Rec, ButtonHandlers (&MackieControlProtocol::rec_press, &MackieControlProtocol::rec_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Undo, ButtonHandlers (&MackieControlProtocol::undo_press, &MackieControlProtocol::undo_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Save, ButtonHandlers (&MackieControlProtocol::save_press, &MackieControlProtocol::save_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Touch, ButtonHandlers (&MackieControlProtocol::touch_press, &MackieControlProtocol::touch_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Redo, ButtonHandlers (&MackieControlProtocol::redo_press, &MackieControlProtocol::redo_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Marker, ButtonHandlers (&MackieControlProtocol::marker_press, &MackieControlProtocol::marker_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Enter, ButtonHandlers (&MackieControlProtocol::enter_press, &MackieControlProtocol::enter_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Cancel, ButtonHandlers (&MackieControlProtocol::cancel_press, &MackieControlProtocol::cancel_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Mixer, ButtonHandlers (&MackieControlProtocol::mixer_press, &MackieControlProtocol::mixer_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::FrmLeft, ButtonHandlers (&MackieControlProtocol::frm_left_press, &MackieControlProtocol::frm_left_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::FrmRight, ButtonHandlers (&MackieControlProtocol::frm_right_press, &MackieControlProtocol::frm_right_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Loop, ButtonHandlers (&MackieControlProtocol::loop_press, &MackieControlProtocol::loop_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::PunchIn, ButtonHandlers (&MackieControlProtocol::punch_in_press, &MackieControlProtocol::punch_in_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::PunchOut, ButtonHandlers (&MackieControlProtocol::punch_out_press, &MackieControlProtocol::punch_out_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Home, ButtonHandlers (&MackieControlProtocol::home_press, &MackieControlProtocol::home_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::End, ButtonHandlers (&MackieControlProtocol::end_press, &MackieControlProtocol::end_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Rewind, ButtonHandlers (&MackieControlProtocol::rewind_press, &MackieControlProtocol::rewind_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Ffwd, ButtonHandlers (&MackieControlProtocol::ffwd_press, &MackieControlProtocol::ffwd_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Stop, ButtonHandlers (&MackieControlProtocol::stop_press, &MackieControlProtocol::stop_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Play, ButtonHandlers (&MackieControlProtocol::play_press, &MackieControlProtocol::play_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Record, ButtonHandlers (&MackieControlProtocol::record_press, &MackieControlProtocol::record_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::CursorUp, ButtonHandlers (&MackieControlProtocol::cursor_up_press, &MackieControlProtocol::cursor_up_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::CursorDown, ButtonHandlers (&MackieControlProtocol::cursor_down_press, &MackieControlProtocol::cursor_down_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::CursorLeft, ButtonHandlers (&MackieControlProtocol::cursor_left_press, &MackieControlProtocol::cursor_left_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::CursorRight, ButtonHandlers (&MackieControlProtocol::cursor_right_press, &MackieControlProtocol::cursor_right_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Zoom, ButtonHandlers (&MackieControlProtocol::zoom_press, &MackieControlProtocol::zoom_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::Scrub, ButtonHandlers (&MackieControlProtocol::scrub_press, &MackieControlProtocol::scrub_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::UserA, ButtonHandlers (&MackieControlProtocol::user_a_press, &MackieControlProtocol::user_a_release)));
-       button_map.insert (pair<int,ButtonHandlers> (Button::UserB, ButtonHandlers (&MackieControlProtocol::user_b_press, &MackieControlProtocol::user_b_release)));
+       /* 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 
@@ -956,39 +1035,46 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu
                return;
        }
        
-       LedState ls;
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Handling %1 for button %2\n", (bs == press ? "press" : "release"), button.id()));
 
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Handling %1 for button %2\n", (bs == press ? "press" : "release"), button.raw_id()));
+       /* check profile first */
+       
+       string action = _device_profile.get_button_action (button.bid(), _modifier_state);
+       
+       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) {
+                       access_action (action);
+               }
+               return;
+       }
 
-       ButtonMap::iterator b = button_map.find (button.raw_id());
+       /* lookup using the device-INDEPENDENT button ID */
+
+       ButtonMap::iterator b = button_map.find (button.bid());
 
        if (b != button_map.end()) {
 
                ButtonHandlers& bh (b->second);
 
                switch  (bs) {
-               case press: ls = (this->*(bh.press)) (button); break;
-               case release: ls = (this->*(bh.release)) (button); break;
-               case neither: break;
+               case press: 
+                       surface.write (button.set_state ((this->*(bh.press)) (button)));
+               case release: 
+                       surface.write (button.set_state ((this->*(bh.release)) (button)));
+                       break;
+               default:
+                       break;
                }
-       }
-               
-       update_led (surface, button, ls);
-}
-
-void
-MackieControlProtocol::select_track (boost::shared_ptr<Route> r)
-{
-       if (_modifier_state == MODIFIER_SHIFT) {
-               r->gain_control()->set_value (0.0);
        } else {
-               if (_current_selected_track > 0 && r->remote_control_id() == (uint32_t) _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();;
-               }
+               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;
        }
 }
 
@@ -1016,6 +1102,9 @@ MackieControlProtocol::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 void
 MackieControlProtocol::clear_ports ()
 {
+       _input_bundle->remove_channels ();
+       _output_bundle->remove_channels ();
+
        for (PortSources::iterator i = port_sources.begin(); i != port_sources.end(); ++i) {
                g_source_destroy (*i);
                g_source_unref (*i);
@@ -1024,3 +1113,255 @@ MackieControlProtocol::clear_ports ()
        port_sources.clear ();
 }
 
+void
+MackieControlProtocol::set_view_mode (ViewMode m)
+{
+       _view_mode = m;
+
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               (*s)->update_view_mode_display ();
+       }
+       
+}
+
+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);
+}
+
+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);
+}
+
+void
+MackieControlProtocol::force_special_route_to_strip (boost::shared_ptr<Route> r, uint32_t surface, uint32_t strip_number)
+{
+       if (!r) {
+               return;
+       }
+
+       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 ();
+                       }
+               }
+       }
+}
+
+void
+MackieControlProtocol::gui_track_selection_changed (ARDOUR::RouteNotificationListPtr rl)
+{
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               (*s)->gui_selection_changed (rl);
+       }
+}
+
+framepos_t
+MackieControlProtocol::transport_frame() const
+{
+       return session->transport_frame();
+}
+
+void
+MackieControlProtocol::add_down_select_button (int surface, int strip)
+{
+       _down_select_buttons.insert ((surface<<8)|(strip&0xf));
+}
+
+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));
+       }
+}
+
+void
+MackieControlProtocol::select_range ()
+{
+       RouteList routes;
+
+       pull_route_range (_down_select_buttons, routes);
+
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("select range: found %1 routes\n", routes.size()));
+
+       if (!routes.empty()) {
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+                       if (r == routes.begin()) {
+                               SetRouteSelection ((*r)->remote_control_id());
+                       } else {
+                               AddRouteToSelection ((*r)->remote_control_id());
+                       }
+               }
+       }
+}
+
+void
+MackieControlProtocol::add_down_button (AutomationType a, int surface, int strip)
+{
+       DownButtonMap::iterator m = _down_buttons.find (a);
+
+       if (m == _down_buttons.end()) {
+               _down_buttons[a] = DownButtonList();
+       }
+
+       _down_buttons[a].insert ((surface<<8)|(strip&0xf));
+}
+
+void
+MackieControlProtocol::remove_down_button (AutomationType a, int surface, int strip)
+{
+       DownButtonMap::iterator m = _down_buttons.find (a);
+
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down buttons for %3\n", surface, strip, (int) a));
+
+       if (m == _down_buttons.end()) {
+               return;
+       }
+
+       DownButtonList& l (m->second);
+       DownButtonList::iterator x = find (l.begin(), l.end(), (surface<<8)|(strip&0xf));
+
+       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));
+       }
+}
+
+MackieControlProtocol::ControlList
+MackieControlProtocol::down_controls (AutomationType p)
+{
+       ControlList controls;
+       RouteList routes;
+
+       DownButtonMap::iterator m = _down_buttons.find (p);
+
+       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()));
+
+       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 SoloAutomation:
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+                       controls.push_back ((*r)->solo_control());
+               }
+               break;
+       case MuteAutomation:
+               for (RouteList::iterator r = routes.begin(); r != routes.end(); ++r) {
+                       controls.push_back ((*r)->mute_control());
+               }
+               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;
+       default:
+               break;
+       }
+
+       return controls;
+
+}
+       
+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
+    }
+};
+
+void
+MackieControlProtocol::pull_route_range (DownButtonList& down, RouteList& selected)
+{
+       ButtonRangeSorter cmp;
+
+       if (down.empty()) {
+               return;
+       }
+
+       list<uint32_t> ldown;
+       ldown.insert (ldown.end(), down.begin(), down.end());
+       ldown.sort (cmp);
+
+       uint32_t first = ldown.front();
+       uint32_t last = ldown.back ();
+       
+       uint32_t first_surface = first>>8;
+       uint32_t first_strip = first&0xf;
+
+       uint32_t last_surface = last>>8;
+       uint32_t last_strip = last&0xf;
+
+       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) {
+
+                       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);
+                               }
+                       }
+               }
+       }
+}