(1) push a locate all the way through the processing heirarchy so that MIDI output...
[ardour.git] / libs / ardour / session_transport.cc
index 7a378e1a01be6b64a5586ded867510fb8e03f740..48b84c492c84ff50ffc1ecc65f3d8538a58cfdc5 100644 (file)
 #include <cerrno>
 #include <unistd.h>
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 
 #include "pbd/undo.h"
 #include "pbd/error.h"
@@ -30,6 +34,7 @@
 
 #include "midi++/mmc.h"
 #include "midi++/port.h"
+#include "midi++/manager.h"
 
 #include "ardour/ardour.h"
 #include "ardour/audioengine.h"
@@ -39,6 +44,7 @@
 #include "ardour/location.h"
 #include "ardour/session.h"
 #include "ardour/slave.h"
+#include "ardour/operations.h"
 
 #include "i18n.h"
 
@@ -105,6 +111,20 @@ Session::request_transport_speed (double speed)
        queue_event (ev);
 }
 
+/** Request a new transport speed, but if the speed parameter is exactly zero then use
+ *  a very small +ve value to prevent the transport actually stopping.  This method should
+ *  be used by callers who are varying transport speed but don't ever want to stop it.
+ */
+void
+Session::request_transport_speed_nonzero (double speed)
+{
+       if (speed == 0) {
+               speed = DBL_EPSILON;
+       }
+
+       request_transport_speed (speed);
+}
+
 void
 Session::request_track_speed (Track* tr, double speed)
 {
@@ -122,7 +142,7 @@ Session::request_stop (bool abort, bool clear_state)
 }
 
 void
-Session::request_locate (nframes_t target_frame, bool with_roll)
+Session::request_locate (framepos_t target_frame, bool with_roll)
 {
        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));
@@ -130,7 +150,7 @@ Session::request_locate (nframes_t target_frame, bool with_roll)
 }
 
 void
-Session::force_locate (nframes64_t target_frame, bool with_roll)
+Session::force_locate (framepos_t target_frame, bool with_roll)
 {
        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));
@@ -141,7 +161,7 @@ void
 Session::request_play_loop (bool yn, bool leave_rolling)
 {
        SessionEvent* ev;
-       Location *location = _locations.auto_loop_location();
+       Location *location = _locations->auto_loop_location();
 
        if (location == 0 && yn) {
                error << _("Cannot loop - no loop range defined")
@@ -181,17 +201,20 @@ Session::realtime_stop (bool abort, bool clear_state)
 
        /* assume that when we start, we'll be moving forwards */
 
-       // FIXME: where should this really be? [DR]
-       //send_full_time_code();
-       deliver_mmc (MIDI::MachineControl::cmdStop, 0);
-       deliver_mmc (MIDI::MachineControl::cmdLocate, _transport_frame);
-
        if (_transport_speed < 0.0f) {
                todo = (PostTransportWork (todo | PostTransportStop | PostTransportReverse));
        } else {
                todo = PostTransportWork (todo | PostTransportStop);
        }
 
+       /* call routes */
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin (); i != r->end(); ++i) {
+               (*i)->realtime_handle_transport_stopped ();
+       }
+
        if (actively_recording()) {
 
                /* move the transport position back to where the
@@ -199,14 +222,14 @@ Session::realtime_stop (bool abort, bool clear_state)
                   past that point to pick up delayed input (and/or to delick)
                */
 
-                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);
-                }
+               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);
+               }
 
                /* the duration change is not guaranteed to have happened, but is likely */
 
@@ -229,19 +252,31 @@ Session::realtime_stop (bool abort, bool clear_state)
        _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 */
+       /* 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()) {
                waiting_for_sync_offset = true;
        }
 
-       transport_sub_state = ((!config.get_external_sync()&& config.get_auto_return()) ? AutoReturning : 0);
+       transport_sub_state = 0;
+}
+
+void
+Session::realtime_locate ()
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               (*i)->realtime_locate ();
+       }
 }
 
 void
@@ -257,7 +292,28 @@ Session::butler_transport_work ()
        ptw = post_transport_work();
 
        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) {
+                       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 (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 ();
+                       }
+               }
+       }
+
        if (ptw & PostTransportCurveRealloc) {
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                        (*i)->curve_reallocate();
@@ -407,11 +463,18 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        reset_rf_scale (0);
 
        if (did_record) {
-               begin_reversible_command ("capture");
+               begin_reversible_command (Operations::capture);
                _have_captured = true;
        }
 
        DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: DS stop\n"));
+
+       if (abort && did_record) {
+               /* no reason to save the session file when we remove sources
+                */
+               _state_of_the_state = StateOfTheState (_state_of_the_state|InCleanup);
+       }
+
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                if (tr) {
@@ -419,6 +482,10 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
                }
        }
 
