Setup fixed ports for MIDI control data; hence remove configuration of those ports...
[ardour.git] / libs / ardour / session_transport.cc
index 17a6806c526e18d458e3e018f49df30de1fc350b..1123a6038b8388f4bf63a741f02eb0dbdd46527f 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2003 Paul Davis 
+    Copyright (C) 1999-2003 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <cerrno>
 #include <unistd.h>
 
-#include <sigc++/bind.h>
-#include <sigc++/retype.h>
 
-#include <pbd/undo.h>
-#include <pbd/error.h>
-#include <glibmm/thread.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/memento_command.h>
+#include "pbd/undo.h"
+#include "pbd/error.h"
+#include "pbd/enumwriter.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
 
-#include <midi++/mmc.h>
-#include <midi++/port.h>
+#include "midi++/mmc.h"
+#include "midi++/port.h"
 
-#include <ardour/ardour.h>
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/auditioner.h>
-#include <ardour/slave.h>
-#include <ardour/location.h>
+#include "ardour/ardour.h"
+#include "ardour/audioengine.h"
+#include "ardour/auditioner.h"
+#include "ardour/butler.h"
+#include "ardour/debug.h"
+#include "ardour/location.h"
+#include "ardour/session.h"
+#include "ardour/slave.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
-using namespace sigc;
 using namespace PBD;
 
 void
-Session::request_input_change_handling (boost::shared_ptr<Diskstream> ds)
+Session::add_post_transport_work (PostTransportWork ptw)
+{
+       PostTransportWork oldval;
+       PostTransportWork newval;
+       int tries = 0;
+
+       while (tries < 8) {
+               oldval = (PostTransportWork) g_atomic_int_get (&_post_transport_work);
+               newval = PostTransportWork (oldval | ptw);
+               if (g_atomic_int_compare_and_exchange (&_post_transport_work, oldval, newval)) {
+                       /* success */
+                       return;
+               }
+       }
+
+       error << "Could not set post transport work! Crazy thread madness, call the programmers" << endmsg;
+}
+
+void
+Session::request_input_change_handling ()
 {
        if (!(_state_of_the_state & (InitialConnecting|Deletion))) {
-               Event* ev = new Event (Event::InputConfigurationChange, Event::Add, Event::Immediate, 0, 0.0);
-               ev->diskstream = ds;
+               SessionEvent* ev = new SessionEvent (SessionEvent::InputConfigurationChange, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0);
                queue_event (ev);
        }
 }
 
 void
-Session::request_slave_source (SlaveSource src)
+Session::request_sync_source (Slave* new_slave)
 {
-       Event* ev = new Event (Event::SetSlaveSource, Event::Add, Event::Immediate, 0, 0.0);
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetSyncSource, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0);
+       bool seamless;
+
+       seamless = Config->get_seamless_loop ();
 
-       if (src == JACK) {
-               /* could set_seamless_loop() be disposed of entirely?*/
+       if (dynamic_cast<JACK_Slave*>(new_slave)) {
+               /* JACK cannot support seamless looping at present */
                Config->set_seamless_loop (false);
        } else {
-               Config->set_seamless_loop (true);
+               /* reset to whatever the value was before we last switched slaves */
+               Config->set_seamless_loop (_was_seamless);
        }
-       ev->slave = src;
+
+       /* save value of seamless from before the switch */
+       _was_seamless = seamless;
+
+       ev->slave = new_slave;
        queue_event (ev);
 }
 
 void
-Session::request_transport_speed (float speed)
+Session::request_transport_speed (double speed)
 {
-       Event* ev = new Event (Event::SetTransportSpeed, Event::Add, Event::Immediate, 0, speed);
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, 0, speed);
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport speed = %1\n", speed));
        queue_event (ev);
 }
 
 void
-Session::request_diskstream_speed (Diskstream& ds, float speed)
+Session::request_track_speed (Track* tr, double speed)
 {
-       Event* ev = new Event (Event::SetDiskstreamSpeed, Event::Add, Event::Immediate, 0, speed);
-       ev->set_ptr (&ds);
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetTrackSpeed, SessionEvent::Add, SessionEvent::Immediate, 0, speed);
+       ev->set_ptr (tr);
        queue_event (ev);
 }
 
 void
-Session::request_stop (bool abort)
+Session::request_stop (bool abort, bool clear_state)
 {
-       Event* ev = new Event (Event::SetTransportSpeed, Event::Add, Event::Immediate, 0, 0.0, abort);
+       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));
        queue_event (ev);
 }
 
 void
 Session::request_locate (nframes_t target_frame, bool with_roll)
 {
-       Event *ev = new Event (with_roll ? Event::LocateRoll : Event::Locate, Event::Add, Event::Immediate, target_frame, 0, false);
+       SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_frame, 0, false);
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request locate to %1\n", target_frame));
        queue_event (ev);
 }
 
 void
-Session::force_locate (nframes_t target_frame, bool with_roll)
+Session::force_locate (nframes64_t target_frame, bool with_roll)
 {
-       Event *ev = new Event (with_roll ? Event::LocateRoll : Event::Locate, Event::Add, Event::Immediate, target_frame, 0, true);
+       SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_frame, 0, true);
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request forced locate to %1\n", target_frame));
        queue_event (ev);
 }
 
 void
-Session::request_play_loop (bool yn)
+Session::request_play_loop (bool yn, bool leave_rolling)
 {
-       Event* ev;      
+       SessionEvent* ev;
        Location *location = _locations.auto_loop_location();
 
        if (location == 0 && yn) {
@@ -121,62 +149,103 @@ Session::request_play_loop (bool yn)
                return;
        }
 
-       ev = new Event (Event::SetLoop, Event::Add, Event::Immediate, 0, 0.0, yn);
+       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));
        queue_event (ev);
 
-       if (!yn && Config->get_seamless_loop() && transport_rolling()) {
-               // request an immediate locate to refresh the diskstreams
+       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);
        }
 }
 
 void
-Session::realtime_stop (bool abort)
+Session::request_play_range (list<AudioRange>* range, bool leave_rolling)
 {
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetPlayAudioRange, SessionEvent::Add, SessionEvent::Immediate, 0, (leave_rolling ? 1.0 : 0.0));
+       if (range) {
+               ev->audio_range = *range;
+       } else {
+               ev->audio_range.clear ();
+       }
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Request play range, leave rolling ? %1\n", leave_rolling));
+       queue_event (ev);
+}
+
+void
+Session::realtime_stop (bool abort, bool clear_state)
+{
+       DEBUG_TRACE (DEBUG::Transport, "realtime stop\n");
+       PostTransportWork todo = PostTransportWork (0);
+
        /* assume that when we start, we'll be moving forwards */
 
+       // FIXME: where should this really be? [DR]
+       //send_full_time_code();
+       
+       _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
+       send_mmc_locate (_transport_frame);
+
        if (_transport_speed < 0.0f) {
-               post_transport_work = PostTransportWork (post_transport_work | PostTransportStop | PostTransportReverse);
+               todo = (PostTransportWork (todo | PostTransportStop | PostTransportReverse));
        } else {
-               post_transport_work = PostTransportWork (post_transport_work | PostTransportStop);
+               todo = PostTransportWork (todo | PostTransportStop);
        }
 
        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.
+                  past that point to pick up delayed input (and/or to delick)
                */
 
-#ifndef LEAVE_TRANSPORT_UNADJUSTED
-               decrement_transport_position (_worst_output_latency);
-#endif
+                if (_worst_output_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_output_latency - current_block_size));
+                } else {
+                        decrement_transport_position (current_block_size);
+                }
 
                /* the duration change is not guaranteed to have happened, but is likely */
 
