rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_divisi...
[ardour.git] / libs / surfaces / mackie / mackie_control_protocol.cc
index 005d28f7aa4b1b57be9e015dc8fd4772acc5a997..6fda7d74049878a8d234282d16107e704e2b4dfa 100644 (file)
@@ -70,21 +70,33 @@ using namespace PBD;
 
 #include "i18n.h"
 
+#include "pbd/abstract_ui.cc" // instantiate template
+
 MackieMidiBuilder builder;
 
 #define midi_ui_context() MidiControlUI::instance() /* a UICallback-derived object that specifies the event loop for signal handling */
 #define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__))
 
+extern PBD::EventLoop::InvalidationRecord* __invalidator (sigc::trackable& trackable, const char*, int);
+#define invalidator(x) __invalidator ((x), __FILE__, __LINE__)
+
 MackieControlProtocol::MackieControlProtocol (Session& session)
        : ControlProtocol (session, X_("Mackie"), MidiControlUI::instance())
+       , AbstractUI<MackieControlUIRequest> ("mackie")
        , _current_initial_bank (0)
        , _surface (0)
        , _jog_wheel (*this)
        , _timecode_type (ARDOUR::AnyTime::BBT)
        , _input_bundle (new ARDOUR::Bundle (_("Mackie Control In"), true))
        , _output_bundle (new ARDOUR::Bundle (_("Mackie Control Out"), false))
+       , _gui (0)
 {
        DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
+
+       AudioEngine::instance()->PortConnectedOrDisconnected.connect (
+               audio_engine_connections, invalidator (*this), ui_bind (&MackieControlProtocol::port_connected_or_disconnected, this, _2, _4, _5),
+               midi_ui_context ()
+               );
 }
 
 MackieControlProtocol::~MackieControlProtocol()
@@ -150,8 +162,7 @@ void
 MackieControlProtocol::next_track()
 {
        Sorted sorted = get_sorted_routes();
-       if (_current_initial_bank + route_table.size() < sorted.size())
-       {
+       if (_current_initial_bank + route_table.size() < sorted.size()) {
                session->set_dirty();
                switch_banks (_current_initial_bank + 1);
        }
@@ -217,17 +228,15 @@ 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)
-       {
+       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()
-               )
-               {
+                       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());
                }
@@ -251,8 +260,7 @@ MackieControlProtocol::switch_banks (int initial)
        // sanity checking
        Sorted sorted = get_sorted_routes();
        int delta = sorted.size() - route_table.size();
-       if (initial < 0 || (delta > 0 && initial > delta))
-       {
+       if (initial < 0 || (delta > 0 && initial > delta)) {
                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("not switching to %1\n", initial));
                return;
        }
@@ -263,8 +271,7 @@ MackieControlProtocol::switch_banks (int initial)
        clear_route_signals();
 
        // now set the signals for new routes
