enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git] / libs / surfaces / mackie / gui.cc
index a4907fe7a3aece5471ca1fb58a70662a191db1bb..06786197e2b0be6a000a03f801326de4c4a37f24 100644 (file)
 #include <gtkmm/scale.h>
 #include <gtkmm/alignment.h>
 
+#include "pbd/error.h"
+#include "pbd/unwind.h"
 #include "pbd/strsplit.h"
+#include "pbd/stacktrace.h"
 
-#include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/bindings.h"
+#include "gtkmm2ext/gui_thread.h"
+#include "gtkmm2ext/utils.h"
 
 #include "ardour/audioengine.h"
+#include "ardour/port.h"
 #include "ardour/rc_configuration.h"
 
 #include "mackie_control_protocol.h"
 #include "device_info.h"
 #include "gui.h"
+#include "surface.h"
+#include "surface_port.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -79,12 +87,14 @@ MackieControlProtocol::build_gui ()
 
 MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
        : _cp (p)
+       , table (2, 9)
        , touch_sensitivity_adjustment (0, 0, 9, 1, 4)
        , touch_sensitivity_scale (touch_sensitivity_adjustment)
        , recalibrate_fader_button (_("Recalibrate Faders"))
        , ipmidi_base_port_adjustment (_cp.ipmidi_base(), 0, 32767, 1, 1000)
-       , ipmidi_base_port_spinner (ipmidi_base_port_adjustment)
        , discover_button (_("Discover Mackie Devices"))
+       , _device_dependent_widget (0)
+       , ignore_active_change (false)
 {
        Gtk::Label* l;
        Gtk::Alignment* align;
@@ -92,15 +102,15 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
 
        set_border_width (12);
 
-       Gtk::Table* table = Gtk::manage (new Gtk::Table (2, 12));
-       table->set_row_spacings (4);
-       table->set_col_spacings (6);
-       table->set_border_width (12);
+       table.set_row_spacings (4);
+       table.set_col_spacings (6);
+       table.set_border_width (12);
+       table.set_homogeneous (false);
 
        l = manage (new Gtk::Label (_("Device Type:")));
        l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
-       table->attach (_surface_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0);
+       table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
+       table.attach (_surface_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0);
        row++;
 
        vector<string> surfaces;
@@ -109,52 +119,27 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
                surfaces.push_back (i->first);
        }
        Gtkmm2ext::set_popdown_strings (_surface_combo, surfaces);
-       _surface_combo.set_active_text (p.device_info().name());
        _surface_combo.signal_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::surface_combo_changed));
 
-       vector<string> midi_ports;
-
-       ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsOutput|ARDOUR::IsPhysical), midi_ports);
-       Gtkmm2ext::set_popdown_strings (_input_port_combo, midi_ports);
+       _cp.DeviceChanged.connect (device_change_connection, invalidator (*this), boost::bind (&MackieControlProtocolGUI::device_changed, this), gui_context());
+       _cp.ConnectionChange.connect (connection_change_connection, invalidator (*this), boost::bind (&MackieControlProtocolGUI::connection_handler, this), gui_context());
 
-       string send_string;
-       string receive_string;
-
-       if (_cp.device_info().extenders() > 0) {
-               send_string = _("Main surface sends via:");
-               receive_string = _("Main surface receives via:");
-       } else {
-               send_string = _("Surface sends via:");
-               receive_string = _("Surface receives via:");
-       }
+       ipmidi_base_port_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::ipmidi_spinner_changed));
 
-       l = manage (new Gtk::Label (send_string));
-       l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
-       table->attach (_input_port_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0);
-       row++;
+       /* device-dependent part */
 
-       midi_ports.clear ();
-       ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsInput|ARDOUR::IsPhysical), midi_ports);
-       Gtkmm2ext::set_popdown_strings (_output_port_combo, midi_ports);
+       device_dependent_row = row;
 
-       l = manage (new Gtk::Label (receive_string));
-       l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
-       table->attach (_output_port_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0);
-       row++;
+       if (_device_dependent_widget) {
+               table.remove (*_device_dependent_widget);
+               _device_dependent_widget = 0;
+       }
 
-       l = manage (new Gtk::Label (_("ipMIDI Port (lowest)")));
-       l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
-       table->attach (ipmidi_base_port_spinner, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       _device_dependent_widget = device_dependent_widget ();
+       table.attach (*_device_dependent_widget, 0, 12, row, row+1, AttachOptions(0), AttachOptions(0), 0, 0);
        row++;
 
-       ipmidi_base_port_spinner.set_sensitive (_cp.device_info().uses_ipmidi());
-       ipmidi_base_port_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::ipmidi_spinner_changed));
-
-       /* leave an extra blank row */
-       row++;
+       /* back to the boilerplate */
 
        RadioButtonGroup rb_group = absolute_touch_mode_button.get_group();
        touch_move_mode_button.set_group (rb_group);