-               post_transport_work = PostTransportWork (post_transport_work | PostTransportDuration);
+               todo = PostTransportWork (todo | PostTransportDuration);
        }
 
        if (abort) {
-               post_transport_work = PostTransportWork (post_transport_work | PostTransportAbort);
+               todo = PostTransportWork (todo | PostTransportAbort);
        }
 
-       _clear_event_type (Event::StopOnce);
-       _clear_event_type (Event::RangeStop);
-       _clear_event_type (Event::RangeLocate);
+       if (clear_state) {
+               todo = PostTransportWork (todo | PostTransportClearSubstate);
+       }
+
+       if (todo) {
+               add_post_transport_work (todo);
+       }
 
-       disable_record (true);
+       _clear_event_type (SessionEvent::StopOnce);
+       _clear_event_type (SessionEvent::RangeStop);
+       _clear_event_type (SessionEvent::RangeLocate);
 
+        /* 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));
+        
        reset_slave_state ();
-               
+
        _transport_speed = 0;
+       _target_transport_speed = 0;
+
+       g_atomic_int_set (&_playback_load, 100);
+       g_atomic_int_set (&_capture_load, 100);
 
-       if (Config->get_use_video_sync()) {
+       if (config.get_use_video_sync()) {
                waiting_for_sync_offset = true;
        }
 
-       transport_sub_state = ((Config->get_slave_source() == None && Config->get_auto_return()) ? AutoReturning : 0);
+       transport_sub_state = ((!config.get_external_sync()&& config.get_auto_return()) ? AutoReturning : 0);
 }
 
 void
@@ -184,48 +253,56 @@ Session::butler_transport_work ()
 {
   restart:
        bool finished;
+       PostTransportWork ptw;
        boost::shared_ptr<RouteList> r = routes.reader ();
-       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
 
-       int on_entry = g_atomic_int_get (&butler_should_do_transport_work);
+       int on_entry = g_atomic_int_get (&_butler->should_do_transport_work);
        finished = true;
+       ptw = post_transport_work();
 
-       if (post_transport_work & PostTransportCurveRealloc) {
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler transport work, todo = %1\n", enum_2_string (ptw)));
+
+        if (ptw & PostTransportAdjustPlaybackBuffering) {
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       (*i)->curve_reallocate();
+                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                       if (tr) {
+                               tr->adjust_playback_buffering ();
+                                /* and refill those buffers ... */
+                                tr->non_realtime_locate (_transport_frame);
+                       }
                }
-       }
-
-       if (post_transport_work & PostTransportInputChange) {
-               {
-                       RCUWriter<DiskstreamList> input_writer (diskstreams_input_pending);
-                       boost::shared_ptr<DiskstreamList> input_list = input_writer.get_copy ();
-                       RCUWriter<DiskstreamList> dswriter (diskstreams);
-                       boost::shared_ptr<DiskstreamList> ds = dswriter.get_copy();
+                
+        }
 
-                       for (DiskstreamList::iterator i = input_list->begin(); i != input_list->end(); ++i) {
-
-                               /* make the change */
-                               
-                               (*i)->non_realtime_input_change ();
+        if (ptw & PostTransportAdjustCaptureBuffering) {
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                       if (tr) {
+                               tr->adjust_capture_buffering ();
+                       }
+               }
+        }
 
-                               /* now transfer it back onto the regular diskstreams list */
+       if (ptw & PostTransportCurveRealloc) {
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       (*i)->curve_reallocate();
+               }
+       }
 
-                               ds->push_back (*i);
+       if (ptw & PostTransportInputChange) {
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                       if (tr) {
+                               tr->non_realtime_input_change ();
                        }
-                       
-                       input_list->clear();
                }
-
-               diskstreams_input_pending.flush ();
        }
 
-       if (post_transport_work & PostTransportSpeed) {
+       if (ptw & PostTransportSpeed) {
                non_realtime_set_speed ();
        }
 
-       if (post_transport_work & PostTransportReverse) {
-
+       if (ptw & PostTransportReverse) {
 
                clear_clicks();
                cumulative_rf_motion = 0;
@@ -233,75 +310,93 @@ Session::butler_transport_work ()
 
                /* don't seek if locate will take care of that in non_realtime_stop() */
 
-               if (!(post_transport_work & PostTransportLocate)) {
-                       
-                       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                               if (!(*i)->hidden()) {
-                                       if ((*i)->speed() != 1.0f || (*i)->speed() != -1.0f) {
-                                               (*i)->seek ((nframes_t) (_transport_frame * (double) (*i)->speed()));
-                                       }
-                                       else {
-                                               (*i)->seek (_transport_frame);
-                                       }
+               if (!(ptw & PostTransportLocate)) {
+
+                       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                               if (tr && !tr->hidden()) {
+                                       tr->non_realtime_locate (_transport_frame);
                                }
-                               if (on_entry != g_atomic_int_get (&butler_should_do_transport_work)) {
+                               if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) {
                                        /* new request, stop seeking, and start again */
-                                       g_atomic_int_dec_and_test (&butler_should_do_transport_work);
+                                       g_atomic_int_dec_and_test (&_butler->should_do_transport_work);
                                        goto restart;
                                }
                        }
                }
        }
 
-       if (post_transport_work & (PostTransportStop|PostTransportLocate)) {
-               non_realtime_stop (post_transport_work & PostTransportAbort, on_entry, finished);
+       if (ptw & PostTransportLocate) {
+               non_realtime_locate ();
+       }
+
+       if (ptw & PostTransportStop) {
+               non_realtime_stop (ptw & PostTransportAbort, on_entry, finished);
                if (!finished) {
-                       g_atomic_int_dec_and_test (&butler_should_do_transport_work);
+                       g_atomic_int_dec_and_test (&_butler->should_do_transport_work);
                        goto restart;
                }
        }
 
-       if (post_transport_work & PostTransportOverWrite) {
+       if (ptw & PostTransportOverWrite) {
                non_realtime_overwrite (on_entry, finished);
                if (!finished) {
-                       g_atomic_int_dec_and_test (&butler_should_do_transport_work);
+                       g_atomic_int_dec_and_test (&_butler->should_do_transport_work);
                        goto restart;
                }
        }
 
-       if (post_transport_work & PostTransportAudition) {
+       if (ptw & PostTransportAudition) {
                non_realtime_set_audition ();
        }
-       
-       g_atomic_int_dec_and_test (&butler_should_do_transport_work);
+
+       g_atomic_int_dec_and_test (&_butler->should_do_transport_work);
+
+       DEBUG_TRACE (DEBUG::Transport, X_("Butler transport work all done\n"));
 }
 
 void
 Session::non_realtime_set_speed ()
 {
-       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-
-       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-               (*i)->non_realtime_set_speed ();
+       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->non_realtime_set_speed ();
+               }
        }
 }
 
 void
 Session::non_realtime_overwrite (int on_entry, bool& finished)
 {
-       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-
-       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-               if ((*i)->pending_overwrite) {
-                       (*i)->overwrite_existing_buffers ();
+       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->pending_overwrite ()) {
+                       tr->overwrite_existing_buffers ();
                }
-               if (on_entry != g_atomic_int_get (&butler_should_do_transport_work)) {
+               if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) {
                        finished = false;
                        return;
                }
        }
 }
 
+
+void
+Session::non_realtime_locate ()
+{
+       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->non_realtime_locate (_transport_frame);
+               }
+       }
+}
+
+
 void
 Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 {
@@ -309,21 +404,22 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        time_t     xnow;
        bool       did_record;
        bool       saved;
+       PostTransportWork ptw = post_transport_work();
 
        did_record = false;
        saved = false;
 
-       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-       
-       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-               if ((*i)->get_captured_frames () != 0) {
+       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->get_captured_frames () != 0) {
                        did_record = true;
                        break;
                }
        }
 
        /* stop and locate are merged here because they share a lot of common stuff */
