fix crash when copy'ing latent plugins
[ardour.git] / libs / ardour / session_transport.cc
index 037ca83484d7d2eac3dae266096f9ff995e1910a..8771af46aa7138df63c17c386571d89a52cb982e 100644 (file)
 #include "pbd/enumwriter.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
 
 #include "midi++/mmc.h"
 #include "midi++/port.h"
-#include "midi++/manager.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/auditioner.h"
 #include "ardour/click.h"
 #include "ardour/debug.h"
 #include "ardour/location.h"
+#include "ardour/profile.h"
+#include "ardour/scene_changer.h"
 #include "ardour/session.h"
 #include "ardour/slave.h"
 #include "ardour/operations.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -87,7 +89,7 @@ Session::request_sync_source (Slave* new_slave)
 
        seamless = Config->get_seamless_loop ();
 
-       if (dynamic_cast<JACK_Slave*>(new_slave)) {
+       if (dynamic_cast<Engine_Slave*>(new_slave)) {
                /* JACK cannot support seamless looping at present */
                Config->set_seamless_loop (false);
        } else {
@@ -107,7 +109,7 @@ void
 Session::request_transport_speed (double speed, bool as_default)
 {
        SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, 0, speed);
-       ev->third_yes_or_no = true;
+       ev->third_yes_or_no = as_default; // as_default
        DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport speed = %1 as default = %2\n", speed, as_default));
        queue_event (ev);
 }
@@ -137,8 +139,8 @@ Session::request_track_speed (Track* tr, double speed)
 void
 Session::request_stop (bool abort, bool clear_state)
 {
-       SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0, abort, clear_state);
-       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, abort = %1, clear state = %2\n", abort, clear_state));
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, audible_frame(), 0.0, abort, clear_state);
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, audible %3 transport %4 abort = %1, clear state = %2\n", abort, clear_state, audible_frame(), _transport_frame));
        queue_event (ev);
 }
 
@@ -159,10 +161,17 @@ Session::force_locate (framepos_t target_frame, bool with_roll)
 }
 
 void
-Session::request_play_loop (bool yn, bool leave_rolling)
+Session::request_play_loop (bool yn, bool change_transport_roll)
 {
+       if (_slave && yn) {
+               // don't attempt to loop when not using Internal Transport
+               // see also gtk2_ardour/ardour_ui_options.cc parameter_changed()
+               return;
+       }
+
        SessionEvent* ev;
        Location *location = _locations->auto_loop_location();
+       double target_speed;
 
        if (location == 0 && yn) {
                error << _("Cannot loop - no loop range defined")
@@ -170,14 +179,44 @@ Session::request_play_loop (bool yn, bool leave_rolling)
                return;
        }
 
-       ev = new SessionEvent (SessionEvent::SetLoop, SessionEvent::Add, SessionEvent::Immediate, 0, (leave_rolling ? 1.0 : 0.0), yn);
-       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request set loop = %1, leave rolling ? %2\n", yn, leave_rolling));
+       if (change_transport_roll) {
+               if (transport_rolling()) {
+                       /* start looping at current speed */
+                       target_speed = transport_speed ();
+               } else {
+                       /* currently stopped */
+                       if (yn) {
+                               /* start looping at normal speed */
+                               target_speed = 1.0;
+                       } else {
+                               target_speed = 0.0;
+                       }
+               }
+       } else {
+               /* leave the speed alone */
+               target_speed = transport_speed ();
+       }
+
+       ev = new SessionEvent (SessionEvent::SetLoop, SessionEvent::Add, SessionEvent::Immediate, 0, target_speed, yn);
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request set loop = %1, change roll state ? %2\n", yn, change_transport_roll));
        queue_event (ev);
 
-       if (!leave_rolling && !yn && Config->get_seamless_loop() && transport_rolling()) {
-               // request an immediate locate to refresh the tracks
-               // after disabling looping
-               request_locate (_transport_frame-1, false);
+       if (yn) {
+               if (!change_transport_roll) {
+                       if (!transport_rolling()) {
+                               /* we're not changing transport state, but we do want
+                                  to set up position for the new loop. Don't
+                                  do this if we're rolling already.
+                               */
+                               request_locate (location->start(), false);
+                       }
+               }
+       } else {
+               if (!change_transport_roll && Config->get_seamless_loop() && transport_rolling()) {
+                       // request an immediate locate to refresh the tracks
+                       // after disabling looping
+                       request_locate (_transport_frame-1, false);
+               }
        }
 }
 
@@ -194,6 +233,14 @@ Session::request_play_range (list<AudioRange>* range, bool leave_rolling)
        queue_event (ev);
 }
 
+void
+Session::request_cancel_play_range ()
+{
+       SessionEvent* ev = new SessionEvent (SessionEvent::CancelPlayAudioRange, SessionEvent::Add, SessionEvent::Immediate, 0, 0);
+       queue_event (ev);
+}
+
+
 void
 Session::realtime_stop (bool abort, bool clear_state)
 {
@@ -204,6 +251,7 @@ Session::realtime_stop (bool abort, bool clear_state)
 
        if (_transport_speed < 0.0f) {
                todo = (PostTransportWork (todo | PostTransportStop | PostTransportReverse));
+               _default_transport_speed = 1.0;
        } else {
                todo = PostTransportWork (todo | PostTransportStop);
        }
@@ -216,26 +264,11 @@ Session::realtime_stop (bool abort, bool clear_state)
                (*i)->realtime_handle_transport_stopped ();
        }
 
-       if (actively_recording()) {
-
-               /* move the transport position back to where the
-                  request for a stop was noticed. we rolled
-                  past that point to pick up delayed input (and/or to delick)
-               */
-
-               if (worst_playback_latency() > current_block_size) {
-                       /* we rolled past the stop point to pick up data that had
-                          not yet arrived. move back to where the stop occured.
-                       */
-                       decrement_transport_position (current_block_size + (worst_input_latency() - current_block_size));
-               } else {
-                       decrement_transport_position (current_block_size);
-               }
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("stop complete, auto-return scheduled for return to %1\n", _requested_return_frame));
 
