Mackie Control: Re-enable view_mode display and make sure all text vanishes after...
[ardour.git] / libs / surfaces / mackie / mackie_control_protocol.cc
index 4e61e675acd3f7c1ca91abdf069c5cf75c9355e6..dfd3fe63342a1f325d9c9fc42648c934ba908e02 100644 (file)
@@ -31,6 +31,7 @@
 #include <errno.h>
 
 #include <boost/shared_array.hpp>
+#include <glibmm/miscutils.h>
 
 #include "midi++/types.h"
 #include "midi++/port.h"
 #include "pbd/memento_command.h"
 #include "pbd/convert.h"
 
+#include "ardour/audio_track.h"
 #include "ardour/automation_control.h"
 #include "ardour/async_midi_port.h"
 #include "ardour/dB.h"
 #include "ardour/debug.h"
 #include "ardour/location.h"
 #include "ardour/meter.h"
+#include "ardour/midi_track.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
+#include "ardour/profile.h"
 #include "ardour/route.h"
+#include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 #include "ardour/track.h"
@@ -102,11 +107,13 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
        : ControlProtocol (session, X_("Mackie"))
        , AbstractUI<MackieControlUIRequest> ("mackie")
        , _current_initial_bank (0)
+       , _frame_last (0)
        , _timecode_type (ARDOUR::AnyTime::BBT)
        , _gui (0)
        , _scrub_mode (false)
        , _flip_mode (Normal)
        , _view_mode (Mixer)
+       , _subview_mode (None)
        , _pot_mode (Pan)
        , _current_selected_track (-1)
        , _modifier_state (0)
@@ -114,15 +121,20 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
        , needs_ipmidi_restart (false)
        , _metering_active (true)
        , _initialized (false)
-       , _surfaces_state (0)
-       , _surfaces_version (0)
-       , _session_load (true)
+       , configuration_state (0)
+       , state_version (0)
 {
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
 
        DeviceInfo::reload_device_info ();
        DeviceProfile::reload_device_profiles ();
 
+       for (int i = 0; i < 9; i++) {
+               _last_bank[i] = 0;
+       }
+
+       _last_bank[Mixer] = _current_selected_track;
+
        TrackSelectionChanged.connect (gui_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::gui_track_selection_changed, this, _1, true), this);
 
        _instance = this;
@@ -144,7 +156,7 @@ MackieControlProtocol::~MackieControlProtocol()
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol tear_down_gui ()\n");
        tear_down_gui ();
 
-       delete _surfaces_state;
+       delete configuration_state;
 
        /* stop event loop */
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol BaseUI::quit ()\n");
@@ -280,25 +292,76 @@ MackieControlProtocol::get_sorted_routes()
                if (route_is_locked_to_strip(route)) {
                        continue;
                }