+       if (abort && did_record) {
+               _state_of_the_state = StateOfTheState (_state_of_the_state & ~InCleanup);                
+       }
+
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
@@ -432,7 +499,11 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        }
 
        if (_engine.running()) {
-               update_latency_compensation (true, abort);
+               PostTransportWork ptw = post_transport_work ();
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       (*i)->nonrealtime_handle_transport_stopped (abort, (ptw & PostTransportLocate), (!(ptw & PostTransportLocate) || pending_locate_flush));
+               }
+               update_latency_compensation ();
        }
 
        bool const auto_return_enabled =
@@ -450,7 +521,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
                if ((auto_return_enabled || synced_to_jack() || _requested_return_frame >= 0) &&
                    !(ptw & PostTransportLocate)) {
 
-                        /* no explicit locate queued */
+                       /* no explicit locate queued */
 
                        bool do_locate = false;
 
@@ -472,7 +543,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 
                                                if (!synced_to_jack()) {
 
-                                                       Location *location = _locations.auto_loop_location();
+                                                       Location *location = _locations->auto_loop_location();
                                                        
                                                        if (location != 0) {
                                                                _transport_frame = location->start();
@@ -537,9 +608,12 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 
        have_looped = false;
 
-       send_full_time_code (0);
-       deliver_mmc (MIDI::MachineControl::cmdStop, 0);
-       deliver_mmc (MIDI::MachineControl::cmdLocate, _transport_frame);
+       send_full_time_code (_transport_frame);
+
+       if (!dynamic_cast<MTC_Slave*>(_slave)) {
+               MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
+               send_mmc_locate (_transport_frame);
+       }
 
        if ((ptw & PostTransportLocate) && get_record_enabled()) {
                /* capture start has been changed, so save pending state */
@@ -547,9 +621,9 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
                saved = true;
        }
 
-        /* always try to get rid of this */
+       /* always try to get rid of this */
 
-        remove_pending_capture_state ();
+       remove_pending_capture_state ();
 
        /* save the current state of things if appropriate */
 
@@ -562,9 +636,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
                play_loop = false;
        }
 
-       // can't cast away volatile so copy and emit that
-       nframes64_t tframe = _transport_frame;
-       PositionChanged (tframe); /* EMIT SIGNAL */
+       PositionChanged (_transport_frame); /* EMIT SIGNAL */
        TransportStateChange (); /* EMIT SIGNAL */
 
        /* and start it up again if relevant */
@@ -622,16 +694,15 @@ Session::set_play_loop (bool yn)
 
        Location *loc;
 
-       if (yn == play_loop || (actively_recording() && yn) || (loc = _locations.auto_loop_location()) == 0) {
+       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 << string_compose (_("Seamless looping cannot be supported while %1 is using JACK transport.\n"
-                                             "Recommend changing the configured options"), PROGRAM_NAME)
+               warning << string_compose (
+                       _("Seamless looping cannot be supported while %1 is using JACK transport.\n"
+                         "Recommend changing the configured options"), PROGRAM_NAME)
                        << endmsg;
                return;
        }
@@ -695,12 +766,12 @@ Session::flush_all_inserts ()
 }
 
 void
-Session::start_locate (nframes64_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 with_loop, bool force)
 {
        if (synced_to_jack()) {
 
                double sp;
-               nframes64_t pos;
+               framepos_t pos;
 
                _slave->speed_and_position (sp, pos);
 
@@ -724,7 +795,7 @@ Session::start_locate (nframes64_t target_frame, bool with_roll, bool with_flush
 }
 
 int
-Session::micro_locate (nframes_t distance)
+Session::micro_locate (framecnt_t distance)
 {
        boost::shared_ptr<RouteList> rl = routes.reader();
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
@@ -745,8 +816,9 @@ Session::micro_locate (nframes_t distance)
        return 0;
 }
 
+/** @param with_mmc true to send a MMC locate command when the locate is done */
 void
-Session::locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force)
+Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool with_loop, bool force, bool with_mmc)
 {
        if (actively_recording() && !with_loop) {
                return;
@@ -757,17 +829,11 @@ Session::locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool
                        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)) {
+       if (_transport_speed) {
                /* schedule a declick. we'll be called again when its done */
 
                if (!(transport_sub_state & PendingDeclickOut)) {
@@ -779,8 +845,27 @@ Session::locate (nframes64_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;
+       timecode_time(_transport_frame, transmitting_timecode_time);
+       outbound_mtc_timecode_frame = _transport_frame;
+       next_quarter_frame_to_send = 0;
+
+       /* do "stopped" stuff if:
+        *
+        * we are rolling AND
+        *    no autoplay in effect AND
+         *       we're not going to keep rolling after the locate AND
+         *           !(playing a loop with JACK sync)
+         *
+        */
+                 
        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
+       } else {
+               /* otherwise tell the world that we located */
+               realtime_locate ();
        }
 
        if (force || !with_loop || loop_changing) {
@@ -813,34 +898,18 @@ Session::locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool
        if (with_roll) {
                /* switch from input if we're going to roll */
                if (Config->get_monitoring_model() == HardwareMonitoring) {
-
-                       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;
-                                       tr->monitor_input (!config.get_auto_input());
-                               }
-                       }
+                       set_track_monitor_input_status (!config.get_auto_input());
                }
        } else {
                /* otherwise we're going to stop, so do the opposite */
                if (Config->get_monitoring_model() == HardwareMonitoring) {
-
-                       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;
-                                       tr->monitor_input (true);
-                               }
-                       }
+                       set_track_monitor_input_status (true);
                }
        }
 
        /* cancel looped playback if transport pos outside of loop range */
        if (play_loop) {
-               Location* al = _locations.auto_loop_location();
+               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
@@ -868,12 +937,16 @@ Session::locate (nframes64_t target_frame, bool with_roll, bool with_flush, bool
 
        _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
+ *  Called from the process thread.
+ *  @param speed New speed
  */
 void
 Session::set_transport_speed (double speed, bool abort, bool clear_state)
@@ -900,16 +973,8 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state)
 
                /* we are rolling and we want to stop */
 
-               if (Config->get_monitoring_model() == HardwareMonitoring)
-               {
-                       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;
-                                       tr->monitor_input (true);
-                               }
-                       }
+               if (Config->get_monitoring_model() == HardwareMonitoring) {
+                       set_track_monitor_input_status (true);
                }
 
                if (synced_to_jack ()) {
@@ -924,21 +989,15 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state)
                } else {
                        stop_transport (abort);
                }