-               /* the duration change is not guaranteed to have happened, but is likely */
+       /* the duration change is not guaranteed to have happened, but is likely */
 
-               todo = PostTransportWork (todo | PostTransportDuration);
-       }
+       todo = PostTransportWork (todo | PostTransportDuration);
 
        if (abort) {
                todo = PostTransportWork (todo | PostTransportAbort);
@@ -256,6 +289,10 @@ Session::realtime_stop (bool abort, bool clear_state)
        /* if we're going to clear loop state, then force disabling record BUT only if we're not doing latched rec-enable */
        disable_record (true, (!Config->get_latched_record_enable() && clear_state));
 
+       if (clear_state && !Config->get_loop_is_mode()) {
+               unset_play_loop ();
+       }
+
        reset_slave_state ();
 
        _transport_speed = 0;
@@ -283,18 +320,65 @@ Session::realtime_locate ()
 void
 Session::butler_transport_work ()
 {
+       /* Note: this function executes in the butler thread context */
+
   restart:
        bool finished;
        PostTransportWork ptw;
        boost::shared_ptr<RouteList> r = routes.reader ();
+       uint64_t before;
 
        int on_entry = g_atomic_int_get (&_butler->should_do_transport_work);
        finished = true;
        ptw = post_transport_work();
 
-       DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler transport work, todo = %1\n", enum_2_string (ptw)));
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler transport work, todo = %1 at %2\n", enum_2_string (ptw), (before = g_get_monotonic_time())));
+
+
+       if (ptw & PostTransportLocate) {
+
+               if (get_play_loop() && !Config->get_seamless_loop()) {
+
+                       DEBUG_TRACE (DEBUG::Butler, "flush loop recording fragment to disk\n");
+
+                       /* this locate might be happening while we are
+                        * loop recording.
+                        *
+                        * Non-seamless looping will require a locate (below) that
+                        * will reset capture buffers and throw away data.
+                        *
+                        * Rather than first find all tracks and see if they
+                        * have outstanding data, just do a flush anyway. It
+                        * may be cheaper this way anyway, and is certainly
+                        * more accurate.
+                        */
+
+                       bool more_disk_io_to_do = false;
+                       uint32_t errors = 0;
+
+                       do {
+                               more_disk_io_to_do = _butler->flush_tracks_to_disk_after_locate (r, errors);
+
+                               if (errors) {
+                                       break;
+                               }
+
+                               if (more_disk_io_to_do) {
+                                       continue;
+                               }
+
+                       } while (false);
+
+               }
+       }
 
        if (ptw & PostTransportAdjustPlaybackBuffering) {
+               /* non_realtime_locate() calls Automatable::transport_located()
+                * for every route. This eventually calls
+                * ARDOUR::AutomationList::state () which has a LocaleGuard,
+                * and would switch locales forth/back every time.
+                */
+               LocaleGuard lg;
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                        boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                        if (tr) {
@@ -343,7 +427,7 @@ Session::butler_transport_work ()
                /* don't seek if locate will take care of that in non_realtime_stop() */
 
                if (!(ptw & PostTransportLocate)) {
-
+                       LocaleGuard lg; // see note for non_realtime_locate() above
                        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                                (*i)->non_realtime_locate (_transport_frame);
 
@@ -357,6 +441,7 @@ Session::butler_transport_work ()
        }
 
        if (ptw & PostTransportLocate) {
+               DEBUG_TRACE (DEBUG::Transport, "nonrealtime locate invoked from BTW\n");
                non_realtime_locate ();
        }
 
@@ -382,7 +467,8 @@ Session::butler_transport_work ()
 
        g_atomic_int_dec_and_test (&_butler->should_do_transport_work);
 
-       DEBUG_TRACE (DEBUG::Transport, X_("Butler transport work all done\n"));
+       DEBUG_TRACE (DEBUG::Transport, string_compose (X_("Butler transport work all done after %1 usecs\n"), g_get_monotonic_time() - before));
+       DEBUG_TRACE (DEBUG::Transport, X_(string_compose ("Frame %1\n", _transport_frame)));
 }
 
 void
@@ -417,11 +503,49 @@ Session::non_realtime_overwrite (int on_entry, bool& finished)
 void
 Session::non_realtime_locate ()
 {
-       boost::shared_ptr<RouteList> rl = routes.reader();
-       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               (*i)->non_realtime_locate (_transport_frame);
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("locate tracks to %1\n", _transport_frame));
+
+       if (Config->get_loop_is_mode() && get_play_loop()) {
+
+               Location *loc  = _locations->auto_loop_location();
+
+               if (!loc || (_transport_frame < loc->start() || _transport_frame >= loc->end())) {
+                       /* jumped out of loop range: stop tracks from looping,
+                          but leave loop (mode) enabled.
+                        */
+                       set_track_loop (false);
+
+               } else if (loc && Config->get_seamless_loop() &&
+                   ((loc->start() <= _transport_frame) ||
+                   (loc->end() > _transport_frame) ) ) {
+
+                       /* jumping to start of loop. This  might have been done before but it is
+                        * idempotent and cheap. Doing it here ensures that when we start playback
+                        * outside the loop we still flip tracks into the magic seamless mode
+                        * when needed.
+                        */
+                       set_track_loop (true);
+
+               } else if (loc) {
+                       set_track_loop (false);
+               }
+
+       } else {
+
+               /* no more looping .. should have been noticed elsewhere */
+       }
+
+
+       {
+               LocaleGuard lg; // see note for non_realtime_locate() above
+               boost::shared_ptr<RouteList> rl = routes.reader();
+               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+                       (*i)->non_realtime_locate (_transport_frame);
+               }
        }
 
+       _scene_changer->locate (_transport_frame);
+
        /* XXX: it would be nice to generate the new clicks here (in the non-RT thread)
           rather than clearing them so that the RT thread has to spend time constructing
           them (in Session::click).
@@ -429,6 +553,105 @@ Session::non_realtime_locate ()
        clear_clicks ();
 }
 
+#ifdef USE_TRACKS_CODE_FEATURES
+bool
+Session::select_playhead_priority_target (framepos_t& jump_to)
+{
+       jump_to = -1;
+
+       AutoReturnTarget autoreturn = Config->get_auto_return_target_list ();
+
+       if (!autoreturn) {
+               return false;
+       }
+
+       if (Profile->get_trx() && transport_rolling() ) {
+               // We're playing, so do nothing.
+               // Next stop will put us where we need to be.
+               return false;
+       }
+
+       /* Note that the order of checking each AutoReturnTarget flag defines
+          the priority each flag.
+
+          Ardour/Mixbus: Last Locate
+                         Range Selection
+                         Loop Range
+                         Region Selection
+
+          Tracks:        Range Selection
+                          Loop Range
+                          Region Selection
+                          Last Locate
+       */
+
+       if (autoreturn & RangeSelectionStart) {
+               if (!_range_selection.empty()) {
+                       jump_to = _range_selection.from;
+               } else {
+                       if (transport_rolling ()) {
+                               /* Range selection no longer exists, but we're playing,
+                                  so do nothing. Next stop will put us where
+                                  we need to be.
+                               */
+                               return false;
+                       }
+               }
+       }
+
+       if (jump_to < 0 && (autoreturn & Loop) && get_play_loop()) {
+               /* don't try to handle loop play when synced to JACK */
+
+               if (!synced_to_engine()) {
+                       Location *location = _locations->auto_loop_location();
+
+                       if (location) {
+                               jump_to = location->start();
+
+                               if (Config->get_seamless_loop()) {
+                                       /* need to get track buffers reloaded */
+                                       set_track_loop (true);
+                               }
+                       }
+               }
+       }
+
+       if (jump_to < 0 && (autoreturn & RegionSelectionStart)) {
+               if (!_object_selection.empty()) {
+                       jump_to = _object_selection.from;
+               }
+       }
+
+       if (jump_to < 0 && (autoreturn & LastLocate)) {
+               jump_to = _last_roll_location;
+       }
+
+       return jump_to >= 0;
+}
+#else
+
+bool
+Session::select_playhead_priority_target (framepos_t& jump_to)
+{
+       if (config.get_external_sync() || !config.get_auto_return()) {
+               return false;
+       }
+
+       jump_to = _last_roll_location;
+       return jump_to >= 0;
+}
+
+#endif
+
+void
+Session::follow_playhead_priority ()
+{
+       framepos_t target;
+
+       if (select_playhead_priority_target (target)) {
+               request_locate (target);
+       }
+}
 
 void
 Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
@@ -490,13 +713,18 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->is_hidden()) {
+               if (!(*i)->is_auditioner()) {
                        (*i)->set_pending_declick (0);
                }
        }
 
        if (did_record) {
                commit_reversible_command ();
+               /* increase take name */
+               if (config.get_track_name_take () && !config.get_take_name ().empty()) {
+                       string newname = config.get_take_name();
+                       config.set_take_name(bump_name_number (newname));
+               }
        }
 
        if (_engine.running()) {
@@ -507,19 +735,18 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
                update_latency_compensation ();
        }
 