-               /* This next section which is not used yet, looks wrong to me
-                       The first four belong here but the bottom five are not a selection
-                       of routes and belong elsewhere as they are v-pot modes.
-               */
+
                switch (_view_mode) {
                case Mixer:
+                       if (route->route_group()) {
+                               route->route_group()->set_active (true, this);
+                       }
+                       sorted.push_back (route);
+                       remote_ids.insert (route->remote_control_id());
                        break;
                case AudioTracks:
+                       if (is_audio_track(route)) {
+                               if (route->route_group()) {
+                                       route->route_group()->set_active (true, this);
+                               }
+                               sorted.push_back (route);
+                               remote_ids.insert (route->remote_control_id());
+                       }
                        break;
                case Busses:
+                       if (Profile->get_mixbus()) {
+#ifdef MIXBUS
+                               if (route->mixbus()) {
+                                       sorted.push_back (route);
+                                       remote_ids.insert (route->remote_control_id());
+                               }
+#endif                         
+                       } else {
+                               if (!is_track(route)) {
+                                       if (route->route_group()) {
+                                               route->route_group()->set_active (true, this);
+                                       }
+                                       sorted.push_back (route);
+                                       remote_ids.insert (route->remote_control_id());
+                               }
+                       }
                        break;
                case MidiTracks:
+                       if (is_midi_track(route)) {
+                               if (route->route_group()) {
+                                       route->route_group()->set_active (true, this);
+                               }
+                               sorted.push_back (route);
+                               remote_ids.insert (route->remote_control_id());
+                       }
+                       break;
+               case Plugins:
                        break;
-               case Loop:
+               case Auxes: // in ardour, for now aux and buss are same. for mixbus, see "Busses" case above
+                       if (!is_track(route)) {
+                               if (route->route_group()) {
+                                       route->route_group()->set_active (true, this);
+                               }
+                               sorted.push_back (route);
+                               remote_ids.insert (route->remote_control_id());
+                       }
+                       break;
+               case Selected: // For example: a group
+                       if (selected(route)) {
+                               /* Selected may be a group in which case we want to
+                                * control each track separately.
+                                */
+                               if (route->route_group()) {
+                                       route->route_group()->set_active (false, this);
+                               }
+                               sorted.push_back (route);
+                               remote_ids.insert (route->remote_control_id());
+                       }
                        break;
                }
 
-               sorted.push_back (*it);
-               remote_ids.insert (route->remote_control_id());
        }
 
        sort (sorted.begin(), sorted.end(), RouteByRemoteId());
@@ -342,7 +405,6 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
                 */
                return;
        }
-
        _current_initial_bank = initial;
        _current_selected_track = -1;
 
@@ -374,12 +436,9 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
                }
        }
 
-       /* reset this to get the right display of view mode after the switch */
-       set_view_mode (_view_mode);
-
        /* make sure selection is correct */
 
-       _gui_track_selection_changed (&_last_selected_routes, false);
+       _gui_track_selection_changed (&_last_selected_routes, false, false);
 
        /* current bank has not been saved */
        session->set_dirty();
@@ -400,11 +459,11 @@ MackieControlProtocol::set_active (bool yn)
 
                BaseUI::run ();
 
-               if (create_surfaces ()) {
-                       return -1;
-               }
                connect_session_signals ();
-               update_surfaces ();
+
+               if (!_device_info.name().empty()) {
+                       set_device (_device_info.name(), true);
+               }
 
                /* set up periodic task for metering and automation
                 */
@@ -532,13 +591,21 @@ MackieControlProtocol::update_timecode_beats_led()
 void
 MackieControlProtocol::update_global_button (int id, LedState ls)
 {
-       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+       boost::shared_ptr<Surface> surface;
 
-       if (!_device_info.has_global_controls()) {
-               return;
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+               if (surfaces.empty()) {
+                       return;
+               }
+
+               if (!_device_info.has_global_controls()) {
+                       return;
+               }
+               // surface needs to be master surface
+               surface = _master_surface;
        }
-       // surface needs to be master surface
-       boost::shared_ptr<Surface> surface = _master_surface;
 
        map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (id);
        if (x != surface->controls_by_device_independent_id.end()) {
@@ -554,6 +621,10 @@ MackieControlProtocol::update_global_led (int id, LedState ls)
 {
        Glib::Threads::Mutex::Lock lm (surfaces_lock);
 
+       if (surfaces.empty()) {
+               return;
+       }
+
        if (!_device_info.has_global_controls()) {
                return;
        }
@@ -580,6 +651,7 @@ MackieControlProtocol::device_ready ()
 
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("device ready init (active=%1)\n", active()));
        update_surfaces ();
+       set_pot_mode (_pot_mode);
 }
 
 // send messages to surface to set controls to correct values
@@ -632,6 +704,7 @@ MackieControlProtocol::connect_session_signals()
 {
        // receive routes added
        session->RouteAdded.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_route_added, this, _1), this);