-       
+
        time (&xnow);
        now = localtime (&xnow);
 
@@ -337,119 +433,138 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 
        if (did_record) {
                begin_reversible_command ("capture");
-               
-               Location* loc = _locations.end_location();
-               bool change_end = false;
-               
-               if (_transport_frame < loc->end()) {
-
-                       /* stopped recording before current end */
-
-                       if (_end_location_is_free) {
-
-                               /* first capture for this session, move end back to where we are */
-
-                               change_end = true;
-                       } 
-
-               } else if (_transport_frame > loc->end()) {
-                       
-                       /* stopped recording after the current end, extend it */
-
-                       change_end = true;
-               }
-               
-               if (change_end) {
-                        XMLNode &before = loc->get_state();
-                        loc->set_end(_transport_frame);
-                        XMLNode &after = loc->get_state();
-                        add_command (new MementoCommand<Location>(*loc, &before, &after));
-               }
-
-               _end_location_is_free = false;
                _have_captured = true;
        }
 
-       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-               (*i)->transport_stopped (*now, xnow, abort);
+       DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: DS stop\n"));
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (tr) {
+                       tr->transport_stopped_wallclock (*now, xnow, abort);
+               }
        }
-       
+
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->hidden()) {
+               if (!(*i)->is_hidden()) {
                        (*i)->set_pending_declick (0);
                }
        }
-       
+
        if (did_record) {
                commit_reversible_command ();
-       }       
-       
+       }
+
        if (_engine.running()) {
                update_latency_compensation (true, abort);
        }
 
-       if ((Config->get_slave_source() == None && Config->get_auto_return()) || (post_transport_work & PostTransportLocate) || synced_to_jack()) {
-               
+       bool const auto_return_enabled =
+               (!config.get_external_sync() && config.get_auto_return());
+
+       if (auto_return_enabled ||
+           (ptw & PostTransportLocate) ||
+           (_requested_return_frame >= 0) ||
+           synced_to_jack()) {
+
                if (pending_locate_flush) {
-                       flush_all_redirects ();
+                       flush_all_inserts ();
                }
-               
-               if (((Config->get_slave_source() == None && Config->get_auto_return()) || synced_to_jack()) && !(post_transport_work & PostTransportLocate)) {
 
-                       _transport_frame = last_stop_frame;
+               if ((auto_return_enabled || synced_to_jack() || _requested_return_frame >= 0) &&
+                   !(ptw & PostTransportLocate)) {
+
+                        /* no explicit locate queued */
+
+                       bool do_locate = false;
+
+                       if (_requested_return_frame >= 0) {
 
-                       if (synced_to_jack()) {
+                               /* 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();
+                                                       
+                                                       if (location != 0) {
+                                                               _transport_frame = location->start();
+                                                       } else {
+                                                               _transport_frame = _last_roll_location;
+                                                       }
+                                                       do_locate = true;
+                                               }
+
+                                       } else if (_play_range) {
+
+                                               /* return to start of range */
+
+                                               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;
+                                       }
+                               } 
+                       }
+
+                       _requested_return_frame = -1;                   
+
+                       if (do_locate) {
                                _engine.transport_locate (_transport_frame);
                        }
                } 
 
-#ifndef LEAVE_TRANSPORT_UNADJUSTED
        }
-#endif
 
-               for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                       if (!(*i)->hidden()) {
-                               if ((*i)->speed() != 1.0f || (*i)->speed() != -1.0f) {
-                                       (*i)->seek ((nframes_t) (_transport_frame * (double) (*i)->speed()));
-                               }
-                               else {
-                                       (*i)->seek (_transport_frame);
-                               }
-                       }
-                       if (on_entry != g_atomic_int_get (&butler_should_do_transport_work)) {
-                               finished = false;
-                               /* we will be back */
-                               return;
-                       }
-               }
-#ifdef LEAVE_TRANSPORT_UNADJUSTED
-       }
-#endif
+       /* do this before seeking, because otherwise the tracks will do the wrong thing in seamless loop mode.
+       */
 
-       last_stop_frame = _transport_frame;
+       if (ptw & PostTransportClearSubstate) {
+               _play_range = false;
+               unset_play_loop ();
+       }
 
-       send_full_time_code ();
-       deliver_mmc (MIDI::MachineControl::cmdStop, 0);
-       deliver_mmc (MIDI::MachineControl::cmdLocate, _transport_frame);
+       /* this for() block can be put inside the previous if() and has the effect of ... ??? what */
 
-       if (did_record) {
+       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()));
+               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (tr && !tr->hidden()) {
+                       tr->non_realtime_locate (_transport_frame);
+               }
 
-               /* XXX its a little odd that we're doing this here
-                  when realtime_stop(), which has already executed,
-                  will have done this.
-               */
-               
-               if (!Config->get_latched_record_enable()) {
-                       g_atomic_int_set (&_record_status, Disabled);
-               } else {
-                       g_atomic_int_set (&_record_status, Enabled);
+               if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) {
+                       finished = false;
+                       /* we will be back */
+                       return;
                }
-               RecordStateChanged (); /* emit signal */
        }