+               
+               unset_play_loop ();
 
        } else if (transport_stopped() && speed == 1.0) {
 
                /* we are stopped and we want to start rolling at speed 1 */
 
-               if (Config->get_monitoring_model() == HardwareMonitoring) {
-
-                       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;
-                                       tr->monitor_input (false);
-                               }
-                       }
+               if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
+                       set_track_monitor_input_status (false);
                }
 
                if (synced_to_jack()) {
@@ -948,10 +1007,13 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state)
                }
 
        } else {
+               
+               /* not zero, not 1.0 ... varispeed */
 
                if ((synced_to_jack()) && speed != 0.0 && speed != 1.0) {
-                       warning << string_compose (_("Global varispeed cannot be supported while %1 is connected to JACK transport control"),
-                                                   PROGRAM_NAME)
+                       warning << string_compose (
+                               _("Global varispeed cannot be supported while %1 is connected to JACK transport control"),
+                               PROGRAM_NAME)
                                << endmsg;
                        return;
                }
@@ -989,7 +1051,6 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state)
                        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;
                        }
                }
 
@@ -997,6 +1058,8 @@ Session::set_transport_speed (double speed, bool abort, bool clear_state)
                        add_post_transport_work (todo);
                        _butler->schedule_transport_work ();
                }
+               
+               TransportStateChange (); /* EMIT SIGNAL */
        }
 }
 
@@ -1009,7 +1072,7 @@ Session::stop_transport (bool abort, bool clear_state)
                return;
        }
 