+       session->RouteAddedOrRemoved.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_route_added_or_removed, this), this);
        // receive record state toggled
        session->RecordStateChanged.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_record_state_changed, this), this);
        // receive transport state changed
@@ -655,14 +728,10 @@ 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()) {
+               _device_profile = DeviceProfile (profile_name);
                return;
        }
 
@@ -686,13 +755,30 @@ MackieControlProtocol::set_device_info (const string& device_name)
 }
 
 int
-MackieControlProtocol::set_device (const string& device_name)
+MackieControlProtocol::set_device (const string& device_name, bool force)
 {
+       if (device_name == device_info().name() && !force) {
+               /* already using that device, nothing to do */
+               return 0;
+       }
+       /* get state from the current setup, and make sure it is stored in
+          the configuration_states node so that if we switch back to this device,
+          we will have its state available.
+       */
+
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+               if (!surfaces.empty()) {
+                       update_configuration_state ();
+               }
+       }
+
        if (set_device_info (device_name)) {
                return -1;
        }
 
        clear_surfaces ();
+       port_connection.disconnect ();
        hui_connection.disconnect ();
 
        if (_device_info.device_type() == DeviceInfo::HUI) {
@@ -701,11 +787,19 @@ MackieControlProtocol::set_device (const string& device_name)
                hui_timeout->attach (main_loop()->get_context());
        }
 
+       if (!_device_info.uses_ipmidi()) {
+               /* notice that the handler for this will execute in our event
+                  loop, not in the thread where the
+                  PortConnectedOrDisconnected signal is emitted.
+               */
+               ARDOUR::AudioEngine::instance()->PortConnectedOrDisconnected.connect (port_connection, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::connection_handler, this, _1, _2, _3, _4, _5), this);
+       }
+
        if (create_surfaces ()) {
                return -1;
        }
 
-       switch_banks (0, true);
+       DeviceChanged ();
 
        return 0;
 }