-       
-       if ((post_transport_work & PostTransportLocate) && get_record_enabled()) {
+
+       have_looped = false;
+
+       send_full_time_code (0);
+
+       if ((ptw & PostTransportLocate) && get_record_enabled()) {
                /* capture start has been changed, so save pending state */
                save_state ("", true);
                saved = true;
@@ -458,30 +573,26 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
         /* always try to get rid of this */
 
         remove_pending_capture_state ();
-       
+
        /* save the current state of things if appropriate */
 
        if (did_record && !saved) {
                save_state (_current_snapshot_name);
        }
 
-       if (post_transport_work & PostTransportDuration) {
-               DurationChanged (); /* EMIT SIGNAL */
-       }
-
-       if (post_transport_work & PostTransportStop) { 
+       if (ptw & PostTransportStop) {
                _play_range = false;
-
-               /* do not turn off autoloop on stop */
-               
+               play_loop = false;
        }
 
-       PositionChanged (_transport_frame); /* EMIT SIGNAL */
+       // can't cast away volatile so copy and emit that
+       nframes64_t tframe = _transport_frame;
+       PositionChanged (tframe); /* EMIT SIGNAL */
        TransportStateChange (); /* EMIT SIGNAL */
 
        /* and start it up again if relevant */
 
-       if ((post_transport_work & PostTransportLocate) && Config->get_slave_source() == None && pending_locate_roll) {
+       if ((ptw & PostTransportLocate) && !config.get_external_sync() && pending_locate_roll) {
                request_transport_speed (1.0);
                pending_locate_roll = false;
        }
@@ -495,7 +606,7 @@ Session::check_declick_out ()
        /* this is called after a process() iteration. if PendingDeclickOut was set,
           it means that we were waiting to declick the output (which has just been
           done) before doing something else. this is where we do that "something else".
-          
+
           note: called from the audio thread.
        */
 
@@ -511,101 +622,108 @@ Session::check_declick_out ()
        }
 }
 
+void
+Session::unset_play_loop ()
+{
+       play_loop = false;
+       clear_events (SessionEvent::AutoLoop);
+       
+       // 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);
+               }
+       }
+}
+
 void
 Session::set_play_loop (bool yn)
 {
        /* Called from event-handling context */
-       
-       if ((actively_recording() && yn) || _locations.auto_loop_location() == 0) {
+
+       Location *loc;
+
+       if (yn == play_loop || (actively_recording() && yn) || (loc = _locations.auto_loop_location()) == 0) {
+               /* nothing to do, or can't change loop status while recording */
                return;
        }
        
        set_dirty();
-
+       
        if (yn && Config->get_seamless_loop() && synced_to_jack()) {
-               warning << _("Seamless looping cannot be supported while Ardour is using JACK transport.\n"
-                            "Recommend changing the configured options")
+               warning << string_compose (_("Seamless looping cannot be supported while %1 is using JACK transport.\n"
+                                             "Recommend changing the configured options"), PROGRAM_NAME)
                        << endmsg;
                return;
        }
-
        
-       if ((play_loop = yn)) {
+       if (yn) {
 
-               Location *loc;
+               play_loop = true;
 
-               
-               if ((loc = _locations.auto_loop_location()) != 0) {
+               if (loc) {
+
+                       unset_play_range ();
 
                        if (Config->get_seamless_loop()) {
-                               // set all diskstreams to use internal looping
-                               boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-                               for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                                       if (!(*i)->hidden()) {
-                                               (*i)->set_loop (loc);
+                               // 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 diskstreams to NOT use internal looping
-                               boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-                               for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                                       if (!(*i)->hidden()) {
-                                               (*i)->set_loop (0);
+                               // 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);
                                        }
                                }
                        }
                        
-                       /* stick in the loop event */
+                       /* put the loop event into the event list */
                        
-                       Event* event = new Event (Event::AutoLoop, Event::Replace, loc->end(), loc->start(), 0.0f);
+                       SessionEvent* event = new SessionEvent (SessionEvent::AutoLoop, SessionEvent::Replace, loc->end(), loc->start(), 0.0f);
                        merge_event (event);
 
-                       /* locate to start of loop and roll if current pos is outside of the loop range */
-                       if (_transport_frame < loc->start() || _transport_frame > loc->end()) {
-                               event = new Event (Event::LocateRoll, Event::Add, Event::Immediate, loc->start(), 0, !synced_to_jack());
-                               merge_event (event);
-                       }
-                       else {
-                               // locate to current position (+ 1 to force reload)
-                               event = new Event (Event::LocateRoll, Event::Add, Event::Immediate, _transport_frame + 1, 0, !synced_to_jack());
-                               merge_event (event);
-                       }
-               }
-
+                       /* locate to start of loop and roll. If doing seamless loop, force a 
+                          locate+buffer refill even if we are positioned there already.
+                       */
 
+                       start_locate (loc->start(), true, true, false, Config->get_seamless_loop());
+               }
 
        } else {
-               clear_events (Event::AutoLoop);
 
-               // set all diskstreams to NOT use internal looping
-               boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-               for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                       if (!(*i)->hidden()) {
-                               (*i)->set_loop (0);
-                       }
-               }
-               
+               unset_play_loop ();
        }
-}
 
+       TransportStateChange ();
+}
 void
-Session::flush_all_redirects ()
+Session::flush_all_inserts ()
 {
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               (*i)->flush_redirects ();
+               (*i)->flush_processors ();
        }
 }
 
 void
-Session::start_locate (nframes_t target_frame, bool with_roll, bool with_flush, bool with_loop)
+Session::start_locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force)
 {
        if (synced_to_jack()) {
 
-               float sp;
-               nframes_t pos;
+               double sp;
+               nframes64_t pos;
 
                _slave->speed_and_position (sp, pos);
 
@@ -624,27 +742,55 @@ Session::start_locate (nframes_t target_frame, bool with_roll, bool with_flush,
                }
 
        } else {
+               locate (target_frame, with_roll, with_flush, with_loop, force);
+       }
+}
+
+int
+Session::micro_locate (nframes_t distance)
+{
+       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->can_internal_playback_seek (distance)) {
+                       return -1;
+               }
+       }
 
-               locate (target_frame, with_roll, with_flush, with_loop);
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (tr) {
+                       tr->internal_playback_seek (distance);
+               }
        }
+
+       _transport_frame += distance;
+       return 0;
 }
 
+/** @param with_mmc true to send a MMC locate command when the locate is done */
 void