-       bool const auto_return_enabled =
-               (!config.get_external_sync() && config.get_auto_return());
+       bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort));
 
        if (auto_return_enabled ||
            (ptw & PostTransportLocate) ||
            (_requested_return_frame >= 0) ||
-           synced_to_jack()) {
+           synced_to_engine()) {
 
                if (pending_locate_flush) {
                        flush_all_inserts ();
                }
 
-               if ((auto_return_enabled || synced_to_jack() || _requested_return_frame >= 0) &&
+               if ((auto_return_enabled || synced_to_engine() || _requested_return_frame >= 0) &&
                    !(ptw & PostTransportLocate)) {
 
                        /* no explicit locate queued */
@@ -530,46 +757,21 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 
                                /* explicit return request pre-queued in event list. overrides everything else */
 
-                               cerr << "explicit auto-return to " << _requested_return_frame << endl;
-
                                _transport_frame = _requested_return_frame;
                                do_locate = true;
 
                        } else {
-                               if (config.get_auto_return()) {
-
-                                       if (play_loop) {
-
-                                               /* don't try to handle loop play when synced to JACK */
-
-                                               if (!synced_to_jack()) {
-
-                                                       Location *location = _locations->auto_loop_location();
+                               framepos_t jump_to;
 
-                                                       if (location != 0) {
-                                                               _transport_frame = location->start();
-                                                       } else {
-                                                               _transport_frame = _last_roll_location;
-                                                       }
-                                                       do_locate = true;
-                                               }
+                               if (select_playhead_priority_target (jump_to)) {
 
-                                       } else if (_play_range) {
+                                       _transport_frame = jump_to;
+                                       do_locate = true;
 
-                                               /* return to start of range */
+                               } else if (abort) {
 
-                                               if (!current_audio_range.empty()) {
-                                                       _transport_frame = current_audio_range.front().start;
-                                                       do_locate = true;
-                                               }
-
-                                       } else {
-
-                                               /* regular auto-return */
-
-                                               _transport_frame = _last_roll_location;
-                                               do_locate = true;
-                                       }
+                                       _transport_frame = _last_roll_location;
+                                       do_locate = true;
                                }
                        }
 
@@ -588,31 +790,48 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        */
 
        if (ptw & PostTransportClearSubstate) {
-               _play_range = false;
-               unset_play_loop ();
+               unset_play_range ();
+               if (!Config->get_loop_is_mode()) {
+                       unset_play_loop ();
+               }
        }
 
        /* this for() block can be put inside the previous if() and has the effect of ... ??? what */
 
-       DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: locate\n"));
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler PTW: locate on %1\n", (*i)->name()));
-               (*i)->non_realtime_locate (_transport_frame);
+       {
+               LocaleGuard lg; // see note for non_realtime_locate() above
+               DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: locate\n"));
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler PTW: locate on %1\n", (*i)->name()));
+                       (*i)->non_realtime_locate (_transport_frame);
 
-               if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) {
-                       finished = false;
-                       /* we will be back */
-                       return;
+                       if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) {
+                               finished = false;
+                               /* we will be back */
+                               return;
+                       }
                }
        }
 
        have_looped = false;
 
-       if (!_engine.freewheeling()) {
-               send_full_time_code (_transport_frame);
-               
+       /* don't bother with this stuff if we're disconnected from the engine,
+          because there will be no process callbacks to deliver stuff from
+       */
+
+       if (_engine.connected() && !_engine.freewheeling()) {
+               // need to queue this in the next RT cycle
+               _send_timecode_update = true;
+
                if (!dynamic_cast<MTC_Slave*>(_slave)) {
-                       MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
+                       send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
+
+                       /* This (::non_realtime_stop()) gets called by main
+                          process thread, which will lead to confusion
+                          when calling AsyncMIDIPort::write().
+
+                          Something must be done. XXX
+                       */
                        send_mmc_locate (_transport_frame);
                }
        }
@@ -626,9 +845,8 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
                 * save state only if there's no slave or if it's not yet locked.
                 */
                if (!_slave || !_slave->locked()) {
-                       DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: pending save\n"));
-                       /* capture start has been changed, so save pending state */
-                       save_state ("", true);
+                       DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: requests save\n"));
+                       SaveSessionRequested (_current_snapshot_name);
                        saved = true;
                }
        }
@@ -640,12 +858,14 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        /* save the current state of things if appropriate */
 
        if (did_record && !saved) {
-               save_state (_current_snapshot_name);
+               SaveSessionRequested (_current_snapshot_name);
        }
 
        if (ptw & PostTransportStop) {
-               _play_range = false;
-               play_loop = false;
+               unset_play_range ();
+               if (!Config->get_loop_is_mode()) {
+                       unset_play_loop ();
+               }
        }
 
        PositionChanged (_transport_frame); /* EMIT SIGNAL */
@@ -682,8 +902,10 @@ Session::check_declick_out ()
                        start_locate (pending_locate_frame, pending_locate_roll, pending_locate_flush);
                        transport_sub_state &= ~(PendingDeclickOut|PendingLocate);
                } else {
-                       stop_transport (pending_abort);
-                       transport_sub_state &= ~(PendingDeclickOut|PendingLocate);
+                       if (!(transport_sub_state & StopPendingCapture)) {
+                               stop_transport (pending_abort);
+                               transport_sub_state &= ~(PendingDeclickOut|PendingLocate);
+                       }
                }
 
        } else if (transport_sub_state & PendingLoopDeclickOut) {
@@ -695,22 +917,42 @@ Session::check_declick_out ()
 void
 Session::unset_play_loop ()
 {
-       play_loop = false;
-       clear_events (SessionEvent::AutoLoop);
-       clear_events (SessionEvent::AutoLoopDeclick);
+       if (play_loop) {
+               play_loop = false;
+               clear_events (SessionEvent::AutoLoop);
+               clear_events (SessionEvent::AutoLoopDeclick);
+               set_track_loop (false);
+
+
+               if (Config->get_seamless_loop()) {
+                       /* likely need to flush track buffers: this will locate us to wherever we are */
+                       add_post_transport_work (PostTransportLocate);
+                       _butler->schedule_transport_work ();
+               }
+       }
+}
+
+void
+Session::set_track_loop (bool yn)
+{
+       Location* loc = _locations->auto_loop_location ();
+
+       if (!loc) {
+               yn = false;
+       }
 
-       // set all tracks to NOT use internal looping
        boost::shared_ptr<RouteList> rl = routes.reader ();
+
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                if (tr && !tr->hidden()) {
-                       tr->set_loop (0);
+                       tr->set_loop (yn ? loc : 0);
                }
        }
 }
 
 void