@@ -722,21 +816,39 @@ MackieControlProtocol::create_surfaces ()
 {
        string device_name;
        surface_type_t stype = mcu; // type not yet determined
-       char buf[128];
 
-       if (_device_info.extenders() == 0) {
-               device_name = X_("mackie control");
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Create %1 surfaces for %2\n", 1 + _device_info.extenders(), _device_info.name()));
+
+       if (!_device_info.uses_ipmidi()) {
+               _input_bundle.reset (new ARDOUR::Bundle (_("Mackie Control In"), true));
+               _output_bundle.reset (new ARDOUR::Bundle (_("Mackie Control Out"), false));
        } else {
-               device_name = X_("mackie control #1");
+               _input_bundle.reset ();
+               _output_bundle.reset ();
+
        }
+       for (uint32_t n = 0; n < 1 + _device_info.extenders(); ++n) {
+               bool is_master = false;
 
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Create %1 surfaces\n", 1 + _device_info.extenders()));
+               if (n == _device_info.master_position()) {
+                       is_master = true;
+                       if (_device_info.extenders() == 0) {
+                               device_name = _device_info.name();
+                       } else {
+                               device_name = X_("mackie control");
+                       }
 
-       for (uint32_t n = 0; n < 1 + _device_info.extenders(); ++n) {
+               }
+
+               if (!is_master) {
+                       device_name = string_compose (X_("mackie control ext %1"), n+1);
+               }
+
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Port Name for surface %1 is %2\n", n, device_name));
 
                boost::shared_ptr<Surface> surface;
 
-               if (n == _device_info.master_position()) {
+               if (is_master) {
                        stype = mcu;
                } else {
                        stype = ext;
@@ -747,12 +859,26 @@ MackieControlProtocol::create_surfaces ()
                        return -1;
                }
 
-               if (n == _device_info.master_position()) {
+               if (is_master) {
                        _master_surface = surface;
                }
 
-               if (_surfaces_state) {
-                       surface->set_state (*_surfaces_state, _surfaces_version);
+               if (configuration_state) {
+                       XMLNode* this_device = 0;
+                       XMLNodeList const& devices = configuration_state->children();
+                       for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) {
+                               XMLProperty* prop = (*d)->property (X_("name"));
+                               if (prop && prop->value() == _device_info.name()) {
+                                       this_device = *d;
+                                       break;
+                               }
+                       }
+                       if (this_device) {
+                               XMLNode* snode = this_device->child (X_("Surfaces"));
+                               if (snode) {
+                                       surface->set_state (*snode, state_version);
+                               }
+                       }
                }
 
                {
@@ -760,18 +886,8 @@ MackieControlProtocol::create_surfaces ()
                        surfaces.push_back (surface);
                }
 
-               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;
-               }
-
                if (!_device_info.uses_ipmidi()) {
 
-                       _input_bundle.reset (new ARDOUR::Bundle (_("Mackie Control In"), true));
-                       _output_bundle.reset (new ARDOUR::Bundle (_("Mackie Control Out"), false));
-
                        _input_bundle->add_channel (
                                surface->port().input_port().name(),
                                ARDOUR::DataType::MIDI,
@@ -783,14 +899,6 @@ MackieControlProtocol::create_surfaces ()
                                ARDOUR::DataType::MIDI,
                                session->engine().make_port_name_non_relative (surface->port().output_port().name())
                                );
-
-                       session->BundleAddedOrRemoved ();
-
-               } else {
-                       _input_bundle.reset ((ARDOUR::Bundle*) 0);
-                       _output_bundle.reset ((ARDOUR::Bundle*) 0);
-
-                       session->BundleAddedOrRemoved ();
                }
 
                MIDI::Port& input_port (surface->port().input_port());
@@ -812,7 +920,12 @@ MackieControlProtocol::create_surfaces ()
                        if ((fd = input_port.selectable ()) >= 0) {
 
                                GIOChannel* ioc = g_io_channel_unix_new (fd);
-                               GSource* gsrc = g_io_create_watch (ioc, GIOCondition (G_IO_IN|G_IO_HUP|G_IO_ERR));
+                               surface->input_source = g_io_create_watch (ioc, GIOCondition (G_IO_IN|G_IO_HUP|G_IO_ERR));
+
+                               /* make surface's input source now hold the
+                                * only reference on the IO channel
+                                */
+                               g_io_channel_unref (ioc);
 
                                /* hack up an object so that in the callback from the event loop
                                   we have both the MackieControlProtocol and the input port.
@@ -827,18 +940,30 @@ MackieControlProtocol::create_surfaces ()
                                ipm->mcp = this;
                                ipm->port = &input_port;
 
-                               g_source_set_callback (gsrc, (GSourceFunc) ipmidi_input_handler, ipm, NULL);
-                               g_source_attach (gsrc, main_loop()->get_context()->gobj());
+                               g_source_set_callback (surface->input_source, (GSourceFunc) ipmidi_input_handler, ipm, NULL);
+                               g_source_attach (surface->input_source, main_loop()->get_context()->gobj());
                        }
                }
        }
 
+       if (!_device_info.uses_ipmidi()) {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+               for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+                       (*s)->port().reconnect ();
+               }
+       }
+
+       session->BundleAddedOrRemoved ();
+
+       assert (_master_surface);
+
        return 0;
 }
 
 void
 MackieControlProtocol::close()
 {
+       port_connection.disconnect ();
        session_connections.drop_connections ();
        route_connections.drop_connections ();
        periodic_connection.disconnect ();
@@ -846,6 +971,34 @@ MackieControlProtocol::close()
        clear_surfaces();
 }
 
+/** Ensure that the configuration_state XML node contains an up-to-date
+ *  copy of the state node the current device. If configuration_state already
+ *  contains a state node for the device, it will deleted and replaced.
+ */
+void
+MackieControlProtocol::update_configuration_state ()
+{
+       /* CALLER MUST HOLD SURFACES LOCK */
+
+       if (!configuration_state) {
+               configuration_state = new XMLNode (X_("Configurations"));
+       }
+
+       XMLNode* devnode = new XMLNode (X_("Configuration"));
+       devnode->add_property (X_("name"), _device_info.name());
+
+       configuration_state->remove_nodes_and_delete (X_("name"), _device_info.name());
+       configuration_state->add_child_nocopy (*devnode);
+
+       XMLNode* snode = new XMLNode (X_("Surfaces"));
+
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               snode->add_child_nocopy ((*s)->get_state());
+       }
+
+       devnode->add_child_nocopy (*snode);
+}
+
 XMLNode&
 MackieControlProtocol::get_state()
 {
@@ -865,12 +1018,13 @@ MackieControlProtocol::get_state()
        node.add_property (X_("device-profile"), _device_profile.name());
        node.add_property (X_("device-name"), _device_info.name());
 
-       XMLNode* snode = new XMLNode (X_("Surfaces"));
-       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
-               snode->add_child_nocopy ((*s)->get_state());
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+               update_configuration_state ();
        }
 
-       node.add_child_nocopy (*snode);
+       /* force a copy of the _surfaces_state node, because we want to retain ownership */
+       node.add_child_copy (*configuration_state);
 
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state done\n");
 
@@ -904,17 +1058,27 @@ MackieControlProtocol::set_state (const XMLNode & node, int version)
        }
 
        if ((prop = node.property (X_("device-profile"))) != 0) {
-               set_profile (prop->value());
+               if (prop->value().empty()) {
+                       string default_profile_name;
+
+                       default_profile_name = Glib::get_user_name();
+                       default_profile_name += ' ';
+                       default_profile_name += _device_info.name();
+
+                       set_profile (default_profile_name);
+               } else {
+                       set_profile (prop->value());
+               }
        }
 
-       XMLNode* snode = node.child (X_("Surfaces"));
+       XMLNode* dnode = node.child (X_("Configurations"));
 
-       delete _surfaces_state;
-       _surfaces_state = 0;
+       delete configuration_state;
+       configuration_state = 0;
 
-       if (snode) {
-               _surfaces_state = new XMLNode (*snode);
-               _surfaces_version = version;
+       if (dnode) {
+               configuration_state = new XMLNode (*dnode);
+               state_version = version;
        }
 
        switch_banks (bank, true);
@@ -989,6 +1153,13 @@ MackieControlProtocol::update_timecode_display()
        // do assignment here so current_frame is fixed
        framepos_t current_frame = session->transport_frame();
        string timecode;
+       // For large jumps in play head possition do full reset
+       int moved = (current_frame - _frame_last) / session->frame_rate ();
+       if (moved) {
+               DEBUG_TRACE (DEBUG::MackieControl, "Timecode reset\n");
+               _timecode_last = string (10, ' ');
+       }
+       _frame_last = current_frame;
 
        switch (_timecode_type) {
        case ARDOUR::AnyTime::BBT:
@@ -1028,10 +1199,36 @@ void MackieControlProtocol::notify_parameter_changed (std::string const & p)
        }
 }
 
+void
+MackieControlProtocol::notify_route_added_or_removed ()
+{
+       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               (*s)->master_monitor_may_have_changed ();
+       }
+}
+
 // RouteList is the set of routes that have just been added
 void
 MackieControlProtocol::notify_route_added (ARDOUR::RouteList & rl)
 {
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+               if (surfaces.empty()) {
+                       return;
+               }
+       }
+
+       /* special case: single route, and it is the monitor or master out */
+
+       if (rl.size() == 1 && (rl.front()->is_monitor() || rl.front()->is_master())) {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+               for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+                       (*s)->master_monitor_may_have_changed ();
+               }
+       }
+
        // currently assigned banks are less than the full set of
        // strips, so activate the new strip now.
 
@@ -1054,6 +1251,11 @@ MackieControlProtocol::notify_solo_active_changed (bool active)
 
        {
                Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+               if (surfaces.empty()) {
+                       return;
+               }
+
                surface = _master_surface;
        }
 
@@ -1069,6 +1271,14 @@ MackieControlProtocol::notify_solo_active_changed (bool active)
 void
 MackieControlProtocol::notify_remote_id_changed()
 {
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+               if (surfaces.empty()) {
+                       return;
+               }
+       }
+
        Sorted sorted = get_sorted_routes();
        uint32_t sz = n_strips();
 
@@ -1108,6 +1318,9 @@ MackieControlProtocol::notify_transport_state_changed()
        update_global_button (Button::Rewind, session->transport_speed() < 0.0);
        update_global_button (Button::Ffwd, session->transport_speed() > 1.0);
 
+       // sometimes a return to start leaves time code at old time
+       _timecode_last = string (10, ' ');
+
        notify_metering_state_changed ();
 }
 
@@ -1132,6 +1345,9 @@ MackieControlProtocol::notify_record_state_changed ()
 
        {
                Glib::Threads::Mutex::Lock lm (surfaces_lock);
+               if (surfaces.empty()) {
+                       return;
+               }
                surface = _master_surface;
        }
 
@@ -1278,7 +1494,6 @@ MackieControlProtocol::build_button_map ()
        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::MasterFaderTouch, &MackieControlProtocol::master_fader_touch_press, &MackieControlProtocol::master_fader_touch_release);