-Session::locate (nframes_t target_frame, bool with_roll, bool with_flush, bool with_loop)
+Session::locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force, bool with_mmc)
 {
-       if (actively_recording()) {
+       if (actively_recording() && !with_loop) {
                return;
        }
 
-       if (_transport_frame == target_frame && !loop_changing && !with_loop) {
+       if (!force && _transport_frame == target_frame && !loop_changing && !with_loop) {
                if (with_roll) {
                        set_transport_speed (1.0, false);
                }
                loop_changing = false;
+               Located (); /* EMIT SIGNAL */
                return;
        }
 
+       // Update Timecode time
+       // [DR] FIXME: find out exactly where this should go below
        _transport_frame = target_frame;
+       timecode_time(_transport_frame, transmitting_timecode_time);
+       outbound_mtc_timecode_frame = _transport_frame;
+       next_quarter_frame_to_send = 0;
 
        if (_transport_speed && (!with_loop || loop_changing)) {
                /* schedule a declick. we'll be called again when its done */
@@ -655,35 +801,36 @@ Session::locate (nframes_t target_frame, bool with_roll, bool with_flush, bool w
                        pending_locate_roll = with_roll;
                        pending_locate_flush = with_flush;
                        return;
-               } 
+               }
        }
 
-       if (transport_rolling() && !Config->get_auto_play() && !with_roll && !(synced_to_jack() && play_loop)) {
-               realtime_stop (false);
-       } 
+       if (transport_rolling() && (!auto_play_legal || !config.get_auto_play()) && !with_roll && !(synced_to_jack() && play_loop)) {
+               realtime_stop (false, true); // XXX paul - check if the 2nd arg is really correct
+       }
 
-       if ( !with_loop || loop_changing) {
+       if (force || !with_loop || loop_changing) {
+
+               PostTransportWork todo = PostTransportLocate;
 
-               post_transport_work = PostTransportWork (post_transport_work | PostTransportLocate);
-               
                if (with_roll) {
-                       post_transport_work = PostTransportWork (post_transport_work | PostTransportRoll);
-               }
+                       todo = PostTransportWork (todo | PostTransportRoll);
+               } 
 
-               schedule_butler_transport_work ();
+               add_post_transport_work (todo);
+               _butler->schedule_transport_work ();
 
        } else {
 
                /* this is functionally what clear_clicks() does but with a tentative lock */
 
                Glib::RWLock::WriterLock clickm (click_lock, Glib::TRY_LOCK);
-       
+
                if (clickm.locked()) {
-                       
+
                        for (Clicks::iterator i = clicks.begin(); i != clicks.end(); ++i) {
                                delete *i;
                        }
-               
+
                        clicks.clear ();
                }
        }
@@ -692,24 +839,25 @@ Session::locate (nframes_t target_frame, bool with_roll, bool with_flush, bool w
                /* switch from input if we're going to roll */
                if (Config->get_monitoring_model() == HardwareMonitoring) {
 
-                       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-
-                       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                               if ((*i)->record_enabled ()) {
+                       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->record_enabled ()) {
                                        //cerr << "switching from input" << __FILE__ << __LINE__ << endl << endl;
-                                       (*i)->monitor_input (!Config->get_auto_input());
+                                       tr->monitor_input (!config.get_auto_input());
                                }
                        }
                }
        } else {
                /* otherwise we're going to stop, so do the opposite */
                if (Config->get_monitoring_model() == HardwareMonitoring) {
-                       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
 
-                       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                               if ((*i)->record_enabled ()) {
+                       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->record_enabled ()) {
                                        //cerr << "switching to input" << __FILE__ << __LINE__ << endl << endl;
-                                       (*i)->monitor_input (true);
+                                       tr->monitor_input (true);
                                }
                        }
                }
@@ -718,63 +866,106 @@ Session::locate (nframes_t target_frame, bool with_roll, bool with_flush, bool w
        /* cancel looped playback if transport pos outside of loop range */
        if (play_loop) {
                Location* al = _locations.auto_loop_location();
-               
+
                if (al && (_transport_frame < al->start() || _transport_frame > al->end())) {
                        // cancel looping directly, this is called from event handling context
                        set_play_loop (false);
                }
+               else if (al && _transport_frame == al->start()) {
+                       if (with_loop) {
+                               // 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);
+                                       if (tr && tr->record_enabled ()) {
+                                               // tell it we've looped, so it can deal with the record state
+                                               tr->transport_looped(_transport_frame);
+                                       }
+                               }
+                       }
+                       have_looped = true;
+                       TransportLooped(); // EMIT SIGNAL
+               }
        }
-       
+
        loop_changing = false;
+
+       _send_timecode_update = true;
+
+       if (with_mmc) {
+               send_mmc_locate (_transport_frame);
+       }
+
+       Located (); /* EMIT SIGNAL */
 }
 
+/** Set the transport speed.
+ * @param speed New speed
+ * @param abort
+ */
 void
-Session::set_transport_speed (float speed, bool abort)
+Session::set_transport_speed (double speed, bool abort, bool clear_state)
 {
+       DEBUG_TRACE (DEBUG::Transport, string_compose ("Set transport speed to %1, abort = %2 clear_state = %3, current = %4\n", speed, abort, clear_state, _transport_speed));
+
        if (_transport_speed == speed) {
                return;
        }
 
+       _target_transport_speed = fabs(speed);
+
+       /* 8.0 max speed is somewhat arbitrary but based on guestimates regarding disk i/o capability
+          and user needs. We really need CD-style "skip" playback for ffwd and rewind.
+       */
+
        if (speed > 0) {
-               speed = min (8.0f, speed);
+               speed = min (8.0, speed);
        } else if (speed < 0) {
-               speed = max (-8.0f, speed);
+               speed = max (-8.0, speed);
        }
 
        if (transport_rolling() && speed == 0.0) {
 
+               /* we are rolling and we want to stop */
+
                if (Config->get_monitoring_model() == HardwareMonitoring)
                {
-                       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-
-                       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                               if ((*i)->record_enabled ()) {
+                       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->record_enabled ()) {
                                        //cerr << "switching to input" << __FILE__ << __LINE__ << endl << endl;
-                                       (*i)->monitor_input (true);     
+                                       tr->monitor_input (true);
                                }
                        }
                }
 
                if (synced_to_jack ()) {
+                       if (clear_state) {
+                               /* do this here because our response to the slave won't 
+                                  take care of it.
+                               */
+                               _play_range = false;
+                               unset_play_loop ();
+                       }
                        _engine.transport_stop ();
                } else {
                        stop_transport (abort);
                }
-               
+
        } else if (transport_stopped() && speed == 1.0) {
 
-               if (!get_record_enabled() && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) {
-                       return;
-               }
+               /* we are stopped and we want to start rolling at speed 1 */
 
                if (Config->get_monitoring_model() == HardwareMonitoring) {
 
-                       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-
-                       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                               if (Config->get_auto_input() && (*i)->record_enabled ()) {
+                       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 (config.get_auto_input() && tr && tr->record_enabled ()) {
                                        //cerr << "switching from input" << __FILE__ << __LINE__ << endl << endl;
-                                       (*i)->monitor_input (false);    
+                                       tr->monitor_input (false);
                                }
                        }
                }
@@ -787,12 +978,9 @@ Session::set_transport_speed (float speed, bool abort)
 
        } else {
 
-               if (!get_record_enabled() && Config->get_stop_at_session_end() && _transport_frame >= current_end_frame()) {
-                       return;
-               }
-
                if ((synced_to_jack()) && speed != 0.0 && speed != 1.0) {
-                       warning << _("Global varispeed cannot be supported while Ardour is connected to JACK transport control")
+                       warning << string_compose (_("Global varispeed cannot be supported while %1 is connected to JACK transport control"),
+                                                   PROGRAM_NAME)
                                << endmsg;
                        return;
                }
@@ -801,51 +989,65 @@ Session::set_transport_speed (float speed, bool abort)
                        return;
                }
 