-       if (actively_recording() && !(transport_sub_state & StopPendingCapture) && _worst_output_latency > current_block_size) {
+       if (actively_recording() && !(transport_sub_state & StopPendingCapture) && worst_input_latency() > current_block_size) {
 
                boost::shared_ptr<RouteList> rl = routes.reader();
                for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
@@ -1017,7 +1080,7 @@ Session::stop_transport (bool abort, bool clear_state)
                        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.
@@ -1028,8 +1091,8 @@ Session::stop_transport (bool abort, bool clear_state)
                */
 
                SessionEvent *ev = new SessionEvent (SessionEvent::StopOnce, SessionEvent::Replace,
-                                      _transport_frame + _worst_output_latency - current_block_size,
-                                      0, 0, abort);
+                                                    _transport_frame + _worst_input_latency - current_block_size,
+                                                    0, 0, abort);
 
                merge_event (ev);
                transport_sub_state |= StopPendingCapture;
@@ -1037,19 +1100,18 @@ Session::stop_transport (bool abort, bool clear_state)
                return;
        }
 
-
        if ((transport_sub_state & PendingDeclickOut) == 0) {
 
-                if (!(transport_sub_state & StopPendingCapture)) {
+               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;
@@ -1060,9 +1122,12 @@ Session::stop_transport (bool abort, bool clear_state)
        _butler->schedule_transport_work ();
 }
 
+/** Called from the process thread */
 void
 Session::start_transport ()
 {
+       DEBUG_TRACE (DEBUG::Transport, "start_transport\n");
+
        _last_roll_location = _transport_frame;
        _last_roll_or_reversal_location = _transport_frame;
        
@@ -1100,9 +1165,14 @@ Session::start_transport ()
                if (tr) {
                        tr->realtime_set_speed (tr->speed(), true);
                }
+               (*i)->automation_snapshot (_transport_frame, true);
        }
 
-       deliver_mmc(MIDI::MachineControl::cmdDeferredPlay, _transport_frame);
+       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));
+       }
 
        TransportStateChange (); /* EMIT SIGNAL */
 }
@@ -1146,7 +1216,7 @@ Session::post_transport ()
 }
 
 void
-Session::reset_rf_scale (nframes_t motion)
+Session::reset_rf_scale (framecnt_t motion)
 {
        cumulative_rf_motion += motion;
 
@@ -1215,17 +1285,11 @@ Session::switch_to_sync_source (SyncSource src)
                        return;
                }
 
-               if (_mtc_port) {
-                       try {
-                               new_slave = new MTC_Slave (*this, *_mtc_port);
-                       }
-
-                       catch (failed_constructor& err) {
-                               return;
-                       }
+               try {
+                       new_slave = new MTC_Slave (*this, *MIDI::Manager::instance()->mtc_input_port());
+               }
 
-               } else {
-                       error << _("No MTC port defined: MTC slaving is impossible.") << endmsg;
+               catch (failed_constructor& err) {
                        return;
                }
                break;
@@ -1235,17 +1299,11 @@ Session::switch_to_sync_source (SyncSource src)
                        return;
                }
 
-               if (_midi_clock_port) {
-                       try {
-                               new_slave = new MIDIClock_Slave (*this, *_midi_clock_port, 24);
-                       }
-
-                       catch (failed_constructor& err) {
-                               return;
-                       }
-
-               } else {
-                       error << _("No MIDI Clock port defined: MIDI Clock slaving is impossible.") << endmsg;
+               try {
+                       new_slave = new MIDIClock_Slave (*this, *MIDI::Manager::instance()->midi_clock_input_port(), 24);
+               }
+               
+               catch (failed_constructor& err) {
                        return;
                }
                break;
@@ -1255,6 +1313,10 @@ Session::switch_to_sync_source (SyncSource src)
                        return;
                }
 
+               if (config.get_video_pullup() != 0.0f) {
+                       return;
+               }
+
                new_slave = new JACK_Slave (_engine.jack());
                break;
                
@@ -1331,7 +1393,7 @@ Session::set_play_range (list<AudioRange>& range, bool leave_rolling)
                        /* locating/stopping is subject to delays for declicking.
                         */
                        
-                       nframes_t requested_frame = (*i).end;
+                       framepos_t requested_frame = i->end;
                        
                        if (requested_frame > current_block_size) {
                                requested_frame -= current_block_size;
@@ -1370,7 +1432,7 @@ Session::set_play_range (list<AudioRange>& range, bool leave_rolling)
 }
 
 void