-
 }
 
 void
@@ -1367,14 +1582,15 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu
 bool
 MackieControlProtocol::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 {
-       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("something happend on  %1\n", port->name()));
-
        if (ioc & ~IO_IN) {
+               DEBUG_TRACE (DEBUG::MackieControl, "MIDI port closed\n");
                return false;
        }
 
        if (ioc & IO_IN) {
 
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("something happend on  %1\n", port->name()));
+
                /* Devices using regular JACK MIDI ports will need to have
                   the x-thread FIFO drained to avoid burning endless CPU.
 
@@ -1407,43 +1623,169 @@ MackieControlProtocol::clear_ports ()
        }
 }
 
+void
+MackieControlProtocol::notify_subview_route_deleted ()
+{
+       /* return to global/mixer view */
+       _subview_route.reset ();
+       set_view_mode (Mixer);
+}
+
+void
+MackieControlProtocol::set_subview_mode (SubViewMode sm, boost::shared_ptr<Route> r)
+{
+       SubViewMode old_mode = _subview_mode;
+       boost::shared_ptr<Route> old_route = _subview_route;
+
+       _subview_mode = sm;
+
+       if (r) {
+               /* retain _subview_route even if it is reset to null implicitly */
+               _subview_route = r;
+       }
+
+       if ((_subview_mode != old_mode) || (_subview_route != old_route)) {
+
+               if (r != old_route) {
+                       subview_route_connections.drop_connections ();
+                       if (_subview_route) {
+                               _subview_route->DropReferences.connect (subview_route_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_subview_route_deleted, this), this);
+                       }
+               }
+
+               /* subview mode did actually change */
+
+               {
+                       Surfaces copy; /* can't hold surfaces lock while calling Strip::subview_mode_changed */
+
+                       {
+                               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+                               copy = surfaces;
+                       }
+
+                       for (Surfaces::iterator s = copy.begin(); s != copy.end(); ++s) {
+                               (*s)->subview_mode_changed ();
+                       }
+               }
+
+               if (_subview_mode != old_mode) {
+
+                       /* turn buttons related to vpot mode on or off as required */
+
+                       switch (_subview_mode) {
+                       case MackieControlProtocol::None:
+                               pot_mode_globals ();
+                               break;
+                       case MackieControlProtocol::EQ:
+                               update_global_button (Button::Eq, on);
+                               update_global_button (Button::Dyn, off);
+                               update_global_button (Button::AudioInstruments, off); /* faking up Dyn */
+                               update_global_button (Button::Trim, off);
+                               update_global_button (Button::Send, off);
+                               update_global_button (Button::Pan, off);
+                               break;
+                       case MackieControlProtocol::Dynamics:
+                               update_global_button (Button::Eq, off);
+                               update_global_button (Button::Dyn, on);
+                               update_global_button (Button::AudioInstruments, on); /* faking up Dyn */
+                               update_global_button (Button::Trim, off);
+                               update_global_button (Button::Send, off);
+                               update_global_button (Button::Pan, off);
+                               break;
+                       }
+               }
+       }
+}
+
 void
 MackieControlProtocol::set_view_mode (ViewMode m)
 {
-       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+       _last_bank[_view_mode] = _current_initial_bank;
 
        _view_mode = m;
+       set_subview_mode (None, boost::shared_ptr<Route>());
 
-       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
-               (*s)->update_view_mode_display ();
-       }
+       switch_banks(_last_bank[_view_mode], true);
+       display_view_mode ();
+}
 