-Session::set_play_loop (bool yn)
+Session::set_play_loop (bool yn, double speed)
 {
        /* Called from event-handling context */
 
@@ -721,7 +963,7 @@ Session::set_play_loop (bool yn)
                return;
        }
 
-       if (yn && Config->get_seamless_loop() && synced_to_jack()) {
+       if (yn && Config->get_seamless_loop() && synced_to_engine()) {
                warning << string_compose (
                        _("Seamless looping cannot be supported while %1 is using JACK transport.\n"
                          "Recommend changing the configured options"), PROGRAM_NAME)
@@ -732,30 +974,24 @@ Session::set_play_loop (bool yn)
        if (yn) {
 
                play_loop = true;
+               have_looped = false;
 
                if (loc) {
 
                        unset_play_range ();
 
                        if (Config->get_seamless_loop()) {
-                               // set all tracks to use internal looping
-                               boost::shared_ptr<RouteList> rl = routes.reader ();
-                               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                                       if (tr && !tr->hidden()) {
-                                               tr->set_loop (loc);
-                                       }
-                               }
-                       }
-                       else {
-                               // set all tracks to NOT use internal looping
-                               boost::shared_ptr<RouteList> rl = routes.reader ();
-                               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                                       if (tr && !tr->hidden()) {
-                                               tr->set_loop (0);
-                                       }
+                               if (!Config->get_loop_is_mode()) {
+                                       /* set all tracks to use internal looping */
+                                       set_track_loop (true);
+                               } else {
+                                       /* we will do this in the locate to the start OR when we hit the end
+                                        * of the loop for the first time
+                                        */
                                }
+                       } else {
+                               /* set all tracks to NOT use internal looping */
+                               set_track_loop (false);
                        }
 
                        /* Put the delick and loop events in into the event list.  The declick event will
@@ -769,12 +1005,24 @@ Session::set_play_loop (bool yn)
                        merge_event (new SessionEvent (SessionEvent::AutoLoopDeclick, SessionEvent::Replace, dcp, dcl, 0.0f));
                        merge_event (new SessionEvent (SessionEvent::AutoLoop, SessionEvent::Replace, loc->end(), loc->start(), 0.0f));
 
-                       /* locate to start of loop and roll. 
+                       /* if requested to roll, locate to start of loop and
+                        * roll but ONLY if we're not already rolling.
 
                           args: positition, roll=true, flush=true, with_loop=false, force buffer refill if seamless looping
                        */
 
-                       start_locate (loc->start(), true, true, false, Config->get_seamless_loop());
+                       if (Config->get_loop_is_mode()) {
+                               /* loop IS a transport mode: if already
+                                  rolling, do not locate to loop start.
+                               */
+                               if (!transport_rolling() && (speed != 0.0)) {
+                                       start_locate (loc->start(), true, true, false, true);
+                               }
+                       } else {
+                               if (speed != 0.0) {
+                                       start_locate (loc->start(), true, true, false, true);
+                               }
+                       }
                }
 
        } else {
@@ -796,9 +1044,14 @@ Session::flush_all_inserts ()
 }
 
 void
-Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force)
+Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_loop_enabled, bool force)
 {
-       if (synced_to_jack()) {
+       if (target_frame < 0) {
+               error << _("Locate called for negative sample position - ignored") << endmsg;
+               return;
+       }
+
+       if (synced_to_engine()) {
 
                double sp;
                framepos_t pos;
@@ -812,7 +1065,7 @@ Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush,
                                   will use the incorrect _transport_frame and report an old
                                   and incorrect time to Jack transport
                                */
-                               locate (target_frame, with_roll, with_flush, with_loop, force);
+                               locate (target_frame, with_roll, with_flush, for_loop_enabled, force);
                        }
 
                        /* tell JACK to change transport position, and we will
@@ -828,7 +1081,7 @@ Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush,
                }
 
        } else {
-               locate (target_frame, with_roll, with_flush, with_loop, force);
+               locate (target_frame, with_roll, with_flush, for_loop_enabled, force);
        }
 }
 
@@ -856,30 +1109,38 @@ Session::micro_locate (framecnt_t distance)
 
 /** @param with_mmc true to send a MMC locate command when the locate is done */
 void
-Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_seamless_loop, bool force, bool with_mmc)
+Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_loop_enabled, bool force, bool with_mmc)
 {
+       bool need_butler = false;
+
        /* Locates for seamless looping are fairly different from other
         * locates. They assume that the diskstream buffers for each track
         * already have the correct data in them, and thus there is no need to
         * actually tell the tracks to locate. What does need to be done,
         * though, is all the housekeeping that is associated with non-linear
-        * changes in the value of _transport_frame. 
+        * changes in the value of _transport_frame.
         */
 
-       if (actively_recording() && !for_seamless_loop) {
-               return;
-       }
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("rt-locate to %1, roll %2 flush %3 loop-enabled %4 force %5 mmc %6\n",
+                                                      target_frame, with_roll, with_flush, for_loop_enabled, force, with_mmc));
+
+       if (!force && _transport_frame == target_frame && !loop_changing && !for_loop_enabled) {
+
+               /* already at the desired position. Not forced to locate,
+                  the loop isn't changing, so unless we're told to
+                  start rolling also, there's nothing to do but
+                  tell the world where we are (again).
+               */
 
-       if (!force && _transport_frame == target_frame && !loop_changing && !for_seamless_loop) {
                if (with_roll) {
-                       set_transport_speed (1.0, false);
+                       set_transport_speed (1.0, 0, false);
                }
                loop_changing = false;
                Located (); /* EMIT SIGNAL */
                return;
        }
 
-       if (_transport_speed && !for_seamless_loop) {
+       if (_transport_speed && !(for_loop_enabled && Config->get_seamless_loop())) {
                /* Schedule a declick.  We'll be called again when its done.
                   We only do it this way for ordinary locates, not those
                   due to **seamless** loops.
@@ -895,12 +1156,9 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
        }
 
        // Update Timecode time
-       // [DR] FIXME: find out exactly where this should go below
        _transport_frame = target_frame;
        _last_roll_or_reversal_location = target_frame;
        timecode_time(_transport_frame, transmitting_timecode_time);
-       outbound_mtc_timecode_frame = _transport_frame;
-       next_quarter_frame_to_send = 0;
 
        /* do "stopped" stuff if:
         *
@@ -913,7 +1171,8 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
 
        bool transport_was_stopped = !transport_rolling();
 
-       if (transport_was_stopped && (!auto_play_legal || !config.get_auto_play()) && !with_roll && !(synced_to_jack() && play_loop)) {
+       if (!transport_was_stopped && (!auto_play_legal || !config.get_auto_play()) && !with_roll && !(synced_to_engine() && play_loop) &&
+           (!Profile->get_trx() || !(config.get_external_sync() && !synced_to_engine()))) {
                realtime_stop (false, true); // XXX paul - check if the 2nd arg is really correct
                transport_was_stopped = true;
        } else {
@@ -921,7 +1180,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
                realtime_locate ();
        }
 
-       if (force || !for_seamless_loop || loop_changing) {
+       if (force || !for_loop_enabled || loop_changing) {
 
                PostTransportWork todo = PostTransportLocate;
 
@@ -930,7 +1189,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
                }
 
                add_post_transport_work (todo);
-               _butler->schedule_transport_work ();
+               need_butler = true;
 
        } else {
 
@@ -966,29 +1225,49 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
                Location* al = _locations->auto_loop_location();
 
                if (al) {
-                       if (_transport_frame < al->start() || _transport_frame > al->end()) {
+                       if (_transport_frame < al->start() || _transport_frame >= al->end()) {
 
                                // located outside the loop: cancel looping directly, this is called from event handling context
 
-                               set_play_loop (false);
-                               
+                               have_looped = false;
+
+                               if (!Config->get_loop_is_mode()) {
+                                       set_play_loop (false, _transport_speed);
+                               } else {
+                                       if (Config->get_seamless_loop()) {
+                                               /* this will make the non_realtime_locate() in the butler
+                                                  which then causes seek() in tracks actually do the right
+                                                  thing.
+                                               */
+                                               set_track_loop (false);
+                                       }
+                               }
+
                        } else if (_transport_frame == al->start()) {
 
                                // located to start of loop - this is looping, basically
 
-                               if (for_seamless_loop) {
+                               if (!have_looped) {
+                                       /* first time */
+                                       if (_last_roll_location != al->start()) {
+                                               /* didn't start at loop start - playback must have
+                                                * started before loop since we've now hit the loop
+                                                * end.
+                                                */
+                                               add_post_transport_work (PostTransportLocate);
+                                               need_butler = true;
+                                       }
 
-                                       // this is only necessary for seamless looping
-                                       
-                                       boost::shared_ptr<RouteList> rl = routes.reader();
+                               }
 
-                                       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                                               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                               boost::shared_ptr<RouteList> rl = routes.reader();
 
-                                               if (tr && tr->record_enabled ()) {
-                                                       // tell it we've looped, so it can deal with the record state
-                                                       tr->transport_looped (_transport_frame);
-                                               }
+                               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+                                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+
+                                       if (tr && tr->rec_enable_control()->get_value()) {
+                                               // tell it we've looped, so it can deal with the record state
+                                               tr->transport_looped (_transport_frame);
                                        }
                                }
 
@@ -998,6 +1277,10 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
                }
        }
 