-               if (speed > 0.0f && _transport_frame == current_end_frame()) {
+               if (speed > 0.0 && _transport_frame == current_end_frame()) {
                        return;
                }
 
-               if (speed < 0.0f && _transport_frame == 0) {
+               if (speed < 0.0 && _transport_frame == 0) {
                        return;
                }
-               
+
                clear_clicks ();
 
                /* if we are reversing relative to the current speed, or relative to the speed
                   before the last stop, then we have to do extra work.
                */
+               
+               PostTransportWork todo = PostTransportWork (0);
 
-               if ((_transport_speed && speed * _transport_speed < 0.0f) || (_last_transport_speed * speed < 0.0f) || (_last_transport_speed == 0.0f && speed < 0.0f)) {
-                       post_transport_work = PostTransportWork (post_transport_work | PostTransportReverse);
+               if ((_transport_speed && speed * _transport_speed < 0.0) || (_last_transport_speed * speed < 0.0) || (_last_transport_speed == 0.0f && speed < 0.0f)) {
+                       todo = PostTransportWork (todo | PostTransportReverse);
+                       _last_roll_or_reversal_location = _transport_frame;
                }
-               
+
                _last_transport_speed = _transport_speed;
                _transport_speed = speed;
-               
-               boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-               for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-                       if ((*i)->realtime_set_speed ((*i)->speed(), true)) {
-                               post_transport_work = PostTransportWork (post_transport_work | PostTransportSpeed);
+
+               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->realtime_set_speed (tr->speed(), true)) {
+                               todo = PostTransportWork (todo | PostTransportSpeed);
+                               break;
                        }
                }
-               
-               if (post_transport_work & (PostTransportSpeed|PostTransportReverse)) {
-                       schedule_butler_transport_work ();
+
+               if (todo) {
+                       add_post_transport_work (todo);
+                       _butler->schedule_transport_work ();
                }
        }
 }
 
+
+/** Stop the transport.  */
 void
-Session::stop_transport (bool abort)
+Session::stop_transport (bool abort, bool clear_state)
 {
        if (_transport_speed == 0.0f) {
                return;
        }
-       
-       if (actively_recording() && !(transport_sub_state & StopPendingCapture) && 
-           _worst_output_latency > current_block_size) 
-       {
-               
+
+       if (actively_recording() && !(transport_sub_state & StopPendingCapture) && _worst_output_latency > current_block_size) {
+
+               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);
+                       }
+                }
+
                /* 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.
 
@@ -853,107 +1055,125 @@ Session::stop_transport (bool abort)
                   block before the actual end. we'll declick in the subsequent block,
                   and then we'll really be stopped.
                */
-               
-               Event *ev = new Event (Event::StopOnce, Event::Replace, 
+
+               SessionEvent *ev = new SessionEvent (SessionEvent::StopOnce, SessionEvent::Replace,
                                       _transport_frame + _worst_output_latency - current_block_size,
                                       0, 0, abort);
-               
+
                merge_event (ev);
                transport_sub_state |= StopPendingCapture;
                pending_abort = abort;
                return;
-       } 
+       }
 
 
        if ((transport_sub_state & PendingDeclickOut) == 0) {
+
+                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);
+                               }
+                        }
+                }
+                
                transport_sub_state |= PendingDeclickOut;
                /* we'll be called again after the declick */
                pending_abort = abort;
                return;
        }
 
-       realtime_stop (abort);
-       schedule_butler_transport_work ();
+       realtime_stop (abort, clear_state);
+       _butler->schedule_transport_work ();
 }
 
 void
 Session::start_transport ()
 {
        _last_roll_location = _transport_frame;
+       _last_roll_or_reversal_location = _transport_frame;
+       
+       have_looped = false;
 
        /* if record status is Enabled, move it to Recording. if its
-          already Recording, move it to Disabled. 
+          already Recording, move it to Disabled.
        */
 
        switch (record_status()) {
        case Enabled:
-               if (!Config->get_punch_in()) {
+               if (!config.get_punch_in()) {
                        enable_record ();
                }
                break;
 
        case Recording:
-               disable_record (false);
+               if (!play_loop) {
+                       disable_record (false);
+               }
                break;
 
        default:
                break;
        }
 
-       if (!synced_to_jack() || _exporting) {
-               actually_start_transport ();
-       } else {
-               waiting_to_start = true;
-       }
-}
-
-void
-Session::actually_start_transport ()
-{
-       waiting_to_start = false;
-
        transport_sub_state |= PendingDeclickIn;
+
        _transport_speed = 1.0;
-       
-       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-               (*i)->realtime_set_speed ((*i)->speed(), true);
+       _target_transport_speed = 1.0;
+
+       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->realtime_set_speed (tr->speed(), true);
+               }
        }
 
-       send_mmc_in_another_thread (MIDI::MachineControl::cmdDeferredPlay, 0);
-       
+       Timecode::Time time;
+       timecode_time_subframes (_transport_frame, time);
+       _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
+
        TransportStateChange (); /* EMIT SIGNAL */
 }
 