+void
+MackieControlProtocol::display_view_mode ()
+{
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+               for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+                       (*s)->update_view_mode_display ();
+               }
+       }
 }
 
 void
 MackieControlProtocol::set_flip_mode (FlipMode fm)
 {
-       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+       if (_flip_mode != fm) {
+               if (fm == Normal) {
+                       update_global_button (Button::Flip, off);
+               } else {
+                       update_global_button (Button::Flip, on);
+               }
 
-       _flip_mode = fm;
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
 
-       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
-               (*s)->update_flip_mode_display ();
+               _flip_mode = fm;
+
+               for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+                       (*s)->update_flip_mode_display ();
+               }
        }
 }
 
 void
 MackieControlProtocol::set_pot_mode (PotMode m)
 {
-       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+       // maybe not in flip mode.
+       if (flip_mode()) {
+               return;
+       }
 
        _pot_mode = m;
 
-       for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
-               (*s)->update_potmode ();
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
 
+               for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+                       (*s)->update_potmode ();
+
+               }
        }
 
+       pot_mode_globals ();
+}
+
+void
+MackieControlProtocol::pot_mode_globals ()
+{
+       update_global_button (Button::Eq, off);
+       update_global_button (Button::Dyn, off);
+       update_global_button (Button::AudioInstruments, off);
+
+       switch (_pot_mode) {
+       case Trim:
+               update_global_button (Button::Track, on);
+               update_global_button (Button::Send, off);
+               update_global_button (Button::Pan, off);
+               break;
+       case Send:
+               update_global_button (Button::Track, off);
+               update_global_button (Button::Send, on);
+               update_global_button (Button::Pan, off);
+               break;
+       case Pan:
+               update_global_button (Button::Track, off);
+               update_global_button (Button::Send, off);
+               update_global_button (Button::Pan, on);
+       };
 }
 
 void