-       if (_current_initial_bank <= sorted.size())
-       {
+       if (_current_initial_bank <= sorted.size()) {
                // fetch the bank start and end to switch to
                uint32_t end_pos = min (route_table.size(), sorted.size());
                Sorted::iterator it = sorted.begin() + _current_initial_bank;
@@ -272,10 +279,14 @@ MackieControlProtocol::switch_banks (int initial)
 
                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("switch to %1, %2\n", _current_initial_bank, end_pos));
 
+               // clear out routes from our table in case any have been deleted
+               for (vector<boost::shared_ptr<Route> >::iterator i = route_table.begin(); i != route_table.end(); ++i) {
+                       i->reset ();
+               }
+
                // link routes to strips
                uint32_t i = 0;
-               for (; it != end && it != sorted.end(); ++it, ++i)
-               {
+               for (; it != end && it != sorted.end(); ++it, ++i) {
                        boost::shared_ptr<Route> route = *it;
 
                        assert (surface().strips[i]);
@@ -292,8 +303,7 @@ MackieControlProtocol::switch_banks (int initial)
 
                // create dead strips if there aren't enough routes to
                // fill a bank
-               for (; i < route_table.size(); ++i)
-               {
+               for (; i < route_table.size(); ++i) {
                        Strip & strip = *surface().strips[i];
                        // send zero for this strip
                        MackiePort & port = port_for_id(i);
@@ -311,8 +321,7 @@ MackieControlProtocol::zero_all()
        // TODO turn off Timecode displays
 
        // zero all strips
-       for (Surface::Strips::iterator it = surface().strips.begin(); it != surface().strips.end(); ++it)
-       {
+       for (Surface::Strips::iterator it = surface().strips.begin(); it != surface().strips.end(); ++it) {
                MackiePort & port = port_for_id ((*it)->index());
                port.write (builder.zero_strip (port, **it));
        }
@@ -323,11 +332,9 @@ MackieControlProtocol::zero_all()
        // turn off global buttons and leds
        // global buttons are only ever on mcu_port, so we don't have
        // to figure out which port.
-       for (Surface::Controls::iterator it = surface().controls.begin(); it != surface().controls.end(); ++it)
-       {
+       for (Surface::Controls::iterator it = surface().controls.begin(); it != surface().controls.end(); ++it) {
                Control & control = **it;
-               if (!control.group().is_strip() && control.accepts_feedback())
-               {
+               if (!control.group().is_strip() && control.accepts_feedback()) {
                        mcu_port().write (builder.zero_control (control));
                }
        }
@@ -339,100 +346,96 @@ MackieControlProtocol::zero_all()
 int 
 MackieControlProtocol::set_active (bool yn)
 {
-       if (yn != _active)
+       if (yn == _active) {
+               return 0;
+       }
+       
+       try
        {
-               try
-               {
-                       // the reason for the locking and unlocking is that
-                       // glibmm can't do a condition wait on a RecMutex
-                       if (yn)
+               // the reason for the locking and unlocking is that
+               // glibmm can't do a condition wait on a RecMutex
+               if (yn) {
+                       // TODO what happens if this fails half way?
+                       
+                       // create MackiePorts
                        {
-                               // TODO what happens if this fails half way?
-
-                               // create MackiePorts
-                               {
-                                       Glib::Mutex::Lock lock (update_mutex);
-                                       create_ports();
-                               }
-
-                               // now initialise MackiePorts - ie exchange sysex messages
-                               for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-                                       (*it)->open();
-                               }
-
-                               // wait until all ports are active
-                               // TODO a more sophisticated approach would
-                               // allow things to start up with only an MCU, even if
-                               // extenders were specified but not responding.
-                               for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
-                                       (*it)->wait_for_init();
-                               }
-
-                               // create surface object. This depends on the ports being
-                               // correctly initialised
-                               initialize_surface();
-                               connect_session_signals();
-
-                               // yeehah!
-                               _active = true;
-
-                               // send current control positions to surface
-                               // must come after _active = true otherwise it won't run
-                               update_surface();
-                       } else {
-                               close();
-                               _active = false;
+                               Glib::Mutex::Lock lock (update_mutex);
+                               create_ports();
                        }
-               }
-
-               catch (exception & e) {
-                       DEBUG_TRACE (DEBUG::MackieControl, string_compose ("set_active to false because exception caught: %1\n", e.what()));
+                       
+                       // now initialise MackiePorts - ie exchange sysex messages
+                       for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
+                               (*it)->open();
+                       }
+                       
+                       // wait until all ports are active
+                       // TODO a more sophisticated approach would
+                       // allow things to start up with only an MCU, even if
+                       // extenders were specified but not responding.
+                       for (MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it) {
+                               (*it)->wait_for_init();
+                       }
+                       
+                       // create surface object. This depends on the ports being
+                       // correctly initialised
+                       initialize_surface();
+                       connect_session_signals();
+                       
+                       // yeehah!
+                       _active = true;
+                       
+                       // send current control positions to surface
+                       // must come after _active = true otherwise it won't run
+                       update_surface();
+               } else {
+                       close();
                        _active = false;
-                       throw;
                }
        }
+       
+       catch (exception & e) {
+               DEBUG_TRACE (DEBUG::MackieControl, string_compose ("set_active to false because exception caught: %1\n", e.what()));
+               _active = false;
+               throw;
+       }
 
        return 0;
 }
 
 bool 
-MackieControlProtocol::handle_strip_button (Control & control, ButtonState bs, boost::shared_ptr<Route> route)
+MackieControlProtocol::handle_strip_button (SurfacePort & port, Control & control, ButtonState bs, boost::shared_ptr<Route> route)
 {
        bool state = false;
 
-       if (bs == press)
-       {
-               if (control.name() == "recenable")
-               {
+       if (bs == press) {
+               if (control.name() == "recenable") {
                        state = !route->record_enabled();
                        route->set_record_enabled (state, this);
-               }
-               else if (control.name() == "mute")
-               {
+               } else if (control.name() == "mute") {
                        state = !route->muted();
                        route->set_mute (state, this);
-               }
-               else if (control.name() == "solo")
-               {
+               } else if (control.name() == "solo") {
                        state = !route->soloed();
                        route->set_solo (state, this);
-               }
-               else if (control.name() == "select")
-               {
+               } else if (control.name() == "select") {
                        // TODO make the track selected. Whatever that means.
                        //state = default_button_press (dynamic_cast<Button&> (control));
-               }
-               else if (control.name() == "vselect")
-               {
+               } else if (control.name() == "vselect") {
                        // TODO could be used to select different things to apply the pot to?
                        //state = default_button_press (dynamic_cast<Button&> (control));
                }
        }
 
-       if (control.name() == "fader_touch")
-       {
+       if (control.name() == "fader_touch") {
                state = bs == press;
-               control.strip().gain().in_use (state);
+               control.strip().gain().set_in_use (state);
+
+               if (ARDOUR::Config->get_mackie_emulation() == "bcf" && state) {
+                       /* BCF faders don't support touch, so add a timeout to reset
+                          their `in_use' state.
+                       */
+                       port.add_in_use_timeout (control.strip().gain(), &control.strip().fader_touch());
+               }
        }
 
        return state;
@@ -441,22 +444,15 @@ MackieControlProtocol::handle_strip_button (Control & control, ButtonState bs, b
 void 
 MackieControlProtocol::update_led (Mackie::Button & button, Mackie::LedState ls)
 {
-       if (ls != none)
-       {
+       if (ls != none) {
                SurfacePort * port = 0;
-               if (button.group().is_strip())
-               {
-                       if (button.group().is_master())
-                       {
+               if (button.group().is_strip()) {
+                       if (button.group().is_master()) {
                                port = &mcu_port();
-                       }
-                       else
-                       {
+                       } else {
                                port = &port_for_id (dynamic_cast<const Strip&> (button.group()).index());
                        }
-               }
-               else
-               {
+               } else {
                        port = &mcu_port();
                }
                port->write (builder.build_led (button, ls));
@@ -466,8 +462,7 @@ MackieControlProtocol::update_led (Mackie::Button & button, Mackie::LedState ls)
 void 
 MackieControlProtocol::update_timecode_beats_led()
 {
-       switch (_timecode_type)
-       {
+       switch (_timecode_type) {
                case ARDOUR::AnyTime::BBT:
                        update_global_led ("beats", on);
                        update_global_led ("timecode", off);
@@ -486,13 +481,10 @@ MackieControlProtocol::update_timecode_beats_led()
 void 
 MackieControlProtocol::update_global_button (const string & name, LedState ls)
 {
-       if (surface().controls_by_name.find (name) != surface().controls_by_name.end())
-       {
+       if (surface().controls_by_name.find (name) != surface().controls_by_name.end()) {
                Button * button = dynamic_cast<Button*> (surface().controls_by_name[name]);
                mcu_port().write (builder.build_led (button->led(), ls));
-       }
-       else
-       {
+       } else {
                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Button %1 not found\n", name));
        }
 }
@@ -500,13 +492,10 @@ MackieControlProtocol::update_global_button (const string & name, LedState ls)
 void 
 MackieControlProtocol::update_global_led (const string & name, LedState ls)
 {
-       if (surface().controls_by_name.find (name) != surface().controls_by_name.end())
-       {
+       if (surface().controls_by_name.find (name) != surface().controls_by_name.end()) {
                Led * led = dynamic_cast<Led*> (surface().controls_by_name[name]);
                mcu_port().write (builder.build_led (*led, ls));
-       }
-       else
-       {
+       } else {
                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Led %1 not found\n", name));
        }
 }
@@ -515,29 +504,31 @@ MackieControlProtocol::update_global_led (const string & name, LedState ls)
 void 
 MackieControlProtocol::update_surface()
 {
-       if (_active)
-       {
-               // do the initial bank switch to connect signals
-               // _current_initial_bank is initialised by set_state
-               switch_banks (_current_initial_bank);
-
-               // create a RouteSignal for the master route
-
- boost::shared_ptr<Route> mr = master_route ();
- if (mr) {
- master_route_signal = boost::shared_ptr<RouteSignal> (new RouteSignal (mr, *this, master_strip(), mcu_port()));
- // update strip from route
- master_route_signal->notify_all();
- }
-
-               // sometimes the jog wheel is a pot
-               surface().blank_jog_ring (mcu_port(), builder);
+       if (!_active) {
+               return;
+       }
 
-               // update global buttons and displays
-               notify_record_state_changed();
-               notify_transport_state_changed();
-               update_timecode_beats_led();
+       // do the initial bank switch to connect signals
+       // _current_initial_bank is initialised by set_state
+       switch_banks (_current_initial_bank);
+       
+       /* Create a RouteSignal for the master route, if we don't already have one */
+       if (!master_route_signal) {
+               boost::shared_ptr<Route> mr = master_route ();
+               if (mr) {
+                       master_route_signal = boost::shared_ptr<RouteSignal> (new RouteSignal (mr, *this, master_strip(), mcu_port()));
+                       // update strip from route
+                       master_route_signal->notify_all();
+               }
        }
+       
+       // sometimes the jog wheel is a pot
+       surface().blank_jog_ring (mcu_port(), builder);
+       
+       // update global buttons and displays
+       notify_record_state_changed();
+       notify_transport_state_changed();
+       update_timecode_beats_led();
 }
 
 void 
@@ -600,7 +591,7 @@ MackieControlProtocol::create_ports()
                new MIDI::Port (string_compose (_("%1 out"), default_port_name), MIDI::Port::IsOutput, session->engine().jack())
                );
 
-       // open main port               
+       /* Create main port */
 
        if (!midi_input_port->ok() || !midi_output_port->ok()) {
                ostringstream os;
@@ -611,10 +602,9 @@ MackieControlProtocol::create_ports()
 
        add_port (*midi_input_port, *midi_output_port, 0);
 
-       // open extender ports. Up to 9. Should be enough.
-       // could also use mm->get_midi_ports()
+       /* Create extender ports */
 
-       for (int index = 1; index <= 9; ++index) {
+       for (uint32_t index = 1; index <= Config->get_mackie_extenders(); ++index) {
                MIDI::Port * midi_input_port = mm->add_port (
                        new MIDI::Port (string_compose (_("mcu_xt_%1 in"), index), MIDI::Port::IsInput, session->engine().jack())
                        );
@@ -652,16 +642,11 @@ MackieControlProtocol::initialize_surface()
 
        // TODO same as code in mackie_port.cc
        string emulation = ARDOUR::Config->get_mackie_emulation();
-       if (emulation == "bcf")
-       {
+       if (emulation == "bcf") {
                _surface = new BcfSurface (strips);
-       }
-       else if (emulation == "mcu")
-       {
+       } else if (emulation == "mcu") {
                _surface = new MackieSurface (strips);
-       }
-       else
-       {
+       } else {
                ostringstream os;
                os << "no Surface class found for emulation: " << emulation;
                throw MackieControlException (os.str());
@@ -736,7 +721,7 @@ MackieControlProtocol::get_state()
 
        // add name of protocol
        XMLNode* node = new XMLNode (X_("Protocol"));
-       node->add_property (X_("name"), _name);
+       node->add_property (X_("name"), ARDOUR::ControlProtocol::_name);
 
        // add current bank
        ostringstream os;
@@ -800,7 +785,12 @@ MackieControlProtocol::handle_control_event (SurfacePort & port, Control & contr
                        // at which point the fader should just reset itself
                        if (route != 0)
                        {
-                               route->gain_control()->set_value (state.pos);
+                               route->gain_control()->set_value (slider_position_to_gain (state.pos));
+
+                               if (ARDOUR::Config->get_mackie_emulation() == "bcf") {
+                                       /* reset the timeout while we're still moving the fader */
+                                       port.add_in_use_timeout (control, control.in_use_touch_control);
+                               }
 
                                // must echo bytes back to slider now, because
                                // the notifier only works if the fader is not being
@@ -813,7 +803,7 @@ MackieControlProtocol::handle_control_event (SurfacePort & port, Control & contr
                        if (control.group().is_strip()) {
                                // strips
                                if (route != 0) {
-                                       handle_strip_button (control, state.button_state, route);
+                                       handle_strip_button (port, control, state.button_state, route);
                                } else {
                                        // no route so always switch the light off
                                        // because no signals will be emitted by a non-route
@@ -822,7 +812,7 @@ MackieControlProtocol::handle_control_event (SurfacePort & port, Control & contr
                        } else if (control.group().is_master()) {
                                // master fader touch
                                if (route != 0) {
-                                       handle_strip_button (control, state.button_state, route);
+                                       handle_strip_button (port, control, state.button_state, route);
                                }
                        } else {
                                // handle all non-strip buttons
@@ -845,21 +835,16 @@ MackieControlProtocol::handle_control_event (SurfacePort & port, Control & contr
                                                p = max (0.0, p);
                                                panner->set_position (p);
                                        }
-                               }
-                               else
-                               {
+                               } else {
                                        // it's a pot for an umnapped route, so turn all the lights off
                                        port.write (builder.build_led_ring (dynamic_cast<Pot &> (control), off));
                                }
                        }
                        else
                        {
-                               if (control.is_jog())
-                               {
+                               if (control.is_jog()) {
                                        _jog_wheel.jog_event (port, control, state);
-                               }
-                               else
-                               {
+                               } else {
                                        cout << "external controller" << state.ticks * state.sign << endl;
                                }
                        }
@@ -880,13 +865,11 @@ MackieControlProtocol::handle_control_event (SurfacePort & port, Control & contr
 void 
 MackieControlProtocol::notify_solo_changed (RouteSignal * route_signal)
 {
-       try
-       {
+       try {
                Button & button = route_signal->strip().solo();
                route_signal->port().write (builder.build_led (button, route_signal->route()->soloed()));
        }
-       catch (exception & e)
-       {
+       catch (exception & e) {
                cout << e.what() << endl;
        }
 }
@@ -894,13 +877,11 @@ MackieControlProtocol::notify_solo_changed (RouteSignal * route_signal)
 void 
 MackieControlProtocol::notify_mute_changed (RouteSignal * route_signal)
 {
-       try
-       {
+       try {
                Button & button = route_signal->strip().mute();
                route_signal->port().write (builder.build_led (button, route_signal->route()->muted()));
        }
-       catch (exception & e)
-       {
+       catch (exception & e) {
                cout << e.what() << endl;
        }
 }
@@ -908,26 +889,22 @@ MackieControlProtocol::notify_mute_changed (RouteSignal * route_signal)
 void 
 MackieControlProtocol::notify_record_enable_changed (RouteSignal * route_signal)
 {
-       try
-       {
+       try {
                Button & button = route_signal->strip().recenable();
                route_signal->port().write (builder.build_led (button, route_signal->route()->record_enabled()));
        }
-       catch (exception & e)
-       {
+       catch (exception & e) {
                cout << e.what() << endl;
        }
 }
 
 void MackieControlProtocol::notify_active_changed (RouteSignal *)
 {
-       try
-       {
+       try {
                DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::notify_active_changed\n");
                refresh_current_bank();
        }
-       catch (exception & e)
-       {
+       catch (exception & e) {
                cout << e.what() << endl;
        }
 }
@@ -935,22 +912,18 @@ void MackieControlProtocol::notify_active_changed (RouteSignal *)
 void 
 MackieControlProtocol::notify_gain_changed (RouteSignal * route_signal, bool force_update)
 {
-       try
-       {
+       try {
                Fader & fader = route_signal->strip().gain();
-               if (!fader.in_use())
-               {
-                       float gain_value = route_signal->route()->gain_control()->get_value();
+               if (!fader.in_use()) {
+                       float gain_value = gain_to_slider_position (route_signal->route()->gain_control()->get_value());
                        // check that something has actually changed
-                       if (force_update || gain_value != route_signal->last_gain_written())
-                       {
+                       if (force_update || gain_value != route_signal->last_gain_written()) {
                                route_signal->port().write (builder.build_fader (fader, gain_value));
                                route_signal->last_gain_written (gain_value);
                        }
                }
        }
-       catch (exception & e)
-       {
+       catch (exception & e) {
                cout << e.what() << endl;
        }
 }
@@ -962,22 +935,17 @@ MackieControlProtocol::notify_property_changed (const PropertyChange& what_chang
                return;
        }
 
-       try
-       {
+       try {
                Strip & strip = route_signal->strip();
                
                /* XXX: not sure about this check to only display stuff for strips of index < 8 */
-               if (!strip.is_master() && strip.index() < 8)
-               {
+               if (!strip.is_master() && strip.index() < 8) {
                        string line1;
                        string fullname = route_signal->route()->name();
 
-                       if (fullname.length() <= 6)
-                       {
+                       if (fullname.length() <= 6) {
                                line1 = fullname;
-                       }
-                       else
-                       {
+                       } else {
                                line1 = PBD::short_version (fullname, 6);
                        }
 
@@ -986,8 +954,7 @@ MackieControlProtocol::notify_property_changed (const PropertyChange& what_chang
                        port.write (builder.strip_display_blank (port, strip, 1));
                }
        }
-       catch (exception & e)
-       {
+       catch (exception & e) {
                cout << e.what() << endl;
        }
 }
@@ -995,8 +962,7 @@ MackieControlProtocol::notify_property_changed (const PropertyChange& what_chang
 void 
 MackieControlProtocol::notify_panner_changed (RouteSignal * route_signal, bool force_update)
 {
-       try
-       {
+       try {
                Pot & pot = route_signal->strip().vpot();
                boost::shared_ptr<Panner> panner = route_signal->route()->panner();
                if (panner) {
@@ -1012,14 +978,11 @@ MackieControlProtocol::notify_panner_changed (RouteSignal * route_signal, bool f
                                route_signal->port().write (bytes);
                                route_signal->last_pan_written (bytes);
                        }
-               }
-               else
-               {
+               } else {
                        route_signal->port().write (builder.zero_control (pot));
                }
        }
-       catch (exception & e)
-       {
+       catch (exception & e) {
                cout << e.what() << endl;
        }
 }
@@ -1030,15 +993,13 @@ MackieControlProtocol::update_automation (RouteSignal & rs)
 {
        ARDOUR::AutoState gain_state = rs.route()->gain_control()->automation_state();
 
-       if (gain_state == Touch || gain_state == Play)
-       {
+       if (gain_state == Touch || gain_state == Play) {
                notify_gain_changed (&rs, false);
        }
 
        if (rs.route()->panner()) {
                ARDOUR::AutoState panner_state = rs.route()->panner()->automation_state();
-               if (panner_state == Touch || panner_state == Play)
-               {
+               if (panner_state == Touch || panner_state == Play) {
                        notify_panner_changed (&rs, false);
                }
        }
@@ -1060,13 +1021,12 @@ MackieControlProtocol::format_bbt_timecode (framepos_t now_frame)
        // figure out subdivisions per beat
        const Meter & meter = session->tempo_map().meter_at (now_frame);
        int subdiv = 2;
-       if (meter.note_divisor() == 8 && (meter.beats_per_bar() == 12.0 || meter.beats_per_bar() == 9.0 || meter.beats_per_bar() == 6.0))
-       {
+       if (meter.note_divisor() == 8 && (meter.divisions_per_bar() == 12.0 || meter.divisions_per_bar() == 9.0 || meter.divisions_per_bar() == 6.0)) {
                subdiv = 3;
        }
 
-       uint32_t subdivisions = bbt_time.ticks / uint32_t (Timecode::BBT_Time::ticks_per_beat / subdiv);
-       uint32_t ticks = bbt_time.ticks % uint32_t (Timecode::BBT_Time::ticks_per_beat / subdiv);
+       uint32_t subdivisions = bbt_time.ticks / uint32_t (Timecode::BBT_Time::ticks_per_bar_division / subdiv);
+       uint32_t ticks = bbt_time.ticks % uint32_t (Timecode::BBT_Time::ticks_per_bar_division / subdiv);
 
        os << setw(2) << setfill('0') << subdivisions + 1;
        os << setw(3) << setfill('0') << ticks;
@@ -1095,14 +1055,12 @@ MackieControlProtocol::format_timecode_timecode (framepos_t now_frame)
 void 
 MackieControlProtocol::update_timecode_display()
 {
-       if (surface().has_timecode_display())
-       {
+       if (surface().has_timecode_display()) {
                // do assignment here so current_frame is fixed
                framepos_t current_frame = session->transport_frame();
                string timecode;
 
-               switch (_timecode_type)
-               {
+               switch (_timecode_type) {
                        case ARDOUR::AnyTime::BBT:
                                timecode = format_bbt_timecode (current_frame);
                                break;
@@ -1117,8 +1075,7 @@ MackieControlProtocol::update_timecode_display()
 
                // only write the timecode string to the MCU if it's changed
                // since last time. This is to reduce midi bandwidth used.
-               if (timecode != _timecode_last)
-               {
+               if (timecode != _timecode_last) {
                        surface().display_timecode (mcu_port(), builder, timecode, _timecode_last);
                        _timecode_last = timecode;
                }
@@ -1160,8 +1117,7 @@ MackieControlProtocol::frm_left_press (Button &)
        );
 
        // allow a quick double to go past a previous mark
-       if (session->transport_rolling() && elapsed < 500 && loc != 0)
-       {
+       if (session->transport_rolling() && elapsed < 500 && loc != 0) {
                Location * loc_two_back = session->locations()->first_location_before (loc->start());
                if (loc_two_back != 0)
                {
@@ -1170,8 +1126,7 @@ MackieControlProtocol::frm_left_press (Button &)
        }
 
        // move to the location, if it's valid
-       if (loc != 0)
-       {
+       if (loc != 0) {
                session->request_locate (loc->start(), session->transport_rolling());
        }
 
@@ -1188,10 +1143,12 @@ LedState
 MackieControlProtocol::frm_right_press (Button &)
 {
        // can use first_mark_before/after as well
-       Location * loc = session->locations()->first_location_after (
-               session->transport_frame()
-       );
-       if (loc != 0) session->request_locate (loc->start(), session->transport_rolling());
+       Location * loc = session->locations()->first_location_after (session->transport_frame());
+       
+       if (loc != 0) {
+               session->request_locate (loc->start(), session->transport_rolling());
+       }
+               
        return on;
 }
 
@@ -1266,10 +1223,11 @@ MackieControlProtocol::rewind_release (Button &)
 {
        _jog_wheel.pop();
        _jog_wheel.transport_direction (0);
-       if (_transport_previously_rolling)
+       if (_transport_previously_rolling) {
                session->request_transport_speed (1.0);
-       else
+       } else {
                session->request_stop();
+       }
        return off;
 }
 
@@ -1287,10 +1245,11 @@ MackieControlProtocol::ffwd_release (Button &)
 {
        _jog_wheel.pop();
        _jog_wheel.transport_direction (0);
-       if (_transport_previously_rolling)
+       if (_transport_previously_rolling) {
                session->request_transport_speed (1.0);
-       else
+       } else {
                session->request_stop();
+       }
        return off;
 }
 
@@ -1310,7 +1269,7 @@ MackieControlProtocol::loop_release (Button &)
 LedState 
 MackieControlProtocol::punch_in_press (Button &)
 {
-       bool state = !session->config.get_punch_in();
+       bool const state = !session->config.get_punch_in();
        session->config.set_punch_in (state);
        return state;
 }
@@ -1324,7 +1283,7 @@ MackieControlProtocol::punch_in_release (Button &)
 LedState 
 MackieControlProtocol::punch_out_press (Button &)
 {
-       bool state = !session->config.get_punch_out();
+       bool const state = !session->config.get_punch_out();
        session->config.set_punch_out (state);
        return state;
 }
@@ -1393,20 +1352,13 @@ LedState MackieControlProtocol::global_solo_release (Button &)
 
 void MackieControlProtocol::notify_parameter_changed (std::string const & p)
 {
-       if (p == "punch-in")
-       {
+       if (p == "punch-in") {
                update_global_button ("punch_in", session->config.get_punch_in());
-       }
-       else if (p == "punch-out")
-       {
+       } else if (p == "punch-out") {
                update_global_button ("punch_out", session->config.get_punch_out());
-       }
-       else if (p == "clicking")
-       {
+       } else if (p == "clicking") {
                update_global_button ("clicking", Config->get_clicking());
-       }
-       else
-       {
+       } else {
                DEBUG_TRACE (DEBUG::MackieControl, string_compose ("parameter changed: %1\n", p));
        }
 }
@@ -1417,8 +1369,7 @@ MackieControlProtocol::notify_route_added (ARDOUR::RouteList & rl)
 {
        // currently assigned banks are less than the full set of
        // strips, so activate the new strip now.
-       if (route_signals.size() < route_table.size())
-       {
+       if (route_signals.size() < route_table.size()) {
                refresh_current_bank();
        }
        // otherwise route added, but current bank needs no updating
@@ -1445,14 +1396,11 @@ MackieControlProtocol::notify_remote_id_changed()
 
        // if a remote id has been moved off the end, we need to shift
        // the current bank backwards.
-       if (sorted.size() - _current_initial_bank < route_signals.size())
-       {
+       if (sorted.size() - _current_initial_bank < route_signals.size()) {
                // but don't shift backwards past the zeroth channel
                switch_banks (max((Sorted::size_type) 0, sorted.size() - route_signals.size()));
-       }
-       // Otherwise just refresh the current bank
-       else
-       {
+       } else {
+               // Otherwise just refresh the current bank
                refresh_current_bank();
        }
 }
@@ -1491,20 +1439,19 @@ LedState
 MackieControlProtocol::left_press (Button &)
 {
        Sorted sorted = get_sorted_routes();
-       if (sorted.size() > route_table.size())
-       {
+       if (sorted.size() > route_table.size()) {
                int new_initial = _current_initial_bank - route_table.size();
-               if (new_initial < 0) new_initial = 0;
-               if (new_initial != int (_current_initial_bank))
-               {
+               if (new_initial < 0) {
+                       new_initial = 0;
+               }
+               
+               if (new_initial != int (_current_initial_bank)) {
                        session->set_dirty();
                        switch_banks (new_initial);
                }
 
                return on;
-       }
-       else
-       {
+       } else {
                return flashing;
        }
 }
@@ -1521,7 +1468,11 @@ MackieControlProtocol::right_press (Button &)
        Sorted sorted = get_sorted_routes();
        if (sorted.size() > route_table.size()) {
                uint32_t delta = sorted.size() - (route_table.size() + _current_initial_bank);
-               if (delta > route_table.size()) delta = route_table.size();
+
+               if (delta > route_table.size()) {
+                       delta = route_table.size();
+               }
+               
                if (delta > 0) {
                        session->set_dirty();
                        switch_banks (_current_initial_bank + delta);
@@ -1543,13 +1494,10 @@ LedState
 MackieControlProtocol::channel_left_press (Button &)
 {
        Sorted sorted = get_sorted_routes();
-       if (sorted.size() > route_table.size())
-       {
+       if (sorted.size() > route_table.size()) {
                prev_track();
                return on;
-       }
-       else
-       {
+       } else {
                return flashing;
        }
 }
@@ -1564,13 +1512,10 @@ LedState
 MackieControlProtocol::channel_right_press (Button &)
 {
        Sorted sorted = get_sorted_routes();
-       if (sorted.size() > route_table.size())
-       {
+       if (sorted.size() > route_table.size()) {
                next_track();
                return on;
-       }
-       else
-       {
+       } else {
                return flashing;
        }
 }
@@ -1610,14 +1555,25 @@ MackieControlProtocol::marker_release (Button &)
 void 
 jog_wheel_state_display (JogWheel::State state, SurfacePort & port)
 {
-       switch (state)
-       {
-               case JogWheel::zoom: port.write (builder.two_char_display ("Zm")); break;
-               case JogWheel::scroll: port.write (builder.two_char_display ("Sc")); break;
-               case JogWheel::scrub: port.write (builder.two_char_display ("Sb")); break;
-               case JogWheel::shuttle: port.write (builder.two_char_display ("Sh")); break;
-               case JogWheel::speed: port.write (builder.two_char_display ("Sp")); break;
-               case JogWheel::select: port.write (builder.two_char_display ("Se")); break;
+       switch (state) {
+               case JogWheel::zoom:
+                       port.write (builder.two_char_display ("Zm"));
+                       break;
+               case JogWheel::scroll:
+                       port.write (builder.two_char_display ("Sc"));
+                       break;
+               case JogWheel::scrub:
+                       port.write (builder.two_char_display ("Sb"));
+                       break;
+               case JogWheel::shuttle:
+                       port.write (builder.two_char_display ("Sh"));
+                       break;
+               case JogWheel::speed:
+                       port.write (builder.two_char_display ("Sp"));
+                       break;
+               case JogWheel::select:
+                       port.write (builder.two_char_display ("Se"));
+                       break;
        }
 }
 
@@ -1642,21 +1598,21 @@ MackieControlProtocol::scrub_press (Mackie::Button &)
        _jog_wheel.scrub_state_cycle();
        update_global_button ("zoom", _jog_wheel.jog_wheel_state() == JogWheel::zoom);
        jog_wheel_state_display (_jog_wheel.jog_wheel_state(), mcu_port());
-       return
+       return (
                _jog_wheel.jog_wheel_state() == JogWheel::scrub
                ||
                _jog_wheel.jog_wheel_state() == JogWheel::shuttle
-       ;
+               );
 }
 
 Mackie::LedState 
 MackieControlProtocol::scrub_release (Mackie::Button &)
 {
-       return
+       return (
                _jog_wheel.jog_wheel_state() == JogWheel::scrub
                ||
                _jog_wheel.jog_wheel_state() == JogWheel::shuttle
-       ;
+               );
 }
 
 LedState 
@@ -1688,18 +1644,17 @@ MackieControlProtocol::save_release (Button &)
 LedState 
 MackieControlProtocol::timecode_beats_press (Button &)
 {
-       switch (_timecode_type)
-       {
-               case ARDOUR::AnyTime::BBT:
-                       _timecode_type = ARDOUR::AnyTime::Timecode;
-                       break;
-               case ARDOUR::AnyTime::Timecode:
-                       _timecode_type = ARDOUR::AnyTime::BBT;
-                       break;
-               default:
-                       ostringstream os;
-                       os << "Unknown Anytime::Type " << _timecode_type;
-                       throw runtime_error (os.str());
+       switch (_timecode_type) {
+       case ARDOUR::AnyTime::BBT:
+               _timecode_type = ARDOUR::AnyTime::Timecode;
+               break;
+       case ARDOUR::AnyTime::Timecode:
+               _timecode_type = ARDOUR::AnyTime::BBT;
+               break;
+       default:
+               ostringstream os;
+               os << "Unknown Anytime::Type " << _timecode_type;
+               throw runtime_error (os.str());
        }
        update_timecode_beats_led();
        return on;
@@ -1719,3 +1674,52 @@ MackieControlProtocol::bundles ()
        b.push_back (_output_bundle);
        return b;
 }
+
+void
+MackieControlProtocol::port_connected_or_disconnected (string a, string b, bool connected)
+{
+       /* If something is connected to one of our output ports, send MIDI to update the surface
+          to whatever state it should have.
+       */
+
+       if (!connected) {
+               return;
+       }
+
+       MackiePorts::const_iterator i = _ports.begin();
+       while (i != _ports.end()) {
+
+               string const n = AudioEngine::instance()->make_port_name_non_relative ((*i)->output_port().name ());
+
+               if (a == n || b == n) {
+                       break;
+               }
+
+               ++i;
+       }
+
+       if (i != _ports.end ()) {
+               update_surface ();
+       }
+}
+
+void
+MackieControlProtocol::do_request (MackieControlUIRequest* req)
+{
+       if (req->type == CallSlot) {
+
+               call_slot (MISSING_INVALIDATOR, req->the_slot);
+
+       } else if (req->type == Quit) {
+
+               stop ();
+       }
+}
+
+int
+MackieControlProtocol::stop ()
+{
+       BaseUI::quit ();
+
+       return 0;
+}