@@ -167,67 +152,68 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
 
        l = manage (new Gtk::Label (_("Button click")));
        l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        align = manage (new Alignment);
        align->set (0.0, 0.5);
        align->add (relay_click_button);
-       table->attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        row++;
 
        l = manage (new Gtk::Label (_("Backlight")));
        l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        align = manage (new Alignment);
        align->set (0.0, 0.5);
        align->add (backlight_button);
-       table->attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        row++;
 
        l = manage (new Gtk::Label (_("Send Fader Position Only When Touched")));
        l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        align = manage (new Alignment);
        align->set (0.0, 0.5);
        align->add (absolute_touch_mode_button);
-       table->attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        row++;
 
        l = manage (new Gtk::Label (_("Send Fader Position When Moved")));
        l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        align = manage (new Alignment);
        align->set (0.0, 0.5);
        align->add (touch_move_mode_button);
-       table->attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*align, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        row++;
 
        l = manage (new Gtk::Label (_("Fader Touch Sense Sensitivity")));
        l->set_alignment (1.0, 0.5);
-       table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        touch_sensitivity_scale.property_digits() = 0;
        touch_sensitivity_scale.property_draw_value() = false;
-       table->attach (touch_sensitivity_scale, 1, 2, 5, 6, AttachOptions(FILL|EXPAND), AttachOptions (0));
-       table->attach (recalibrate_fader_button, row, row+1, 6, 7, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (touch_sensitivity_scale, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       row++;
+       table.attach (recalibrate_fader_button, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        row++;
 
 
-       table->attach (discover_button, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       table.attach (discover_button, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
        discover_button.signal_clicked().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::discover_clicked));
        row++;
 
        vector<string> profiles;
 
-       profiles.push_back ("default");
-
        for (std::map<std::string,DeviceProfile>::iterator i = DeviceProfile::device_profiles.begin(); i != DeviceProfile::device_profiles.end(); ++i) {
+               cerr << "add discovered profile " << i->first << endl;
                profiles.push_back (i->first);
        }
        Gtkmm2ext::set_popdown_strings (_profile_combo, profiles);
+       cerr << "set active profile from " << p.device_profile().name() << endl;
        _profile_combo.set_active_text (p.device_profile().name());
        _profile_combo.signal_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::profile_combo_changed));
 
-       append_page (*table, _("Device Setup"));
-       table->show_all();
+       append_page (table, _("Device Setup"));
+       table.show_all();
 
        /* function key editor */
 
@@ -258,6 +244,188 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
        fkey_packer->show_all();
 }
 