+       if (need_butler) {
+               _butler->schedule_transport_work ();
+       }
+
        loop_changing = false;
 
        _send_timecode_update = true;
@@ -1006,6 +1289,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
                send_mmc_locate (_transport_frame);
        }
 
+       _last_roll_location = _last_roll_or_reversal_location =  _transport_frame;
        Located (); /* EMIT SIGNAL */
 }
 
@@ -1014,9 +1298,9 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
  *  @param speed New speed
  */
 void
-Session::set_transport_speed (double speed, bool abort, bool clear_state, bool as_default)
+Session::set_transport_speed (double speed, framepos_t destination_frame, bool abort, bool clear_state, bool as_default)
 {
-       DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n", 
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n",
                                                       speed, abort, clear_state, _transport_speed, _transport_frame, as_default));
 
        if (_transport_speed == speed) {
@@ -1028,7 +1312,7 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a
 
        if (actively_recording() && speed != 1.0 && speed != 0.0) {
                /* no varispeed during recording */
-               DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, frame %2\n", 
+               DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, frame %2\n",
                                                       _transport_speed, _transport_frame));
                return;
        }
@@ -1053,7 +1337,7 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a
                        set_track_monitor_input_status (true);
                }
 
-               if (synced_to_jack ()) {
+               if (synced_to_engine ()) {
                        if (clear_state) {
                                /* do this here because our response to the slave won't
                                   take care of it.
@@ -1063,20 +1347,46 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a
                        }
                        _engine.transport_stop ();
                } else {
+                       bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort));
+
+                       if (!auto_return_enabled) {
+                               _requested_return_frame = destination_frame;
+                       }
+
                        stop_transport (abort);
                }
 
-               unset_play_loop ();
-
        } else if (transport_stopped() && speed == 1.0) {
-
+               if (as_default) {
+                       _default_transport_speed = speed;
+               }
                /* we are stopped and we want to start rolling at speed 1 */
 
+               if (Config->get_loop_is_mode() && play_loop) {
+
+                       Location *location = _locations->auto_loop_location();
+
+                       if (location != 0) {
+                               if (_transport_frame != location->start()) {
+
+                                       if (Config->get_seamless_loop()) {
+                                               /* force tracks to do their thing */
+                                               set_track_loop (true);
+                                       }
+
+                                       /* jump to start and then roll from there */
+
+                                       request_locate (location->start(), true);
+                                       return;
+                               }
+                       }
+               }
+
                if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
                        set_track_monitor_input_status (false);
                }
 
-               if (synced_to_jack()) {
+               if (synced_to_engine()) {
                        _engine.transport_start ();
                } else {
                        start_transport ();
@@ -1086,7 +1396,7 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a
 
                /* not zero, not 1.0 ... varispeed */
 
-               if ((synced_to_jack()) && speed != 0.0 && speed != 1.0) {
+               if ((synced_to_engine()) && speed != 0.0 && speed != 1.0) {
                        warning << string_compose (
                                _("Global varispeed cannot be supported while %1 is connected to JACK transport control"),
                                PROGRAM_NAME)
@@ -1114,7 +1424,7 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a
 
                PostTransportWork todo = PostTransportWork (0);
 
-               if ((_transport_speed && speed * _transport_speed < 0.0) || (_last_transport_speed * speed < 0.0) || (_last_transport_speed == 0.0f && speed < 0.0f)) {
+               if ((_transport_speed && speed * _transport_speed < 0.0) || (_last_transport_speed * speed < 0.0) || (_last_transport_speed == 0.0 && speed < 0.0)) {
                        todo = PostTransportWork (todo | PostTransportReverse);
                        _last_roll_or_reversal_location = _transport_frame;
                }
@@ -1140,7 +1450,28 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state, bool a
                }
 
                DEBUG_TRACE (DEBUG::Transport, string_compose ("send TSC3 with speed = %1\n", _transport_speed));
-               TransportStateChange (); /* EMIT SIGNAL */
+
+               /* throttle signal emissions.
+                * when slaved [_last]_transport_speed
+                * usually changes every cycle (tiny amounts due to DLL).
+                * Emitting a signal every cycle is overkill and unwarranted.
+                *
+                * Using _last_transport_speed is not acceptable,
+                * since it allows for large changes over a long period
+                * of time. Hence we introduce a dedicated variable to keep track
+                *
+                * The 0.2% dead-zone is somewhat arbitrary. Main use-case
+                * for TransportStateChange() here is the ShuttleControl display.
+                */
+               if (fabs (_signalled_varispeed - speed) > .002
+                   // still, signal hard changes to 1.0 and 0.0:
+                   || ( speed == 1.0 && _signalled_varispeed != 1.0)
+                   || ( speed == 0.0 && _signalled_varispeed != 0.0)
+                  )
+               {
+                       TransportStateChange (); /* EMIT SIGNAL */
+                       _signalled_varispeed = speed;
+               }
        }
 }
 
@@ -1153,59 +1484,81 @@ Session::stop_transport (bool abort, bool clear_state)
                return;
        }
 
-       if (actively_recording() && !(transport_sub_state & StopPendingCapture) && worst_input_latency() > current_block_size) {
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("stop_transport, declick required? %1\n", get_transport_declick_required()));
+
+       if (!get_transport_declick_required()) {
+
+               /* stop has not yet been scheduled */
 
                boost::shared_ptr<RouteList> rl = routes.reader();
+               framepos_t stop_target = audible_frame();
+
                for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                        boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                        if (tr) {
-                               tr->prepare_to_stop (_transport_frame);
+                               tr->prepare_to_stop (_transport_frame, stop_target);
                        }
                }
 
-               /* we need to capture the audio that has still not yet been received by the system
-                  at the time the stop is requested, so we have to roll past that time.
+               SubState new_bits;
 
-                  we want to declick before stopping, so schedule the autostop for one
-                  block before the actual end. we'll declick in the subsequent block,
-                  and then we'll really be stopped.
-               */
+               if (actively_recording() &&                           /* we are recording */
+                   worst_input_latency() > current_block_size) {     /* input latency exceeds block size, so simple 1 cycle delay before stop is not enough */
 
-               DEBUG_TRACE (DEBUG::Transport, string_compose ("stop transport requested @ %1, scheduled for + %2 - %3 = %4, abort = %5\n",
-                                                              _transport_frame, _worst_input_latency, current_block_size,
-                                                              _transport_frame - _worst_input_latency - current_block_size,
-                                                              abort));
+                       /* we need to capture the audio that is still somewhere in the pipeline between
+                          wherever it was generated and the process callback. This means that even though
+                          the user (or something else)  has asked us to stop, we have to roll
+                          past this point and then reset the playhead/transport location to
+                          the position at which the stop was requested.
 
-               SessionEvent *ev = new SessionEvent (SessionEvent::StopOnce, SessionEvent::Replace,
-                                                    _transport_frame + _worst_input_latency - current_block_size,
-                                                    0, 0, abort);
+                          we still need playback to "stop" now, however, which is why we schedule
+                          a declick below.
+                       */
 
-               merge_event (ev);
-               transport_sub_state |= StopPendingCapture;
-               pending_abort = abort;
-               return;
-       }
+                       DEBUG_TRACE (DEBUG::Transport, string_compose ("stop transport requested @ %1, scheduled for + %2 = %3, abort = %4\n",
+                                                                      _transport_frame, _worst_input_latency,
+                                                                      _transport_frame + _worst_input_latency,
+                                                                      abort));
 
-       if ((transport_sub_state & PendingDeclickOut) == 0) {
+                       SessionEvent *ev = new SessionEvent (SessionEvent::StopOnce, SessionEvent::Replace,
+                                                            _transport_frame + _worst_input_latency,
+                                                            0, 0, abort);
 
-               if (!(transport_sub_state & StopPendingCapture)) {
-                       boost::shared_ptr<RouteList> rl = routes.reader();
-                       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                               if (tr) {
-                                       tr->prepare_to_stop (_transport_frame);
-                               }
-                       }
+                       merge_event (ev);
+
+                       /* request a declick at the start of the next process cycle() so that playback ceases.
+                          It will remain silent until we actually stop (at the StopOnce event somewhere in
+                          the future). The extra flag (StopPendingCapture) is set to ensure that check_declick_out()
+                          does not stop the transport too early.
+                        */
+                       new_bits = SubState (PendingDeclickOut|StopPendingCapture);
+
+               } else {
+
+                       /* Not recording, schedule a declick in the next process() cycle and then stop at its end */
+
+                       new_bits = PendingDeclickOut;
+                       DEBUG_TRACE (DEBUG::Transport, string_compose ("stop scheduled for next process cycle @ %1\n", _transport_frame));
                }
 
-               transport_sub_state |= PendingDeclickOut;
                /* we'll be called again after the declick */
+               transport_sub_state = SubState (transport_sub_state|new_bits);
                pending_abort = abort;
+
                return;
-       }
 
-       realtime_stop (abort, clear_state);
-       _butler->schedule_transport_work ();
+       } else {
+
+               DEBUG_TRACE (DEBUG::Transport, "time to actually stop\n");
+
+               /* declick was scheduled, but we've been called again, which means it is really time to stop
+
+                  XXX: we should probably split this off into its own method and call it explicitly.
+               */
+
+               realtime_stop (abort, clear_state);
+               _butler->schedule_transport_work ();
+       }
 }
 
 /** Called from the process thread */