@@ -1481,11 +1823,11 @@ MackieControlProtocol::force_special_route_to_strip (boost::shared_ptr<Route> r,
 void
 MackieControlProtocol::gui_track_selection_changed (ARDOUR::RouteNotificationListPtr rl, bool save_list)
 {
-       _gui_track_selection_changed (rl.get(), save_list);
+       _gui_track_selection_changed (rl.get(), save_list, true);
 }
 
 void
-MackieControlProtocol::_gui_track_selection_changed (ARDOUR::RouteNotificationList* rl, bool save_list)
+MackieControlProtocol::_gui_track_selection_changed (ARDOUR::RouteNotificationList* rl, bool save_list, bool gui_selection_did_change)
 {
        /* We need to keep a list of the most recently selected routes around,
           but we are not allowed to keep shared_ptr<Route> unless we want to
@@ -1516,6 +1858,11 @@ MackieControlProtocol::_gui_track_selection_changed (ARDOUR::RouteNotificationLi
        if (save_list) {
                _last_selected_routes = *rl;
        }
+
+       if (gui_selection_did_change) {
+               /* actual GUI selection changed */
+               set_subview_mode (_subview_mode, first_selected_route());
+       }
 }
 
 framepos_t
@@ -1753,9 +2100,12 @@ void
 MackieControlProtocol::clear_surfaces ()
 {
        clear_ports ();
-       Glib::Threads::Mutex::Lock lm (surfaces_lock);
-       _master_surface.reset ();
-       surfaces.clear ();
+
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+               _master_surface.reset ();
+               surfaces.clear ();
+       }
 }
 
 void