-Session::request_bounded_roll (nframes_t start, nframes_t end)
+Session::request_bounded_roll (framepos_t start, framepos_t end)
 {
        AudioRange ar (start, end, 0);
        list<AudioRange> lar;
@@ -1379,7 +1441,7 @@ Session::request_bounded_roll (nframes_t start, nframes_t end)
        request_play_range (&lar, true);
 }
 void
-Session::request_roll_at_and_return (nframes_t start, nframes_t return_to)
+Session::request_roll_at_and_return (framepos_t start, framepos_t return_to)
 {
        SessionEvent *ev = new SessionEvent (SessionEvent::LocateRollLocate, SessionEvent::Add, SessionEvent::Immediate, return_to, 1.0);
        ev->target2_frame = start;
@@ -1413,9 +1475,7 @@ Session::engine_halted ()
 void
 Session::xrun_recovery ()
 {
-       // can't cast away volatile so copy and emit that
-       nframes64_t tframe = _transport_frame;
-       Xrun (tframe); //EMIT SIGNAL
+       Xrun (_transport_frame); /* EMIT SIGNAL */
 
        if (Config->get_stop_recording_on_xrun() && actively_recording()) {
 
@@ -1434,102 +1494,70 @@ Session::route_processors_changed (RouteProcessorChange c)
                return;
        }
 
-       update_latency_compensation (false, false);
+       update_latency_compensation ();
        resort_routes ();
+
+       set_dirty ();
 }
 
 void
-Session::update_latency_compensation (bool with_stop, bool abort)
+Session::allow_auto_play (bool yn)
 {
-       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, (ptw & PostTransportLocate), (!(ptw & PostTransportLocate) || pending_locate_flush));
-               }
-
-               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)->is_hidden() && ((*i)->active())) {
-                       _worst_track_latency = max (_worst_track_latency, track_latency);
-               }
-       }
-
-       if (update_jack) {
-               _engine.update_total_latencies ();
-       }
+       auto_play_legal = yn;
+}
 
-#ifdef DEBUG_LATENCY
-       cerr << "\tworst was " << _worst_track_latency << endl;
-#endif
+void
+Session::reset_jack_connection (jack_client_t* jack)
+{
+       JACK_Slave* js;
 
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               (*i)->set_latency_delay (_worst_track_latency);
+       if (_slave && ((js = dynamic_cast<JACK_Slave*> (_slave)) != 0)) {
+               js->reset_client (jack);
        }
+}
 
-       set_worst_io_latencies ();
-
-       /* reflect any changes in latencies into capture offsets
-       */
-       
-       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 ();
+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 ()) {
+                       _engine.transport_stop ();
+               } else if (!synced_to_jack ()) {
+                       stop_transport ();
                }
+               return true;
        }
+       return false;
 }
 
 void
-Session::allow_auto_play (bool yn)
+Session::send_mmc_locate (framepos_t t)
 {
-       auto_play_legal = yn;
+       Timecode::Time time;
+       timecode_time_subframes (t, time);
+       MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (time));
 }
 
+/** Ask the transport to not send timecode until further notice.  The suspension
+ *  will come into effect some finite time after this call, and timecode_transmission_suspended()
+ *  should be checked by the caller to find out when.
+ */
 void
-Session::reset_jack_connection (jack_client_t* jack)
+Session::request_suspend_timecode_transmission ()
 {
-       JACK_Slave* js;
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetTimecodeTransmission, SessionEvent::Add, SessionEvent::Immediate, 0, 0, false);
+       queue_event (ev);
+}
 
-       if (_slave && ((js = dynamic_cast<JACK_Slave*> (_slave)) != 0)) {
-               js->reset_client (jack);
-       }
+void
+Session::request_resume_timecode_transmission ()
+{
+       SessionEvent* ev = new SessionEvent (SessionEvent::SetTimecodeTransmission, SessionEvent::Add, SessionEvent::Immediate, 0, 0, true);
+       queue_event (ev);
 }
 
 bool
-Session::maybe_stop (nframes_t limit)
+Session::timecode_transmission_suspended () const
 {
-       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;
+       return g_atomic_int_get (&_suspend_timecode_transmission) == 1;
 }