+void
+MackieControlProtocolGUI::connection_handler ()
+{
+       /* ignore all changes to combobox active strings here, because we're
+          updating them to match a new ("external") reality - we were called
+          because port connections have changed.
+       */
+
+       PBD::Unwinder<bool> ici (ignore_active_change, true);
+
+       vector<Gtk::ComboBox*>::iterator ic;
+       vector<Gtk::ComboBox*>::iterator oc;
+
+       vector<string> midi_inputs;
+       vector<string> midi_outputs;
+
+       ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsOutput|ARDOUR::IsTerminal), midi_inputs);
+       ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsInput|ARDOUR::IsTerminal), midi_outputs);
+
+       for (ic = input_combos.begin(), oc = output_combos.begin(); ic != input_combos.end() && oc != output_combos.end(); ++ic, ++oc) {
+
+               boost::shared_ptr<Surface> surface = _cp.get_surface_by_raw_pointer ((*ic)->get_data ("surface"));
+
+               if (surface) {
+                       update_port_combos (midi_inputs, midi_outputs, *ic, *oc, surface);
+               }
+       }
+}
+
+void
+MackieControlProtocolGUI::update_port_combos (vector<string> const& midi_inputs, vector<string> const& midi_outputs,
+                                              Gtk::ComboBox* input_combo,
+                                              Gtk::ComboBox* output_combo,
+                                              boost::shared_ptr<Surface> surface)
+{
+       Glib::RefPtr<Gtk::ListStore> input = build_midi_port_list (midi_inputs, true);
+       Glib::RefPtr<Gtk::ListStore> output = build_midi_port_list (midi_outputs, false);
+       bool input_found = false;
+       bool output_found = false;
+       int n;
+
+       input_combo->set_model (input);
+       output_combo->set_model (output);
+
+       Gtk::TreeModel::Children children = input->children();
+       Gtk::TreeModel::Children::iterator i;
+       i = children.begin();
+       ++i; /* skip "Disconnected" */
+
+
+       for (n = 1;  i != children.end(); ++i, ++n) {
+               string port_name = (*i)[midi_port_columns.full_name];
+               if (surface->port().input().connected_to (port_name)) {
+                       input_combo->set_active (n);
+                       input_found = true;
+                       break;
+               }
+       }
+
+       if (!input_found) {
+               input_combo->set_active (0); /* disconnected */
+       }
+
+       children = output->children();
+       i = children.begin();
+       ++i; /* skip "Disconnected" */
+
+       for (n = 1;  i != children.end(); ++i, ++n) {
+               string port_name = (*i)[midi_port_columns.full_name];
+               if (surface->port().output().connected_to (port_name)) {
+                       output_combo->set_active (n);
+                       output_found = true;
+                       break;
+               }
+       }
+
+       if (!output_found) {
+               output_combo->set_active (0); /* disconnected */
+       }
+}
+
+Gtk::Widget*
+MackieControlProtocolGUI::device_dependent_widget ()
+{
+       Gtk::Table* dd_table;
+       Gtk::Label* l;
+       int row = 0;
+
+       uint32_t n_surfaces = 1 + _cp.device_info().extenders();
+
+       if (!_cp.device_info().uses_ipmidi()) {
+               dd_table = Gtk::manage (new Gtk::Table (n_surfaces, 2));
+       } else {
+               dd_table = Gtk::manage (new Gtk::Table (1, 2));
+       }
+
+       dd_table = Gtk::manage (new Gtk::Table (2, n_surfaces));
+       dd_table->set_row_spacings (4);
+       dd_table->set_col_spacings (6);
+       dd_table->set_border_width (12);
+
+       _surface_combo.set_active_text (_cp.device_info().name());
+
+       vector<string> midi_inputs;
+       vector<string> midi_outputs;
+
+       ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsOutput|ARDOUR::IsPhysical), midi_inputs);
+       ARDOUR::AudioEngine::instance()->get_ports ("", ARDOUR::DataType::MIDI, ARDOUR::PortFlags (ARDOUR::IsInput|ARDOUR::IsPhysical), midi_outputs);
+
+       input_combos.clear ();
+       output_combos.clear ();
+
+       if (!_cp.device_info().uses_ipmidi()) {
+
+               for (uint32_t n = 0; n < n_surfaces; ++n) {
+
+                       boost::shared_ptr<Surface> surface = _cp.nth_surface (n);
+
+                       if (!surface) {
+                               PBD::fatal << string_compose (_("programming error: %1\n"), string_compose ("n=%1 surface not found!", n)) << endmsg;
+                               /*NOTREACHED*/
+                       }
+
+                       Gtk::ComboBox* input_combo = manage (new Gtk::ComboBox);
+                       Gtk::ComboBox* output_combo = manage (new Gtk::ComboBox);
+
+                       update_port_combos (midi_inputs, midi_outputs, input_combo, output_combo, surface);
+
+                       input_combo->pack_start (midi_port_columns.short_name);
+                       input_combo->set_data ("surface", surface.get());
+                       input_combos.push_back (input_combo);
+                       output_combo->pack_start (midi_port_columns.short_name);
+                       output_combo->set_data ("surface", surface.get());
+                       output_combos.push_back (output_combo);
+
+                       boost::weak_ptr<Surface> ws (surface);
+                       input_combo->signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &MackieControlProtocolGUI::active_port_changed), input_combo, ws, true));
+                       output_combo->signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &MackieControlProtocolGUI::active_port_changed), output_combo, ws, false));
+
+                       string send_string;
+                       string receive_string;
+
+                       if (n_surfaces > 1) {
+                               if (n == 0) {
+                                       send_string = _("Main surface sends via:");
+                                       receive_string = _("Main surface receives via:");
+                               } else {
+                                       send_string = string_compose (_("Extender %1 sends via:"), n);
+                                       receive_string = string_compose (_("Extender %1 receives via:"), n);
+                               }
+                       } else {
+                               send_string = _("Surface sends via:");
+                               receive_string = _("Surface receives via:");
+                       }
+
+                       l = manage (new Gtk::Label (send_string));
+                       l->set_alignment (1.0, 0.5);
+                       dd_table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
+                       dd_table->attach (*input_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0);
+                       row++;
+
+                       l = manage (new Gtk::Label (receive_string));
+                       l->set_alignment (1.0, 0.5);
+                       dd_table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0));
+                       dd_table->attach (*output_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0);
+                       row++;
+               }
+
+       } else {
+
+               l = manage (new Gtk::Label (_("ipMIDI Port (lowest)")));
+               l->set_alignment (1.0, 0.5);
+
+               Gtk::SpinButton*  ipmidi_base_port_spinner = manage (new Gtk::SpinButton (ipmidi_base_port_adjustment));
+               dd_table->attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+               dd_table->attach (*ipmidi_base_port_spinner, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0));
+               row++;
+       }
+
+       return dd_table;
+}
+
 CellRendererCombo*
 MackieControlProtocolGUI::make_action_renderer (Glib::RefPtr<TreeStore> model, Gtk::TreeModelColumnBase column)
 {
@@ -284,12 +452,13 @@ MackieControlProtocolGUI::build_available_action_menu ()
        vector<string> labels;
        vector<string> tooltips;
        vector<string> keys;
-       vector<AccelKey> bindings;
+       vector<Glib::RefPtr<Gtk::Action> > actions;
+
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
        NodeMap::iterator r;
 
-       ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings);
+       Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions);
 
        vector<string>::iterator k;
        vector<string>::iterator p;