@@ -1790,3 +2140,114 @@ MackieControlProtocol::toggle_backlight ()
                (*s)->toggle_backlight ();
        }
 }
+
+boost::shared_ptr<Surface>
+MackieControlProtocol::get_surface_by_raw_pointer (void* ptr) const
+{
+       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+       for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               if ((*s).get() == (Surface*) ptr) {
+                       return *s;
+               }
+       }
+
+       return boost::shared_ptr<Surface> ();
+}
+
+boost::shared_ptr<Surface>
+MackieControlProtocol::nth_surface (uint32_t n) const
+{
+       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+
+       for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s, --n) {
+               if (n == 0) {
+                       return *s;
+               }
+       }
+
+       return boost::shared_ptr<Surface> ();
+}
+
+void
+MackieControlProtocol::connection_handler (boost::weak_ptr<ARDOUR::Port> wp1, std::string name1, boost::weak_ptr<ARDOUR::Port> wp2, std::string name2, bool yn)
+{
+       Surfaces scopy;
+       {
+               Glib::Threads::Mutex::Lock lm (surfaces_lock);
+               scopy = surfaces;
+       }
+
+       for (Surfaces::const_iterator s = scopy.begin(); s != scopy.end(); ++s) {
+               if ((*s)->connection_handler (wp1, name1, wp2, name2, yn)) {
+                       ConnectionChange (*s);
+                       break;
+               }
+       }
+}
+
+bool
+MackieControlProtocol::is_track (boost::shared_ptr<Route> r) const
+{
+       return boost::dynamic_pointer_cast<Track>(r) != 0;
+}
+
+bool
+MackieControlProtocol::is_audio_track (boost::shared_ptr<Route> r) const
+{
+       return boost::dynamic_pointer_cast<AudioTrack>(r) != 0;
+}
+
+bool
+MackieControlProtocol::is_midi_track (boost::shared_ptr<Route> r) const
+{
+       return boost::dynamic_pointer_cast<MidiTrack>(r) != 0;
+}
+
+bool
+MackieControlProtocol::selected (boost::shared_ptr<Route> r) const
+{
+       const RouteNotificationList* rl = &_last_selected_routes;
+
+       for (ARDOUR::RouteNotificationList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
+               boost::shared_ptr<ARDOUR::Route> rt = (*i).lock();
+               if (rt == r) {
+                       return true;
+               }
+       }
+       return false;
+}
+
+boost::shared_ptr<Route>
+MackieControlProtocol::first_selected_route () const
+{
+       if (_last_selected_routes.empty()) {
+               return boost::shared_ptr<Route>();
+       }
+
+       boost::shared_ptr<Route> r = _last_selected_routes.front().lock();
+
+       return r; /* may be null */
+}
+
+boost::shared_ptr<Route>
+MackieControlProtocol::subview_route () const
+{
+       return _subview_route;
+}
+
+uint32_t
+MackieControlProtocol::global_index (Strip& strip)
+{
+       Glib::Threads::Mutex::Lock lm (surfaces_lock);
+       uint32_t global = 0;
+
+       for (Surfaces::const_iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
+               if ((*s).get() == strip.surface()) {
+                       return global + strip.index();
+               }
+               global += (*s)->n_strips ();
+       }
+
+       return global;
+}