+/** Do any transport work in the audio thread that needs to be done after the
+ * transport thread is finished.  Audio thread, realtime safe.
+ */
 void
 Session::post_transport ()
 {
-       if (post_transport_work & PostTransportAudition) {
-               if (auditioner && auditioner->active()) {
+       PostTransportWork ptw = post_transport_work ();
+
+       if (ptw & PostTransportAudition) {
+               if (auditioner && auditioner->auditioning()) {
                        process_function = &Session::process_audition;
                } else {
                        process_function = &Session::process_with_events;
                }
        }
 
-       if (post_transport_work & PostTransportStop) {
+       if (ptw & PostTransportStop) {
 
                transport_sub_state = 0;
        }
 
-       if (post_transport_work & PostTransportLocate) {
+       if (ptw & PostTransportLocate) {
 
-               if (((Config->get_slave_source() == None && Config->get_auto_play()) && !_exporting) || (post_transport_work & PostTransportRoll)) {
+               if (((!config.get_external_sync() && (auto_play_legal && config.get_auto_play())) && !_exporting) || (ptw & PostTransportRoll)) {
                        start_transport ();
-                       
+
                } else {
                        transport_sub_state = 0;
                }
        }
 
        set_next_event ();
-
-       post_transport_work = PostTransportWork (0);
+       /* XXX is this really safe? shouldn't we just be unsetting the bits that we actually
+          know were handled ?
+       */
+       set_post_transport_work (PostTransportWork (0));
 }
 
 void
@@ -977,38 +1197,58 @@ Session::reset_rf_scale (nframes_t motion)
 }
 
 void
-Session::set_slave_source (SlaveSource src)
+Session::use_sync_source (Slave* new_slave)
 {
-       bool reverse = false;
+       /* Runs in process() context */
+
        bool non_rt_required = false;
 
-       if (_transport_speed) {
-               error << _("please stop the transport before adjusting slave settings") << endmsg;
-               return;
-       }
+       /* XXX this deletion is problematic because we're in RT context */
 
-//     if (src == JACK && Config->get_jack_time_master()) {
-//             return;
-//     }
-       
-       if (_slave) {
-               delete _slave;
-               _slave = 0;
+       delete _slave;
+       _slave = new_slave;
+
+       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()) {
+                       if (tr->realtime_set_speed (tr->speed(), true)) {
+                               non_rt_required = true;
+                       }
+                       tr->set_slaved (_slave != 0);
+               }
        }
 
-       if (_transport_speed < 0.0) {
-               reverse = true;
+       if (non_rt_required) {
+               add_post_transport_work (PostTransportSpeed);
+               _butler->schedule_transport_work ();
        }
 
+       set_dirty();
+}
+
+void
+Session::drop_sync_source ()
+{
+       request_sync_source (0);
+}
+
+void
+Session::switch_to_sync_source (SyncSource src)
+{
+       Slave* new_slave;
+
+       DEBUG_TRACE (DEBUG::Slave, string_compose ("Setting up sync source %1\n", enum_2_string (src)));
+
        switch (src) {
-       case None:
-               stop_transport ();
-               break;
-               
        case MTC:
-               if (_mtc_port) {
+               if (_slave && dynamic_cast<MTC_Slave*>(_slave)) {
+                       return;
+               }
+
+               if (_mtc_input_port) {
                        try {
-                               _slave = new MTC_Slave (*this, *_mtc_port);
+                               new_slave = new MTC_Slave (*this, *_mtc_input_port);
                        }
 
                        catch (failed_constructor& err) {
@@ -1019,110 +1259,102 @@ Session::set_slave_source (SlaveSource src)
                        error << _("No MTC port defined: MTC slaving is impossible.") << endmsg;
                        return;
                }
-               _desired_transport_speed = _transport_speed;
-               break;
-               
-       case JACK:
-               _slave = new JACK_Slave (_engine.jack());
-               _desired_transport_speed = _transport_speed;
                break;
-       };
 
-       Config->set_slave_source (src);
-       
-       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-               if (!(*i)->hidden()) {
-                       if ((*i)->realtime_set_speed ((*i)->speed(), true)) {
-                               non_rt_required = true;
+       case MIDIClock:
+               if (_slave && dynamic_cast<MIDIClock_Slave*>(_slave)) {
+                       return;
+               }
+
+               if (_midi_clock_input_port) {
+                       try {
+                               new_slave = new MIDIClock_Slave (*this, *_midi_clock_input_port, 24);
+                       }
+
+                       catch (failed_constructor& err) {
+                               return;
                        }
-                       (*i)->set_slaved (_slave);
+
+               } else {
+                       error << _("No MIDI Clock port defined: MIDI Clock slaving is impossible.") << endmsg;
+                       return;
                }
-       }
+               break;
 
-       if (reverse) {
-               reverse_diskstream_buffers ();
-       }
+       case JACK:
+               if (_slave && dynamic_cast<JACK_Slave*>(_slave)) {
+                       return;
+               }
 
-       if (non_rt_required) {
-               post_transport_work = PostTransportWork (post_transport_work | PostTransportSpeed);
-               schedule_butler_transport_work ();
-       }
+               new_slave = new JACK_Slave (_engine.jack());
+               break;
+               
+       default:
+               new_slave = 0;
+               break;
+       };
 
-       set_dirty();
+       request_sync_source (new_slave);
 }
 
 void
-Session::reverse_diskstream_buffers ()
+Session::reverse_track_buffers ()
 {
-       post_transport_work = PostTransportWork (post_transport_work | PostTransportReverse);
-       schedule_butler_transport_work ();
+       add_post_transport_work (PostTransportReverse);
+       _butler->schedule_transport_work ();
 }
 
 void
-Session::set_diskstream_speed (Diskstream* stream, float speed)
+Session::set_track_speed (Track* track, double speed)
 {
-       if (stream->realtime_set_speed (speed, false)) {
-               post_transport_work = PostTransportWork (post_transport_work | PostTransportSpeed);
-               schedule_butler_transport_work ();
+       if (track->realtime_set_speed (speed, false)) {
+               add_post_transport_work (PostTransportSpeed);
+               _butler->schedule_transport_work ();
                set_dirty ();
        }
 }
 
 void
-Session::set_audio_range (list<AudioRange>& range)
+Session::unset_play_range ()
 {
-       Event *ev = new Event (Event::SetAudioRange, Event::Add, Event::Immediate, 0, 0.0f);
-       ev->audio_range = range;
-       queue_event (ev);
+       _play_range = false;
+       _clear_event_type (SessionEvent::RangeStop);
+       _clear_event_type (SessionEvent::RangeLocate);
 }
 
 void
-Session::request_play_range (bool yn)
+Session::set_play_range (list<AudioRange>& range, bool leave_rolling)
 {
-       Event* ev = new Event (Event::SetPlayRange, Event::Add, Event::Immediate, 0, 0.0f, yn);
-       queue_event (ev);
-}
+       SessionEvent* ev;
 
-void
-Session::set_play_range (bool yn)
-{
        /* Called from event-processing context */
 
-       if (_play_range != yn) {
-               _play_range = yn;
-               setup_auto_play ();
-
-               if (!_play_range) {
+       unset_play_range ();
+       
+       if (range.empty()) {
+               /* _play_range set to false in unset_play_range()
+                */
+               if (!leave_rolling) {
                        /* stop transport */
-                       Event* ev = new Event (Event::SetTransportSpeed, Event::Add, Event::Immediate, 0, 0.0f, false);
+                       SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0f, false);
                        merge_event (ev);
                }
+               return;
        }
-}
-
-void
-Session::setup_auto_play ()
-{
-       /* Called from event-processing context */
 
-       Event* ev;
-       
-       _clear_event_type (Event::RangeStop);
-       _clear_event_type (Event::RangeLocate);
+       _play_range = true;
 
-       if (!_play_range) {
-               return;
-       }
+       /* cancel loop play */
+       unset_play_loop ();
 
-       list<AudioRange>::size_type sz = current_audio_range.size();
+       list<AudioRange>::size_type sz = range.size();
        
        if (sz > 1) {
                
-               list<AudioRange>::iterator i = current_audio_range.begin(); 
+               list<AudioRange>::iterator i = range.begin(); 
                list<AudioRange>::iterator next;
                
-               while (i != current_audio_range.end()) {
+               while (i != range.end()) {
                        
                        next = i;
                        ++next;
@@ -1138,10 +1370,10 @@ Session::setup_auto_play ()
                                requested_frame = 0;
                        }
                        
-                       if (next == current_audio_range.end()) {
-                               ev = new Event (Event::RangeStop, Event::Add, requested_frame, 0, 0.0f);
+                       if (next == range.end()) {
+                               ev = new SessionEvent (SessionEvent::RangeStop, SessionEvent::Add, requested_frame, 0, 0.0f);
                        } else {
-                               ev = new Event (Event::RangeLocate, Event::Add, requested_frame, (*next).start, 0.0f);
+                               ev = new SessionEvent (SessionEvent::RangeLocate, SessionEvent::Add, requested_frame, (*next).start, 0.0f);
                        }
                        
                        merge_event (ev);
@@ -1150,25 +1382,39 @@ Session::setup_auto_play ()
                }
                
        } else if (sz == 1) {
-               
-               ev = new Event (Event::RangeStop, Event::Add, current_audio_range.front().end, 0, 0.0f);
+
+               ev = new SessionEvent (SessionEvent::RangeStop, SessionEvent::Add, range.front().end, 0, 0.0f);
                merge_event (ev);
                
        } 
 
+       /* save range so we can do auto-return etc. */
+
+       current_audio_range = range;
+
        /* now start rolling at the right place */
-       
-       ev = new Event (Event::LocateRoll, Event::Add, Event::Immediate, current_audio_range.front().start, 0.0f, false);
+
+       ev = new SessionEvent (SessionEvent::LocateRoll, SessionEvent::Add, SessionEvent::Immediate, range.front().start, 0.0f, false);
        merge_event (ev);
+       
+       TransportStateChange ();
 }
 
 void
 Session::request_bounded_roll (nframes_t start, nframes_t end)
 {
-       request_stop ();
-       Event *ev = new Event (Event::StopOnce, Event::Replace, end, Event::Immediate, 0.0);
+       AudioRange ar (start, end, 0);
+       list<AudioRange> lar;
+
+       lar.push_back (ar);
+       request_play_range (&lar, true);
+}
+void
+Session::request_roll_at_and_return (nframes_t start, nframes_t return_to)
+{
+       SessionEvent *ev = new SessionEvent (SessionEvent::LocateRollLocate, SessionEvent::Add, SessionEvent::Immediate, return_to, 1.0);
+       ev->target2_frame = start;
        queue_event (ev);
-       request_locate (start, true);
 }
 
 void
@@ -1179,15 +1425,15 @@ Session::engine_halted ()
        /* there will be no more calls to process(), so
           we'd better clean up for ourselves, right now.
 
-          but first, make sure the butler is out of 
+          but first, make sure the butler is out of
           the picture.
        */
 
-       g_atomic_int_set (&butler_should_do_transport_work, 0);
-       post_transport_work = PostTransportWork (0);
-       stop_butler ();
-       
-       realtime_stop (false);
+       g_atomic_int_set (&_butler->should_do_transport_work, 0);
+       set_post_transport_work (PostTransportWork (0));
+       _butler->stop ();
+
+       realtime_stop (false, true);
        non_realtime_stop (false, 0, ignored);
        transport_sub_state = 0;
 
@@ -1198,57 +1444,81 @@ Session::engine_halted ()
 void
 Session::xrun_recovery ()
 {
-       if (Config->get_stop_recording_on_xrun() && actively_recording()) {
+       // can't cast away volatile so copy and emit that
+       nframes64_t tframe = _transport_frame;
+       Xrun (tframe); //EMIT SIGNAL
 
-                HaltOnXrun (); /* EMIT SIGNAL */
+       if (Config->get_stop_recording_on_xrun() && actively_recording()) {
 
                /* it didn't actually halt, but we need
                   to handle things in the same way.
                */
 
                engine_halted();
-       } 
+       }
+}
+
+void
+Session::route_processors_changed (RouteProcessorChange c)
+{
+       if (c.type == RouteProcessorChange::MeterPointChange) {
+               return;
+       }
+
+       update_latency_compensation (false, false);
+       resort_routes ();
 }
 
 void
 Session::update_latency_compensation (bool with_stop, bool abort)
 {
        bool update_jack = false;
+       PostTransportWork ptw;
 
        if (_state_of_the_state & Deletion) {
                return;
        }
 
        _worst_track_latency = 0;
+       ptw = post_transport_work();
+
+#undef DEBUG_LATENCY
+#ifdef DEBUG_LATENCY
+       cerr << "\n---------------------------------\nUPDATE LATENCY\n";
+#endif
 
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+
                if (with_stop) {
-                       (*i)->handle_transport_stopped (abort, (post_transport_work & PostTransportLocate), 
-                                                       (!(post_transport_work & PostTransportLocate) || pending_locate_flush));
+                       (*i)->handle_transport_stopped (abort, (ptw & PostTransportLocate), (!(ptw & PostTransportLocate) || pending_locate_flush));
                }
 
-               nframes_t old_latency = (*i)->signal_latency ();
+               nframes_t old_latency = (*i)->output()->signal_latency ();
                nframes_t track_latency = (*i)->update_total_latency ();
 
                if (old_latency != track_latency) {
+                       (*i)->input()->update_port_total_latencies ();
+                       (*i)->output()->update_port_total_latencies ();
                        update_jack = true;
                }
-               
-               if (!(*i)->hidden() && ((*i)->active())) {
+
+               if (!(*i)->is_hidden() && ((*i)->active())) {
                        _worst_track_latency = max (_worst_track_latency, track_latency);
                }
        }
 
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               (*i)->set_latency_delay (_worst_track_latency);
+       if (update_jack) {
+               _engine.update_total_latencies ();
        }
 
-       /* tell JACK to play catch up */
+#ifdef DEBUG_LATENCY
+       cerr << "\tworst was " << _worst_track_latency << endl;
+#endif
 
-       if (update_jack) {
-               _engine.update_total_latencies ();
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               (*i)->set_latency_delay (_worst_track_latency);
        }
 
        set_worst_io_latencies ();
@@ -1256,15 +1526,49 @@ Session::update_latency_compensation (bool with_stop, bool abort)
        /* reflect any changes in latencies into capture offsets
        */
        
-       boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
+       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->set_capture_offset ();
+               }
+       }
+}
+
+void
+Session::allow_auto_play (bool yn)
+{
+       auto_play_legal = yn;
+}
+
+void
+Session::reset_jack_connection (jack_client_t* jack)
+{
+       JACK_Slave* js;
 
-       for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
-               (*i)->set_capture_offset ();
+       if (_slave && ((js = dynamic_cast<JACK_Slave*> (_slave)) != 0)) {
+               js->reset_client (jack);
        }
 }
 
+bool
+Session::maybe_stop (nframes_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 ()) {
+                       _engine.transport_stop ();
+               } else if (!synced_to_jack ()) {
+                       stop_transport ();
+               }
+               return true;
+       }
+       return false;
+}
+
 void
-Session::update_latency_compensation_proxy (void* ignored)
+Session::send_mmc_locate (nframes64_t t)
 {
-       update_latency_compensation (false, false);
+       Timecode::Time time;
+       timecode_time_subframes (t, time);
+       _mmc->send (MIDI::MachineControlCommand (time));
 }