@@ -1257,7 +1610,7 @@ Session::start_transport ()
                Timecode::Time time;
                timecode_time_subframes (_transport_frame, time);
                if (!dynamic_cast<MTC_Slave*>(_slave)) {
-                       MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
+                       send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
                }
        }
 
@@ -1322,6 +1675,20 @@ Session::reset_rf_scale (framecnt_t motion)
        }
 }
 
+void
+Session::mtc_status_changed (bool yn)
+{
+       g_atomic_int_set (&_mtc_active, yn);
+       MTCSyncStateChanged( yn );
+}
+
+void
+Session::ltc_status_changed (bool yn)
+{
+       g_atomic_int_set (&_ltc_active, yn);
+       LTCSyncStateChanged( yn );
+}
+
 void
 Session::use_sync_source (Slave* new_slave)
 {
@@ -1334,9 +1701,34 @@ Session::use_sync_source (Slave* new_slave)
        delete _slave;
        _slave = new_slave;
 
+       MTC_Slave* mtc_slave = dynamic_cast<MTC_Slave*>(_slave);
+       if (mtc_slave) {
+               mtc_slave->ActiveChanged.connect_same_thread (mtc_status_connection, boost::bind (&Session::mtc_status_changed, this, _1));
+               MTCSyncStateChanged(mtc_slave->locked() );
+       } else {
+               if (g_atomic_int_get (&_mtc_active) ){
+                       g_atomic_int_set (&_mtc_active, 0);
+                       MTCSyncStateChanged( false );
+               }
+               mtc_status_connection.disconnect ();
+       }
+
+       LTC_Slave* ltc_slave = dynamic_cast<LTC_Slave*> (_slave);
+       if (ltc_slave) {
+               ltc_slave->ActiveChanged.connect_same_thread (ltc_status_connection, boost::bind (&Session::ltc_status_changed, this, _1));
+               LTCSyncStateChanged (ltc_slave->locked() );
+       } else {
+               if (g_atomic_int_get (&_ltc_active) ){
+                       g_atomic_int_set (&_ltc_active, 0);
+                       LTCSyncStateChanged( false );
+               }
+               ltc_status_connection.disconnect ();
+       }
+
        DEBUG_TRACE (DEBUG::Slave, string_compose ("set new slave to %1\n", _slave));
 
-       send_full_time_code (_transport_frame);
+       // need to queue this for next process() cycle
+       _send_timecode_update = true;
 
        boost::shared_ptr<RouteList> rl = routes.reader();
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
@@ -1377,7 +1769,7 @@ Session::switch_to_sync_source (SyncSource src)
                }
 
                try {
-                       new_slave = new MTC_Slave (*this, *MIDI::Manager::instance()->mtc_input_port());
+                       new_slave = new MTC_Slave (*this, *_midi_ports->mtc_input_port());
                }
 
                catch (failed_constructor& err) {
@@ -1406,7 +1798,7 @@ Session::switch_to_sync_source (SyncSource src)
                }
 
                try {
-                       new_slave = new MIDIClock_Slave (*this, *MIDI::Manager::instance()->midi_clock_input_port(), 24);
+                       new_slave = new MIDIClock_Slave (*this, *_midi_ports->midi_clock_input_port(), 24);
                }
 
                catch (failed_constructor& err) {
@@ -1414,8 +1806,8 @@ Session::switch_to_sync_source (SyncSource src)
                }
                break;
 