@@ -299,8 +468,9 @@ MackieControlProtocolGUI::build_available_action_menu ()
        available_action_model->clear ();
 
        /* Because there are button bindings built in that are not
-       in the key binding map, there needs to be a way to undo
-       a profile edit. */
+          in the key binding map, there needs to be a way to undo
+          a profile edit.
+       */
        TreeIter rowp;
        TreeModel::Row parent;
        rowp = available_action_model->append();
@@ -322,7 +492,6 @@ MackieControlProtocolGUI::build_available_action_menu ()
        parent = *(rowp);
        parent[available_action_columns.name] = _("CmdAlt");
 
-
        for (l = labels.begin(), k = keys.begin(), p = paths.begin(), t = tooltips.begin(); l != labels.end(); ++k, ++p, ++t, ++l) {
 
                TreeModel::Row row;
@@ -453,54 +622,68 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
                string action;
                const string defstring = "\u2022";
 
-               action = dp.get_button_action (bid, 0);
-               if (action.empty()) {
-                       row[function_key_columns.plain] = defstring;
-               } else {
-                       if (action.find ('/') == string::npos) {
-                               /* Probably a key alias */
-                               row[function_key_columns.plain] = action;
-                       } else {
+               /* We only allow plain bindings for Fn keys. All others are
+                * reserved for hard-coded actions.
+                */
 
-                               act = ActionManager::get_action (action.c_str());
-                               if (act) {
-                                       row[function_key_columns.plain] = act->get_label();
+               if (bid >= Mackie::Button::F1 && bid <= Mackie::Button::F8) {
+
+                       action = dp.get_button_action (bid, 0);
+                       if (action.empty()) {
+                               row[function_key_columns.plain] = defstring;
+                       } else {
+                               if (action.find ('/') == string::npos) {
+                                       /* Probably a key alias */
+                                       row[function_key_columns.plain] = action;
                                } else {
-                                       row[function_key_columns.plain] = defstring;
+
+                                       act = ActionManager::get_action (action.c_str());
+                                       if (act) {
+                                               row[function_key_columns.plain] = act->get_label();
+                                       } else {
+                                               row[function_key_columns.plain] = defstring;
+                                       }
                                }
                        }
                }
 
-               action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_CONTROL);
-               if (action.empty()) {
-                       row[function_key_columns.control] = defstring;
-               } else {
-                       if (action.find ('/') == string::npos) {
-                               /* Probably a key alias */
-                               row[function_key_columns.control] = action;
+               /* We only allow plain bindings for Fn keys. All others are
+                * reserved for hard-coded actions.
+                */
+
+               if (bid >= Mackie::Button::F1 && bid <= Mackie::Button::F8) {
+
+                       action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_SHIFT);
+                       if (action.empty()) {
+                               row[function_key_columns.shift] = defstring;
                        } else {
-                               act = ActionManager::get_action (action.c_str());
-                               if (act) {
-                                       row[function_key_columns.control] = act->get_label();
+                               if (action.find ('/') == string::npos) {
+                                       /* Probably a key alias */
+                                       row[function_key_columns.shift] = action;
                                } else {
-                                       row[function_key_columns.control] = defstring;
+                                       act = ActionManager::get_action (action.c_str());
+                                       if (act) {
+                                               row[function_key_columns.shift] = act->get_label();
+                                       } else {
+                                               row[function_key_columns.shift] = defstring;
+                                       }
                                }
                        }
                }
 
-               action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_SHIFT);
+               action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_CONTROL);
                if (action.empty()) {
-                       row[function_key_columns.shift] = defstring;
+                       row[function_key_columns.control] = defstring;
                } else {
                        if (action.find ('/') == string::npos) {
                                /* Probably a key alias */
-                               row[function_key_columns.shift] = action;
+                               row[function_key_columns.control] = action;
                        } else {
                                act = ActionManager::get_action (action.c_str());
                                if (act) {
-                                       row[function_key_columns.shift] = act->get_label();
+                                       row[function_key_columns.control] = act->get_label();
                                } else {
-                                       row[function_key_columns.shift] = defstring;
+                                       row[function_key_columns.control] = defstring;
                                }
                        }
                }
@@ -630,18 +813,21 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib
 void
 MackieControlProtocolGUI::surface_combo_changed ()
 {
-       _cp.not_session_load();
-       _cp.set_device (_surface_combo.get_active_text());
+       _cp.set_device (_surface_combo.get_active_text(), false);
+}
 
-       if (_cp.device_info().uses_ipmidi()) {
-               ipmidi_base_port_spinner.set_sensitive (true);
-               _input_port_combo.set_sensitive (false);
-               _output_port_combo.set_sensitive (false);
-       } else {
-               ipmidi_base_port_spinner.set_sensitive (false);
-               _input_port_combo.set_sensitive (true);
-               _output_port_combo.set_sensitive (true);
+void
+MackieControlProtocolGUI::device_changed ()
+{
+       if (_device_dependent_widget) {
+               table.remove (*_device_dependent_widget);
+               _device_dependent_widget = 0;
        }
+
+       _device_dependent_widget = device_dependent_widget ();
+       _device_dependent_widget->show_all ();
+
+       table.attach (*_device_dependent_widget, 0, 12, device_dependent_row, device_dependent_row+1, AttachOptions(0), AttachOptions(0), 0, 0);
 }
 
 void
@@ -657,7 +843,7 @@ MackieControlProtocolGUI::profile_combo_changed ()
 void
 MackieControlProtocolGUI::ipmidi_spinner_changed ()
 {
-       _cp.set_ipmidi_base ((int16_t) lrintf (ipmidi_base_port_spinner.get_value()));
+       _cp.set_ipmidi_base ((int16_t) lrintf (ipmidi_base_port_adjustment.get_value()));
 }
 
 void
@@ -685,3 +871,65 @@ MackieControlProtocolGUI::touch_sensitive_change ()
        int sensitivity = (int) touch_sensitivity_adjustment.get_value ();
        _cp.set_touch_sensitivity (sensitivity);
 }
+
+Glib::RefPtr<Gtk::ListStore>
+MackieControlProtocolGUI::build_midi_port_list (vector<string> const & ports, bool for_input)
+{
+       Glib::RefPtr<Gtk::ListStore> store = ListStore::create (midi_port_columns);
+       TreeModel::Row row;
+
+       row = *store->append ();
+       row[midi_port_columns.full_name] = string();
+       row[midi_port_columns.short_name] = _("Disconnected");
+
+       for (vector<string>::const_iterator p = ports.begin(); p != ports.end(); ++p) {
+               row = *store->append ();
+               row[midi_port_columns.full_name] = *p;
+               std::string pn = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*p);
+               if (pn.empty ()) {
+                       pn = (*p).substr ((*p).find (':') + 1);
+               }
+               row[midi_port_columns.short_name] = pn;
+       }
+
+       return store;
+}
+
+void
+MackieControlProtocolGUI::active_port_changed (Gtk::ComboBox* combo, boost::weak_ptr<Surface> ws, bool for_input)
+{
+       if (ignore_active_change) {
+               return;
+       }
+
+       boost::shared_ptr<Surface> surface = ws.lock();
+
+       if (!surface) {
+               return;
+       }
+
+       TreeModel::iterator active = combo->get_active ();
+       string new_port = (*active)[midi_port_columns.full_name];
+
+       if (new_port.empty()) {
+               if (for_input) {
+                       surface->port().input().disconnect_all ();
+               } else {
+                       surface->port().output().disconnect_all ();
+               }
+
+               return;
+       }
+
+       if (for_input) {
+               if (!surface->port().input().connected_to (new_port)) {
+                       surface->port().input().disconnect_all ();
+                       surface->port().input().connect (new_port);
+               }
+       } else {
+               if (!surface->port().output().connected_to (new_port)) {
+                       surface->port().output().disconnect_all ();
+                       surface->port().output().connect (new_port);
+               }
+       }
+}