-       case JACK:
-               if (_slave && dynamic_cast<JACK_Slave*>(_slave)) {
+       case Engine:
+               if (_slave && dynamic_cast<Engine_Slave*>(_slave)) {
                        return;
                }
 
@@ -1423,7 +1815,7 @@ Session::switch_to_sync_source (SyncSource src)
                        return;
                }
 
-               new_slave = new JACK_Slave (_engine.jack());
+               new_slave = new Engine_Slave (*AudioEngine::instance());
                break;
 
        default:
@@ -1540,6 +1932,13 @@ Session::request_bounded_roll (framepos_t start, framepos_t end)
        lar.push_back (ar);
        request_play_range (&lar, true);
 }
+
+void
+Session::set_requested_return_frame (framepos_t return_to)
+{
+       _requested_return_frame = return_to;
+}
+
 void
 Session::request_roll_at_and_return (framepos_t start, framepos_t return_to)
 {
@@ -1561,8 +1960,6 @@ Session::engine_halted ()
        */
 
        if (_butler) {
-               g_atomic_int_set (&_butler->should_do_transport_work, 0);
-               set_post_transport_work (PostTransportWork (0));
                _butler->stop ();
        }
 
@@ -1578,6 +1975,8 @@ Session::engine_halted ()
 void
 Session::xrun_recovery ()
 {
+       ++_xrun_count;
+
        Xrun (_transport_frame); /* EMIT SIGNAL */
 
        if (Config->get_stop_recording_on_xrun() && actively_recording()) {
@@ -1598,6 +1997,12 @@ Session::route_processors_changed (RouteProcessorChange c)
        }
 
        if (c.type == RouteProcessorChange::MeterPointChange) {
+               set_dirty ();
+               return;
+       }
+
+       if (c.type == RouteProcessorChange::RealTimeChange) {
+               set_dirty ();
                return;
        }
 
@@ -1613,23 +2018,13 @@ Session::allow_auto_play (bool yn)
        auto_play_legal = yn;
 }
 
-void
-Session::reset_jack_connection (jack_client_t* jack)
-{
-       JACK_Slave* js;
-
-       if (_slave && ((js = dynamic_cast<JACK_Slave*> (_slave)) != 0)) {
-               js->reset_client (jack);
-       }
-}
-
 bool
 Session::maybe_stop (framepos_t limit)
 {
        if ((_transport_speed > 0.0f && _transport_frame >= limit) || (_transport_speed < 0.0f && _transport_frame == 0)) {
-               if (synced_to_jack () && config.get_jack_time_master ()) {
+               if (synced_to_engine () && config.get_jack_time_master ()) {
                        _engine.transport_stop ();
-               } else if (!synced_to_jack ()) {
+               } else if (!synced_to_engine ()) {
                        stop_transport ();
                }
                return true;
@@ -1640,10 +2035,14 @@ Session::maybe_stop (framepos_t limit)
 void
 Session::send_mmc_locate (framepos_t t)
 {
+       if (t < 0) {
+               return;
+       }
+
        if (!_engine.freewheeling()) {
                Timecode::Time time;
                timecode_time_subframes (t, time);
-               MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (time));
+               send_immediate_mmc (MIDI::MachineControlCommand (time));
        }
 }