Safe-guard non-rt-safe sidechain operations
[ardour.git] / libs / ardour / route.cc
index 34c2b2f8239ef456edaf2501c6ff5e8aa050c9fa..41a14b096e5127835941a95c26f18c88b4ecc14a 100644 (file)
@@ -47,6 +47,8 @@
 #include "ardour/capturing_processor.h"
 #include "ardour/debug.h"
 #include "ardour/delivery.h"
+#include "ardour/disk_reader.h"
+#include "ardour/disk_writer.h"
 #include "ardour/event_type_map.h"
 #include "ardour/gain_control.h"
 #include "ardour/internal_return.h"
@@ -55,6 +57,8 @@
 #include "ardour/delayline.h"
 #include "ardour/midi_buffer.h"
 #include "ardour/midi_port.h"
+#include "ardour/midi_track.h"
+#include "ardour/monitor_control.h"
 #include "ardour/monitor_processor.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
@@ -62,6 +66,7 @@
 #include "ardour/parameter_descriptor.h"
 #include "ardour/phase_control.h"
 #include "ardour/plugin_insert.h"
+#include "ardour/polarity_processor.h"
 #include "ardour/port.h"
 #include "ardour/port_insert.h"
 #include "ardour/processor.h"
@@ -92,29 +97,25 @@ Route::Route (Session& sess, string name, PresentationInfo::Flag flag, DataType
        , Muteable (sess, name)
        , _active (true)
        , _signal_latency (0)
-       , _signal_latency_at_amp_position (0)
-       , _signal_latency_at_trim_position (0)
-       , _initial_delay (0)
-       , _roll_delay (0)
+       , _disk_io_point (DiskIOPreFader)
        , _pending_process_reorder (0)
        , _pending_signals (0)
-       , _pending_declick (true)
        , _meter_point (MeterPostFader)
        , _pending_meter_point (MeterPostFader)
        , _meter_type (MeterPeak)
        , _denormal_protection (false)
        , _recordable (true)
-       , _silent (false)
-       , _declickable (false)
        , _have_internal_generator (false)
        , _default_type (default_type)
+       , _loop_location (NULL)
        , _track_number (0)
+       , _strict_io (false)
        , _in_configure_processors (false)
        , _initial_io_setup (false)
        , _in_sidechain_setup (false)
-       , _strict_io (false)
        , _custom_meter_position_noted (false)
        , _pinmgr_proxy (0)
+       , _patch_selector_dialog (0)
 {
        processor_max_streams.reset();
 }
@@ -187,16 +188,17 @@ Route::init ()
        _amp.reset (new Amp (_session, X_("Fader"), _gain_control, true));
        add_processor (_amp, PostFader);
 
+       _polarity.reset (new PolarityProcessor (_session, _phase_control));
+       _polarity->activate();
+       _polarity->set_owner (this);
+
        if (is_monitor ()) {
                _amp->set_display_name (_("Monitor"));
        }
 
-#if 0 // not used - just yet
        if (!is_master() && !is_monitor() && !is_auditioner()) {
-               _delayline.reset (new DelayLine (_session, _name));
-               add_processor (_delayline, PreFader);
+               _delayline.reset (new DelayLine (_session, name ()));
        }
-#endif
 
        /* and input trim */
 
@@ -270,14 +272,14 @@ Route::~Route ()
 }
 
 string
-Route::ensure_track_or_route_name(string name, Session &session)
+Route::ensure_track_or_route_name (string newname) const
 {
-       string newname = name;
-
-       while (!session.io_name_is_legal (newname)) {
+       while (!_session.io_name_is_legal (newname)) {
                newname = bump_name_once (newname, ' ');
+               if (newname == name()) {
+                       break;
+               }
        }
-
        return newname;
 }
 
@@ -288,146 +290,161 @@ Route::set_trim (gain_t val, Controllable::GroupControlDisposition /* group over
        // _trim_control->route_set_value (val);
 }
 
-void
-Route::maybe_declick (BufferSet&, framecnt_t, int)
-{
-       /* this is the "bus" implementation and they never declick.
-        */
-       return;
-}
-
 /** Process this route for one (sub) cycle (process thread)
  *
  * @param bufs Scratch buffers to use for the signal path
- * @param start_frame Initial transport frame
- * @param end_frame Final transport frame
- * @param nframes Number of frames to output (to ports)
+ * @param start_sample Initial transport sample
+ * @param end_sample Final transport sample
+ * @param nframes Number of samples to output (to ports)
  *
- * Note that (end_frame - start_frame) may not be equal to nframes when the
+ * Note that (end_sample - start_sample) may not be equal to nframes when the
  * transport speed isn't 1.0 (eg varispeed).
  */
 void
 Route::process_output_buffers (BufferSet& bufs,
-                              framepos_t start_frame, framepos_t end_frame, pframes_t nframes,
-                              int declick, bool gain_automation_ok)
+                              samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes,
+                              bool gain_automation_ok, bool run_disk_reader)
 {
        /* Caller must hold process lock */
        assert (!AudioEngine::instance()->process_lock().trylock());
 
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        if (!lm.locked()) {
-               // can this actually happen? functions calling process_output_buffers()
-               // already take a reader-lock.
+               // can this actually happen?
+               // Places that need a WriterLock on (_processor_lock) must also take the process-lock.
                bufs.silence (nframes, 0);
+               assert (0); // ...one way to find out.
                return;
        }
 
-       _mute_control->automation_run (start_frame, nframes);
+       /* We should offset the route-owned ctrls by the given latency, however
+        * this only affects Mute. Other route-owned controls (solo, polarity..)
+        * are not automatable.
+        *
+        * Mute has its own issues since there's not a single mute-point,
+        * but in general
+        */
+       automation_run (start_sample, nframes);
+
+       if (_pannable) {
+               _pannable->automation_run (start_sample + _signal_latency, nframes);
+       }
 
        /* figure out if we're going to use gain automation */
        if (gain_automation_ok) {
                _amp->set_gain_automation_buffer (_session.gain_automation_buffer ());
                _amp->setup_gain_automation (
-                               start_frame + _signal_latency_at_amp_position,
-                               end_frame + _signal_latency_at_amp_position,
+                               start_sample + _amp->output_latency (),
+                               end_sample + _amp->output_latency (),
                                nframes);
 
                _trim->set_gain_automation_buffer (_session.trim_automation_buffer ());
                _trim->setup_gain_automation (
-                               start_frame + _signal_latency_at_trim_position,
-                               end_frame + _signal_latency_at_trim_position,
+                               start_sample + _trim->output_latency (),
+                               end_sample + _trim->output_latency (),
                                nframes);
-       } else {
-               _amp->apply_gain_automation (false);
-               _trim->apply_gain_automation (false);
        }
 
-       /* Tell main outs what to do about monitoring.  We do this so that
-          on a transition between monitoring states we get a de-clicking gain
-          change in the _main_outs delivery, if config.get_use_monitor_fades()
-          is true.
-
-          We override this in the case where we have an internal generator.
-       */
-       bool silence = _have_internal_generator ? false : (monitoring_state () == MonitoringSilence);
-
-       _main_outs->no_outs_cuz_we_no_monitor (silence);
-
-       /* -------------------------------------------------------------------------------------------
-          GLOBAL DECLICK (for transport changes etc.)
-          ----------------------------------------------------------------------------------------- */
-
-       maybe_declick (bufs, nframes, declick);
-       _pending_declick = 0;
-
-       /* -------------------------------------------------------------------------------------------
-          DENORMAL CONTROL/PHASE INVERT
-          ----------------------------------------------------------------------------------------- */
-
-       if (!_phase_control->none()) {
-
-               int chn = 0;
-
-               if (_denormal_protection || Config->get_denormal_protection()) {
-
-                       for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i, ++chn) {
-                               Sample* const sp = i->data();
+       /* We align the playhead to output. The user hears what the clock says:
+        * When the playhead/clock says 1:00:00:00 the user will hear the audio sample
+        * at 1:00:00:00. sample_start will be [sample at] 1:00:00:00
+        *
+        * e.g. clock says Time T = 0,  sample_start = 0
+        * Disk-read(play) -> latent-plugin (+10) -> fader-automation -> output (+5)
+        * -> total playback latency "disk -> out" is 15.
+        * -> at Time T= -15, the disk-reader reads sample T=0.
+        * By the Time T=0 is reached (dt=15 later) that sample is audible.
+        */
 
-                               if (_phase_control->inverted (chn)) {
-                                       for (pframes_t nx = 0; nx < nframes; ++nx) {
-                                               sp[nx]  = -sp[nx];
-                                               sp[nx] += 1.0e-27f;
-                                       }
-                               } else {
-                                       for (pframes_t nx = 0; nx < nframes; ++nx) {
-                                               sp[nx] += 1.0e-27f;
-                                       }
-                               }
-                       }
+       const double speed = (is_auditioner() ? 1.0 : _session.transport_speed ());
 
-               } else {
+       const sampleoffset_t latency_offset = _signal_latency + _output->latency ();
+       if (speed < 0) {
+               /* when rolling backwards this can become negative */
+               start_sample -= latency_offset;
+               end_sample -= latency_offset;
+       } else {
+               start_sample += latency_offset;
+               end_sample += latency_offset;
+       }
 
-                       for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i, ++chn) {
-                               Sample* const sp = i->data();
+       /* Note: during intial pre-roll 'start_sample' as passed as argument can be negative.
+        * Functions calling process_output_buffers() will set  "run_disk_reader"
+        * to false if the pre-roll count-down is larger than playback_latency ().
+        *
+        * playback_latency() is guarnteed to be <= _signal_latency + _output->latency ()
+        */
+       assert (!_disk_reader || !run_disk_reader || start_sample >= 0 || speed < 0);
 
-                               if (_phase_control->inverted (chn)) {
-                                       for (pframes_t nx = 0; nx < nframes; ++nx) {
-                                               sp[nx] = -sp[nx];
-                                       }
-                               }
-                       }
+       /* however the disk-writer may need to pick up output from other tracks
+        * during pre-roll (in particular if this route has latent effects after the disk).
+        *
+        * e.g. track 1 play -> latency A --port--> track2 capture -> latency B ---> out
+        * total pre-roll = A + B.
+        *
+        * Note the disk-writer has built-in overlap detection (it's safe to run it early)
+        * given that
+        */
+       bool run_disk_writer = false;
+       if (_disk_writer && speed > 0) {
+               samplecnt_t latency_preroll = _session.remaining_latency_preroll ();
+               run_disk_writer = latency_preroll < nframes + (_signal_latency + _output->latency ());
+               if (end_sample - _disk_writer->input_latency () < _session.transport_sample ()) {
+                       run_disk_writer = true;
                }
+       }
 
-       } else {
+       /* Tell main outs what to do about monitoring.  We do this so that
+        * on a transition between monitoring states we get a de-clicking gain
+        * change in the _main_outs delivery, if config.get_use_monitor_fades()
+        * is true.
+        *
+        * We override this in the case where we have an internal generator.
+        *
+        * FIXME: when punching in/out this also depends on latency compensated time
+        * for this route. monitoring_state() does not currently handle that correctly,.
+        *
+        * Also during remaining_latency_preroll, transport_rolling () is false, but
+        * we may need to monitor disk instead.
+        */
+       MonitorState ms = monitoring_state ();
+       bool silence = _have_internal_generator ? false : (ms == MonitoringSilence);
 
-               if (_denormal_protection || Config->get_denormal_protection()) {
+       _main_outs->no_outs_cuz_we_no_monitor (silence);
 
-                       for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
-                               Sample* const sp = i->data();
-                               for (pframes_t nx = 0; nx < nframes; ++nx) {
-                                       sp[nx] += 1.0e-27f;
-                               }
-                       }
+       /* -------------------------------------------------------------------------------------------
+          DENORMAL CONTROL
+          ----------------------------------------------------------------------------------------- */
+       /* XXX We'll need to protect silent inputs as well as silent disk
+        * (when not monitoring input or monitoring disk and there's no region
+        * for a longer time).
+        *
+        * ...or simply drop that feature.
+        */
+       if (_denormal_protection || Config->get_denormal_protection()) {
 
+               for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
+                       Sample* const sp = i->data();
+                       for (pframes_t nx = 0; nx < nframes; ++nx) {
+                               sp[nx] += 1.0e-27f;
+                       }
                }
        }
 
+
        /* -------------------------------------------------------------------------------------------
           and go ....
           ----------------------------------------------------------------------------------------- */
 
-       /* set this to be true if the meter will already have been ::run() earlier */
-       bool const meter_already_run = metering_state() == MeteringInput;
-
-       framecnt_t latency = 0;
-       const double speed = _session.transport_speed ();
+       samplecnt_t latency = 0;
 
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
 
-               if (meter_already_run && boost::dynamic_pointer_cast<PeakMeter> (*i)) {
-                       /* don't ::run() the meter, otherwise it will have its previous peak corrupted */
-                       continue;
-               }
+               /* TODO check for split cycles here.
+                *
+                * start_frame, end_frame is adjusted by latency and may
+                * cross loop points.
+                */
 
 #ifndef NDEBUG
                /* if it has any inputs, make sure they match */
@@ -443,30 +460,62 @@ Route::process_output_buffers (BufferSet& bufs,
                }
 #endif
 
-               /* should we NOT run plugins here if the route is inactive?
-                  do we catch route != active somewhere higher?
-               */
+               bool re_inject_oob_data = false;
+               if ((*i) == _disk_reader) {
+                       /* Well now, we've made it past the disk-writer and to the disk-reader.
+                        * Time to decide what to do about monitoring.
+                        *
+                        * Even when not doing MonitoringDisk, we need to run the processors,
+                        * so that it advances its internal buffers (IFF run_disk_reader is true).
+                        *
+                        */
+                       if (ms == MonitoringDisk || ms == MonitoringSilence) {
+                               /* this will clear out-of-band data, too (e.g. MIDI-PC, Panic etc.
+                                * OOB data is written at the end of the cycle (nframes - 1),
+                                * and jack does not re-order events, so we push them back later */
+                               re_inject_oob_data = true;
+                               bufs.silence (nframes, 0);
+                       }
+               }
 
-               if (boost::dynamic_pointer_cast<Send>(*i) != 0) {
-                       boost::dynamic_pointer_cast<Send>(*i)->set_delay_in(_signal_latency - latency);
+               double pspeed = speed;
+               if ((!run_disk_reader && (*i) == _disk_reader) || (!run_disk_writer && (*i) == _disk_writer)) {
+                       /* run with speed 0, no-roll */
+                       pspeed = 0;
                }
-               if (boost::dynamic_pointer_cast<PluginInsert>(*i) != 0) {
-                       const framecnt_t longest_session_latency = _initial_delay + _signal_latency;
-                       boost::dynamic_pointer_cast<PluginInsert>(*i)->set_sidechain_latency (
-                                       _initial_delay + latency, longest_session_latency - latency);
+
+               if (speed < 0) {
+                       (*i)->run (bufs, start_sample + latency, end_sample + latency, pspeed, nframes, *i != _processors.back());
+               } else {
+                       (*i)->run (bufs, start_sample - latency, end_sample - latency, pspeed, nframes, *i != _processors.back());
                }
 
-               (*i)->run (bufs, start_frame - latency, end_frame - latency, speed, nframes, *i != _processors.back());
                bufs.set_count ((*i)->output_streams());
 
+               /* Note: plugin latency may change. While the plugin does inform the session via
+                * processor_latency_changed(). But the session may not yet have gotten around to
+                * update the actual worste-case and update this track's _signal_latency.
+                *
+                * So there can be cases where adding up all latencies may not equal _signal_latency.
+                */
                if ((*i)->active ()) {
                        latency += (*i)->signal_latency ();
                }
+
+               if (re_inject_oob_data) {
+                       write_out_of_band_data (bufs, nframes);
+               }
+
+#if 0
+               if ((*i) == _delayline) {
+                       latency += _delayline->delay ();
+               }
+#endif
        }
 }
 
 void
-Route::bounce_process (BufferSet& buffers, framepos_t start, framecnt_t nframes,
+Route::bounce_process (BufferSet& buffers, samplepos_t start, samplecnt_t nframes,
                boost::shared_ptr<Processor> endpoint,
                bool include_endpoint, bool for_export, bool for_freeze)
 {
@@ -475,7 +524,7 @@ Route::bounce_process (BufferSet& buffers, framepos_t start, framecnt_t nframes,
                return;
        }
 
-       framecnt_t latency = bounce_get_latency(_amp, false, for_export, for_freeze);
+       samplecnt_t latency = bounce_get_latency(_amp, false, for_export, for_freeze);
        _amp->set_gain_automation_buffer (_session.gain_automation_buffer ());
        _amp->setup_gain_automation (start - latency, start - latency + nframes, nframes);
 
@@ -526,11 +575,11 @@ Route::bounce_process (BufferSet& buffers, framepos_t start, framecnt_t nframes,
        }
 }
 
-framecnt_t
+samplecnt_t
 Route::bounce_get_latency (boost::shared_ptr<Processor> endpoint,
                bool include_endpoint, bool for_export, bool for_freeze) const
 {
-       framecnt_t latency = 0;
+       samplecnt_t latency = 0;
        if (!endpoint && !include_endpoint) {
                return latency;
        }
@@ -590,18 +639,22 @@ Route::n_process_buffers ()
 }
 
 void
-Route::monitor_run (framepos_t start_frame, framepos_t end_frame, pframes_t nframes, int declick)
+Route::monitor_run (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes)
 {
        assert (is_monitor());
-       BufferSet& bufs (_session.get_route_buffers (n_process_buffers()));
-       fill_buffers_with_input (bufs, _input, nframes);
-       passthru (bufs, start_frame, end_frame, nframes, declick);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
+       run_route (start_sample, end_sample, nframes, true, false);
 }
 
 void
-Route::passthru (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, int declick)
+Route::run_route (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, bool gain_automation_ok, bool run_disk_reader)
 {
-       _silent = false;
+       BufferSet& bufs (_session.get_route_buffers (n_process_buffers()));
+
+       fill_buffers_with_input (bufs, _input, nframes);
+
+       /* filter captured data before meter sees it */
+       filter_input (bufs);
 
        if (is_monitor() && _session.listening() && !_session.is_auditioning()) {
 
@@ -613,18 +666,19 @@ Route::passthru (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
                bufs.silence (nframes, 0);
        }
 
-       write_out_of_band_data (bufs, start_frame, end_frame, nframes);
-       process_output_buffers (bufs, start_frame, end_frame, nframes, declick, true);
-}
+       snapshot_out_of_band_data (nframes);
+       /* append immediate messages to the first MIDI buffer (thus sending it to the first output port) */
 
-void
-Route::passthru_silence (framepos_t start_frame, framepos_t end_frame, pframes_t nframes, int declick)
-{
-       BufferSet& bufs (_session.get_route_buffers (n_process_buffers(), true));
+       write_out_of_band_data (bufs, nframes);
+
+       /* run processor chain */
+
+       process_output_buffers (bufs, start_sample, end_sample, nframes, gain_automation_ok, run_disk_reader);
+
+       /* map events (e.g. MIDI-CC) back to control-parameters */
+       update_controls (bufs);
 
-       bufs.set_count (_input->n_ports());
-       write_out_of_band_data (bufs, start_frame, end_frame, nframes);
-       process_output_buffers (bufs, start_frame, end_frame, nframes, declick, false);
+       flush_processor_buffers_locked (nframes);
 }
 
 void
@@ -926,10 +980,6 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
                loc = _processors.end ();
        }
 
-       if (!AudioEngine::instance()->connected()) {
-               return 1;
-       }
-
        if (others.empty()) {
                return 0;
        }
@@ -1250,7 +1300,7 @@ Route::clear_processors (Placement p)
                                seen_amp = true;
                        }
 
-                       if ((*i) == _amp || (*i) == _meter || (*i) == _main_outs || (*i) == _delayline || (*i) == _trim) {
+                       if (is_internal_processor (*i)) {
 
                                /* you can't remove these */
 
@@ -1290,16 +1340,25 @@ Route::clear_processors (Placement p)
 
        processor_max_streams.reset();
        _have_internal_generator = false;
-       processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
+       reset_instrument_info ();
        set_processor_positions ();
 
-       reset_instrument_info ();
+       processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
 
        if (!already_deleting) {
                _session.clear_deletion_in_progress();
        }
 }
 
+bool
+Route::is_internal_processor (boost::shared_ptr<Processor> p) const
+{
+       if (p == _amp || p == _meter || p == _main_outs || p == _delayline || p == _trim || p == _polarity) {
+               return true;
+       }
+       return false;
+}
+
 int
 Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStreams* err, bool need_process_lock)
 {
@@ -1319,7 +1378,7 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
 
        /* these can never be removed */
 
-       if (processor == _amp || processor == _meter || processor == _main_outs || processor == _delayline || processor == _trim) {
+       if (is_internal_processor (processor)) {
                return 0;
        }
 
@@ -1421,11 +1480,11 @@ int
 Route::replace_processor (boost::shared_ptr<Processor> old, boost::shared_ptr<Processor> sub, ProcessorStreams* err)
 {
        /* these can never be removed */
-       if (old == _amp || old == _meter || old == _main_outs || old == _delayline || old == _trim) {
+       if (is_internal_processor (old)) {
                return 1;
        }
        /* and can't be used as substitute, either */
-       if (sub == _amp || sub == _meter || sub == _main_outs || sub == _delayline || sub == _trim) {
+       if (is_internal_processor (sub)) {
                return 1;
        }
 
@@ -1540,7 +1599,7 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams*
 
                        /* these can never be removed */
 
-                       if (processor == _amp || processor == _meter || processor == _main_outs || processor == _delayline || processor == _trim) {
+                       if (is_internal_processor (processor)) {
                                ++i;
                                continue;
                        }
@@ -1818,6 +1877,7 @@ Route::configure_processors_unlocked (ProcessorStreams* err, Glib::Threads::RWLo
                        lm->acquire ();
                        return -1;
                }
+
                processor_max_streams = ChanCount::max(processor_max_streams, c->first);
                processor_max_streams = ChanCount::max(processor_max_streams, c->second);
 
@@ -2097,12 +2157,21 @@ Route::reorder_processors (const ProcessorList& new_order, ProcessorStreams* err
                g_atomic_int_set (&_pending_process_reorder, 1);
        }
 
+       /* update processor input/output latency
+        * (total signal_latency does not change)
+        */
+       update_signal_latency (true);
+
        return 0;
 }
 
 bool
 Route::add_remove_sidechain (boost::shared_ptr<Processor> proc, bool add)
 {
+       if (_session.actively_recording ()) {
+               return false;
+       }
+
        boost::shared_ptr<PluginInsert> pi;
        if ((pi = boost::dynamic_pointer_cast<PluginInsert>(proc)) == 0) {
                return false;
@@ -2165,6 +2234,10 @@ Route::add_remove_sidechain (boost::shared_ptr<Processor> proc, bool add)
 bool
 Route::plugin_preset_output (boost::shared_ptr<Processor> proc, ChanCount outs)
 {
+       if (_session.actively_recording ()) {
+               return false;
+       }
+
        boost::shared_ptr<PluginInsert> pi;
        if ((pi = boost::dynamic_pointer_cast<PluginInsert>(proc)) == 0) {
                return false;
@@ -2211,6 +2284,9 @@ Route::reset_plugin_insert (boost::shared_ptr<Processor> proc)
 bool
 Route::customize_plugin_insert (boost::shared_ptr<Processor> proc, uint32_t count, ChanCount outs, ChanCount sinks)
 {
+       if (_session.actively_recording ()) {
+               return false;
+       }
        boost::shared_ptr<PluginInsert> pi;
        if ((pi = boost::dynamic_pointer_cast<PluginInsert>(proc)) == 0) {
                return false;
@@ -2303,17 +2379,17 @@ Route::set_strict_io (const bool enable)
 XMLNode&
 Route::get_state()
 {
-       return state(true);
+       return state (false);
 }
 
 XMLNode&
 Route::get_template()
 {
-       return state(false);
+       return state (true);
 }
 
 XMLNode&
-Route::state(bool full_state)
+Route::state (bool save_template)
 {
        if (!_session._template_state_dir.empty()) {
                foreach_processor (sigc::bind (sigc::mem_fun (*this, &Route::set_plugin_state_dir), _session._template_state_dir));
@@ -2322,35 +2398,36 @@ Route::state(bool full_state)
        XMLNode *node = new XMLNode("Route");
        ProcessorList::iterator i;
 
-       node->set_property ("id", id ());
-       node->set_property ("name", name());
-       node->set_property ("default-type", _default_type);
-       node->set_property ("strict-io", _strict_io);
+       node->set_property (X_("id"), id ());
+       node->set_property (X_("name"), name());
+       node->set_property (X_("default-type"), _default_type);
+       node->set_property (X_("strict-io"), _strict_io);
 
        node->add_child_nocopy (_presentation_info.get_state());
 
-       node->set_property ("active", _active);
-       node->set_property ("denormal-protection", _denormal_protection);
-       node->set_property ("meter-point", _meter_point);
+       node->set_property (X_("active"), _active);
+       node->set_property (X_("denormal-protection"), _denormal_protection);
+       node->set_property (X_("meter-point"), _meter_point);
+       node->set_property (X_("disk-io-point"), _disk_io_point);
 
-       node->set_property ("meter-type", _meter_type);
+       node->set_property (X_("meter-type"), _meter_type);
 
        if (_route_group) {
-               node->set_property ("route-group", _route_group->name());
+               node->set_property (X_("route-group"), _route_group->name());
        }
 
        node->add_child_nocopy (_solo_control->get_state ());
        node->add_child_nocopy (_solo_isolate_control->get_state ());
        node->add_child_nocopy (_solo_safe_control->get_state ());
 
-       node->add_child_nocopy (_input->state (full_state));
-       node->add_child_nocopy (_output->state (full_state));
+       node->add_child_nocopy (_input->get_state ());
+       node->add_child_nocopy (_output->get_state ());
        node->add_child_nocopy (_mute_master->get_state ());
 
        node->add_child_nocopy (_mute_control->get_state ());
        node->add_child_nocopy (_phase_control->get_state ());
 
-       if (full_state) {
+       if (!skip_saving_automation) {
                node->add_child_nocopy (Automatable::get_automation_xml_state ());
        }
 
@@ -2360,13 +2437,16 @@ Route::state(bool full_state)
        }
 
        if (_pannable) {
-               node->add_child_nocopy (_pannable->state (full_state));
+               node->add_child_nocopy (_pannable->get_state ());
        }
 
        {
                Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
                for (i = _processors.begin(); i != _processors.end(); ++i) {
-                       if (!full_state) {
+                       if (*i == _delayline) {
+                               continue;
+                       }
+                       if (save_template) {
                                /* template save: do not include internal sends functioning as
                                         aux sends because the chance of the target ID
                                         in the session where this template is used
@@ -2384,7 +2464,7 @@ Route::state(bool full_state)
                                        }
                                }
                        }
-                       node->add_child_nocopy((*i)->state (full_state));
+                       node->add_child_nocopy((*i)->get_state ());
                }
        }
 
@@ -2488,6 +2568,17 @@ Route::set_state (const XMLNode& node, int version)
                }
        }
 
+       DiskIOPoint diop;
+       if (node.get_property (X_("disk-io-point"), diop)) {
+               if (_disk_writer) {
+                       _disk_writer->set_display_to_user (diop == DiskIOCustom);
+               }
+               if (_disk_reader) {
+                       _disk_reader->set_display_to_user (diop == DiskIOCustom);
+               }
+               set_disk_io_point (diop);
+       }
+
        node.get_property (X_("meter-type"), _meter_type);
 
        _initial_io_setup = false;
@@ -2571,6 +2662,10 @@ Route::set_state (const XMLNode& node, int version)
                }
        }
 
+       if (_delayline) {
+               _delayline->set_name (name ());
+       }
+
        return 0;
 }
 
@@ -2764,7 +2859,7 @@ Route::get_processor_state ()
 {
        XMLNode* root = new XMLNode (X_("redirects"));
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               root->add_child_nocopy ((*i)->state (true));
+               root->add_child_nocopy ((*i)->get_state ());
        }
 
        return *root;
@@ -2805,11 +2900,11 @@ Route::set_processor_state (const XMLNode& node)
                } else if (prop->value() == "meter") {
                        _meter->set_state (**niter, Stateful::current_state_version);
                        new_order.push_back (_meter);
+               } else if (prop->value() == "polarity") {
+                       _polarity->set_state (**niter, Stateful::current_state_version);
+                       new_order.push_back (_polarity);
                } else if (prop->value() == "delay") {
-                       if (_delayline) {
-                               _delayline->set_state (**niter, Stateful::current_state_version);
-                               new_order.push_back (_delayline);
-                       }
+                       // skip -- internal
                } else if (prop->value() == "main-outs") {
                        _main_outs->set_state (**niter, Stateful::current_state_version);
                } else if (prop->value() == "intreturn") {
@@ -2827,89 +2922,14 @@ Route::set_processor_state (const XMLNode& node)
                } else if (prop->value() == "capture") {
                        /* CapturingProcessor should never be restored, it's always
                           added explicitly when needed */
+               } else if (prop->value() == "diskreader" && _disk_reader) {
+                       _disk_reader->set_state (**niter, Stateful::current_state_version);
+                       new_order.push_back (_disk_reader);
+               } else if (prop->value() == "diskwriter" && _disk_writer) {
+                       _disk_writer->set_state (**niter, Stateful::current_state_version);
+                       new_order.push_back (_disk_writer);
                } else {
-                       ProcessorList::iterator o;
-
-                       for (o = _processors.begin(); o != _processors.end(); ++o) {
-                               XMLProperty const * id_prop = (*niter)->property(X_("id"));
-                               if (id_prop && (*o)->id() == id_prop->value()) {
-                                       (*o)->set_state (**niter, Stateful::current_state_version);
-                                       new_order.push_back (*o);
-                                       break;
-                               }
-                       }
-
-                       // If the processor (*niter) is not on the route then create it
-
-                       if (o == _processors.end()) {
-
-                               boost::shared_ptr<Processor> processor;
-
-                               if (prop->value() == "intsend") {
-
-                                       processor.reset (new InternalSend (_session, _pannable, _mute_master, boost::dynamic_pointer_cast<ARDOUR::Route>(shared_from_this()), boost::shared_ptr<Route>(), Delivery::Aux, true));
-
-                               } else if (prop->value() == "ladspa" || prop->value() == "Ladspa" ||
-                                          prop->value() == "lv2" ||
-                                          prop->value() == "windows-vst" ||
-                                          prop->value() == "mac-vst" ||
-                                          prop->value() == "lxvst" ||
-                                          prop->value() == "luaproc" ||
-                                          prop->value() == "audiounit") {
-
-                                       if (_session.get_disable_all_loaded_plugins ()) {
-                                               processor.reset (new UnknownProcessor (_session, **niter));
-                                       } else {
-                                               processor.reset (new PluginInsert (_session));
-                                               processor->set_owner (this);
-                                               if (_strict_io) {
-                                                       boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert>(processor);
-                                                       pi->set_strict_io (true);
-                                               }
-
-                                       }
-                               } else if (prop->value() == "port") {
-
-                                       processor.reset (new PortInsert (_session, _pannable, _mute_master));
-
-                               } else if (prop->value() == "send") {
-
-                                       processor.reset (new Send (_session, _pannable, _mute_master, Delivery::Send, true));
-                                       boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
-                                       send->SelfDestruct.connect_same_thread (*this,
-                                                       boost::bind (&Route::processor_selfdestruct, this, boost::weak_ptr<Processor> (processor)));
-
-                               } else {
-                                       error << string_compose(_("unknown Processor type \"%1\"; ignored"), prop->value()) << endmsg;
-                                       continue;
-                               }
-
-                               if (processor->set_state (**niter, Stateful::current_state_version) != 0) {
-                                       /* This processor could not be configured.  Turn it into a UnknownProcessor */
-                                       processor.reset (new UnknownProcessor (_session, **niter));
-                               }
-
-                               /* subscribe to Sidechain IO changes */
-                               boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (processor);
-                               if (pi && pi->has_sidechain ()) {
-                                       pi->sidechain_input ()->changed.connect_same_thread (*this, boost::bind (&Route::sidechain_change_handler, this, _1, _2));
-                               }
-
-                               /* we have to note the monitor send here, otherwise a new one will be created
-                                  and the state of this one will be lost.
-                               */
-                               boost::shared_ptr<InternalSend> isend = boost::dynamic_pointer_cast<InternalSend> (processor);
-                               if (isend && isend->role() == Delivery::Listen) {
-                                       _monitor_send = isend;
-                               }
-
-                               /* it doesn't matter if invisible processors are added here, as they
-                                  will be sorted out by setup_invisible_processors () shortly.
-                               */
-
-                               new_order.push_back (processor);
-                               must_configure = true;
-                       }
+                       set_processor_state (**niter, prop, new_order, must_configure);
                }
        }
 
@@ -2951,6 +2971,93 @@ Route::set_processor_state (const XMLNode& node)
        set_processor_positions ();
 }
 
+bool
+Route::set_processor_state (XMLNode const & node, XMLProperty const* prop, ProcessorList& new_order, bool& must_configure)
+{
+       ProcessorList::iterator o;
+
+       for (o = _processors.begin(); o != _processors.end(); ++o) {
+               XMLProperty const * id_prop = node.property(X_("id"));
+               if (id_prop && (*o)->id() == id_prop->value()) {
+                       (*o)->set_state (node, Stateful::current_state_version);
+                       new_order.push_back (*o);
+                       break;
+               }
+       }
+
+       // If the processor (node) is not on the route then create it
+
+       if (o == _processors.end()) {
+
+               boost::shared_ptr<Processor> processor;
+
+               if (prop->value() == "intsend") {
+
+                       processor.reset (new InternalSend (_session, _pannable, _mute_master, boost::dynamic_pointer_cast<ARDOUR::Route>(shared_from_this()), boost::shared_ptr<Route>(), Delivery::Aux, true));
+
+               } else if (prop->value() == "ladspa" || prop->value() == "Ladspa" ||
+                          prop->value() == "lv2" ||
+                          prop->value() == "windows-vst" ||
+                          prop->value() == "mac-vst" ||
+                          prop->value() == "lxvst" ||
+                          prop->value() == "luaproc" ||
+                          prop->value() == "audiounit") {
+
+                       if (_session.get_disable_all_loaded_plugins ()) {
+                               processor.reset (new UnknownProcessor (_session, node));
+                       } else {
+                               processor.reset (new PluginInsert (_session));
+                               processor->set_owner (this);
+                               if (_strict_io) {
+                                       boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert>(processor);
+                                       pi->set_strict_io (true);
+                               }
+
+                       }
+               } else if (prop->value() == "port") {
+
+                       processor.reset (new PortInsert (_session, _pannable, _mute_master));
+
+               } else if (prop->value() == "send") {
+
+                       processor.reset (new Send (_session, _pannable, _mute_master, Delivery::Send, true));
+                       boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
+                       send->SelfDestruct.connect_same_thread (*this,
+                                                               boost::bind (&Route::processor_selfdestruct, this, boost::weak_ptr<Processor> (processor)));
+
+               } else {
+                       return false;
+               }
+
+               if (processor->set_state (node, Stateful::current_state_version) != 0) {
+                       /* This processor could not be configured.  Turn it into a UnknownProcessor */
+                       processor.reset (new UnknownProcessor (_session, node));
+               }
+
+               /* subscribe to Sidechain IO changes */
+               boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (processor);
+               if (pi && pi->has_sidechain ()) {
+                       pi->sidechain_input ()->changed.connect_same_thread (*this, boost::bind (&Route::sidechain_change_handler, this, _1, _2));
+               }
+
+               /* we have to note the monitor send here, otherwise a new one will be created
+                  and the state of this one will be lost.
+               */
+               boost::shared_ptr<InternalSend> isend = boost::dynamic_pointer_cast<InternalSend> (processor);
+               if (isend && isend->role() == Delivery::Listen) {
+                       _monitor_send = isend;
+               }
+
+               /* it doesn't matter if invisible processors are added here, as they
+                  will be sorted out by setup_invisible_processors () shortly.
+               */
+
+               new_order.push_back (processor);
+               must_configure = true;
+       }
+       return true;
+}
+
 void
 Route::curve_reallocate ()
 {
@@ -2959,7 +3066,7 @@ Route::curve_reallocate ()
 }
 
 void
-Route::silence (framecnt_t nframes)
+Route::silence (samplecnt_t nframes)
 {
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        if (!lm.locked()) {
@@ -2970,30 +3077,31 @@ Route::silence (framecnt_t nframes)
 }
 
 void
-Route::silence_unlocked (framecnt_t nframes)
+Route::silence_unlocked (samplecnt_t nframes)
 {
        /* Must be called with the processor lock held */
 
-       const framepos_t now = _session.transport_frame ();
+       const samplepos_t now = _session.transport_sample ();
 
-       if (!_silent) {
+       _output->silence (nframes);
 
-               _output->silence (nframes);
-
-               for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-                       boost::shared_ptr<PluginInsert> pi;
+       // update owned automated controllables
+       automation_run (now, nframes);
+       if (_pannable) {
+               _pannable->automation_run (now, nframes);
+       }
 
-                       if (!_active && (pi = boost::dynamic_pointer_cast<PluginInsert> (*i)) != 0) {
-                               // skip plugins, they don't need anything when we're not active
-                               continue;
-                       }
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               boost::shared_ptr<PluginInsert> pi;
 
-                       (*i)->silence (nframes, now);
+               if (!_active && (pi = boost::dynamic_pointer_cast<PluginInsert> (*i)) != 0) {
+                       /* evaluate automated automation controls */
+                       pi->automation_run (now, nframes);
+                       /* skip plugins, they don't need anything when we're not active */
+                       continue;
                }
 
-               if (nframes == _session.get_block_size()) {
-                       // _silent = true;
-               }
+               (*i)->silence (nframes, now);
        }
 }
 
@@ -3095,39 +3203,77 @@ Route::add_aux_send (boost::shared_ptr<Route> route, boost::shared_ptr<Processor
        return 0;
 }
 
-void
-Route::remove_aux_or_listen (boost::shared_ptr<Route> route)
+int
+Route::add_personal_send (boost::shared_ptr<Route> route)
 {
-       ProcessorStreams err;
-       ProcessorList::iterator tmp;
+       assert (route != _session.monitor_out ());
+       boost::shared_ptr<Processor> before = before_processor_for_placement (PreFader);
 
        {
-               Glib::Threads::RWLock::ReaderLock rl(_processor_lock);
-
-               /* have to do this early because otherwise processor reconfig
-                * will put _monitor_send back in the list
-                */
-
-               if (route == _session.monitor_out()) {
-                       _monitor_send.reset ();
-               }
+               Glib::Threads::RWLock::ReaderLock rm (_processor_lock);
 
-         again:
                for (ProcessorList::iterator x = _processors.begin(); x != _processors.end(); ++x) {
 
-                       boost::shared_ptr<InternalSend> d = boost::dynamic_pointer_cast<InternalSend>(*x);
+                       boost::shared_ptr<InternalSend> d = boost::dynamic_pointer_cast<InternalSend> (*x);
 
                        if (d && d->target_route() == route) {
-                               rl.release ();
-                               if (remove_processor (*x, &err, false) > 0) {
-                                       rl.acquire ();
-                                       continue;
-                               }
-                               rl.acquire ();
+                               /* already listening via the specified IO: do nothing */
+                               return 0;
+                       }
+               }
+       }
 
-                               /* list could have been demolished while we dropped the lock
-                                  so start over.
-                               */
+       try {
+
+               boost::shared_ptr<InternalSend> listener;
+
+               {
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       listener.reset (new InternalSend (_session, _pannable, _mute_master, boost::dynamic_pointer_cast<ARDOUR::Route>(shared_from_this()), route, Delivery::Personal));
+               }
+
+               add_processor (listener, before);
+
+       } catch (failed_constructor& err) {
+               return -1;
+       }
+
+       return 0;
+}
+
+void
+Route::remove_aux_or_listen (boost::shared_ptr<Route> route)
+{
+       ProcessorStreams err;
+       ProcessorList::iterator tmp;
+
+       {
+               Glib::Threads::RWLock::ReaderLock rl(_processor_lock);
+
+               /* have to do this early because otherwise processor reconfig
+                * will put _monitor_send back in the list
+                */
+
+               if (route == _session.monitor_out()) {
+                       _monitor_send.reset ();
+               }
+
+         again:
+               for (ProcessorList::iterator x = _processors.begin(); x != _processors.end(); ++x) {
+
+                       boost::shared_ptr<InternalSend> d = boost::dynamic_pointer_cast<InternalSend>(*x);
+
+                       if (d && d->target_route() == route) {
+                               rl.release ();
+                               if (remove_processor (*x, &err, false) > 0) {
+                                       rl.acquire ();
+                                       continue;
+                               }
+                               rl.acquire ();
+
+                               /* list could have been demolished while we dropped the lock
+                                  so start over.
+                               */
                                if (_session.engine().connected()) {
                                        /* i/o processors cannot be removed if the engine is not running
                                         * so don't live-loop in case the engine is N/A or dies
@@ -3299,28 +3445,34 @@ Route::feeds_according_to_graph (boost::shared_ptr<Route> other)
 
 /** Called from the (non-realtime) butler thread when the transport is stopped */
 void
-Route::nonrealtime_handle_transport_stopped (bool /*abort_ignored*/, bool /*did_locate*/, bool can_flush_processors)
+Route::non_realtime_transport_stop (samplepos_t now, bool flush)
 {
-       framepos_t now = _session.transport_frame();
-
-       {
-               Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
-
-               Automatable::transport_stopped (now);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
-               for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+       Automatable::non_realtime_transport_stop (now, flush);
 
-                       if (!_have_internal_generator && (Config->get_plugins_stop_with_transport() && can_flush_processors)) {
-                               (*i)->flush ();
-                       }
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
 
-                       (*i)->transport_stopped (now);
+               if (!_have_internal_generator && (Config->get_plugins_stop_with_transport() && flush)) {
+                       (*i)->flush ();
                }
+
+               (*i)->non_realtime_transport_stop (now, flush);
        }
+}
 
-       _roll_delay = _initial_delay;
+void
+Route::realtime_handle_transport_stopped ()
+{
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+
+       /* currently only by Plugin, queue note-off events */
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               (*i)->realtime_handle_transport_stopped ();
+       }
 }
 
+
 void
 Route::input_change_handler (IOChange change, void * /*src*/)
 {
@@ -3329,7 +3481,6 @@ Route::input_change_handler (IOChange change, void * /*src*/)
                   contains ConfigurationChanged
                */
                configure_processors (0);
-               _phase_control->resize (_input->n_ports().n_audio ());
                io_changed (); /* EMIT SIGNAL */
        }
 
@@ -3495,7 +3646,7 @@ Route::pans_required () const
 }
 
 void
-Route::flush_processor_buffers_locked (framecnt_t nframes)
+Route::flush_processor_buffers_locked (samplecnt_t nframes)
 {
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i);
@@ -3510,8 +3661,58 @@ Route::flush_processor_buffers_locked (framecnt_t nframes)
        }
 }
 
+void
+Route::flush_processors ()
+{
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               (*i)->flush ();
+       }
+}
+
+samplecnt_t
+Route::playback_latency (bool incl_downstream) const
+{
+       samplecnt_t rv;
+       if (_disk_reader) {
+               rv = _disk_reader->output_latency ();
+       } else {
+               rv = _signal_latency;
+       }
+       if (incl_downstream) {
+               rv += _output->connected_latency (true);
+       } else {
+               rv += _output->latency ();
+       }
+       return rv;
+}
+
+pframes_t
+Route::latency_preroll (pframes_t nframes, samplepos_t& start_sample, samplepos_t& end_sample)
+{
+       samplecnt_t latency_preroll = _session.remaining_latency_preroll ();
+       if (latency_preroll == 0) {
+               return nframes;
+       }
+       if (!_disk_reader) {
+               start_sample -= latency_preroll;
+               end_sample   -= latency_preroll;
+               return nframes;
+       }
+
+       if (latency_preroll > playback_latency ()) {
+               no_roll_unlocked (nframes, start_sample - latency_preroll, end_sample - latency_preroll, false);
+               return 0;
+       }
+
+       start_sample -= latency_preroll;
+       end_sample -= latency_preroll;
+       return nframes;
+}
+
 int
-Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool session_state_changing)
+Route::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool& need_butler)
 {
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
 
@@ -3521,95 +3722,73 @@ Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 
        if (!_active) {
                silence_unlocked (nframes);
+               _meter->reset();
                return 0;
        }
 
-       if (session_state_changing) {
-               if (_session.transport_speed() != 0.0f) {
-                       /* we're rolling but some state is changing (e.g. our diskstream contents)
-                          so we cannot use them. Be silent till this is over.
-
-                          XXX note the absurdity of ::no_roll() being called when we ARE rolling!
-                       */
-                       silence_unlocked (nframes);
-                       return 0;
-               }
-               /* we're really not rolling, so we're either delivery silence or actually
-                  monitoring, both of which are safe to do while session_state_changing is true.
-               */
+       if ((nframes = latency_preroll (nframes, start_sample, end_sample)) == 0) {
+               return 0;
        }
 
-       BufferSet& bufs = _session.get_route_buffers (n_process_buffers());
-
-       fill_buffers_with_input (bufs, _input, nframes);
+       run_route (start_sample, end_sample, nframes, (!_disk_writer || !_disk_writer->record_enabled()) && _session.transport_rolling(), true);
 
-       if (_meter_point == MeterInput) {
-               _meter->run (bufs, start_frame, end_frame, 0.0, nframes, true);
+       if ((_disk_reader && _disk_reader->need_butler()) || (_disk_writer && _disk_writer->need_butler())) {
+               need_butler = true;
        }
-
-       _amp->apply_gain_automation (false);
-       _trim->apply_gain_automation (false);
-       passthru (bufs, start_frame, end_frame, nframes, 0);
-
-       flush_processor_buffers_locked (nframes);
-
        return 0;
 }
 
 int
-Route::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& /* need_butler */)
+Route::no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing)
 {
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
+
        if (!lm.locked()) {
                return 0;
        }
 
-       if (!_active) {
-               silence_unlocked (nframes);
-               return 0;
-       }
+       return no_roll_unlocked (nframes, start_sample, end_sample, session_state_changing);
+}
 
-       framepos_t unused = 0;
+int
+Route::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing)
+{
+       /* Must be called with the processor lock held */
 
-       if ((nframes = check_initial_delay (nframes, unused)) == 0) {
+       if (!_active) {
+               silence_unlocked (nframes);
+               _meter->reset();
                return 0;
        }
 
-       _silent = false;
-
-       BufferSet& bufs = _session.get_route_buffers (n_process_buffers());
-
-       fill_buffers_with_input (bufs, _input, nframes);
+       if (session_state_changing) {
+               if (_session.transport_speed() != 0.0f) {
+                       /* we're rolling but some state is changing (e.g. our diskstream contents)
+                          so we cannot use them. Be silent till this is over.
 
-       if (_meter_point == MeterInput) {
-               _meter->run (bufs, start_frame, end_frame, 1.0, nframes, true);
+                          XXX note the absurdity of ::no_roll() being called when we ARE rolling!
+                       */
+                       silence_unlocked (nframes);
+                       _meter->reset();
+                       return 0;
+               }
+               /* we're really not rolling, so we're either delivery silence or actually
+                  monitoring, both of which are safe to do while session_state_changing is true.
+               */
        }
 
-       passthru (bufs, start_frame, end_frame, nframes, declick);
-
-       flush_processor_buffers_locked (nframes);
-
+       run_route (start_sample, end_sample, nframes, false, false);
        return 0;
 }
 
 int
-Route::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*end_frame*/, bool& /* need_butler */)
+Route::silent_roll (pframes_t nframes, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/, bool& /* need_butler */)
 {
        silence (nframes);
        flush_processor_buffers_locked (nframes);
        return 0;
 }
 
-void
-Route::flush_processors ()
-{
-       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
-
-       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               (*i)->flush ();
-       }
-}
-
 #ifdef __clang__
 __attribute__((annotate("realtime")))
 #endif
@@ -3645,6 +3824,10 @@ Route::apply_processor_changes_rt ()
        }
        if (changed) {
                set_processor_positions ();
+               /* update processor input/output latency
+                * (total signal_latency does not change)
+                */
+               update_signal_latency (true);
        }
        if (emissions != 0) {
                g_atomic_int_set (&_pending_signals, emissions);
@@ -3816,53 +3999,92 @@ Route::add_export_point()
                Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ());
                Glib::Threads::RWLock::WriterLock lw (_processor_lock);
 
-               // this aligns all tracks; but not tracks + busses
-               assert (_session.worst_track_latency () >= _initial_delay);
-               _capturing_processor.reset (new CapturingProcessor (_session, _session.worst_track_latency () - _initial_delay));
-               _capturing_processor->activate ();
-
+               /* Align all tracks for stem-export w/o processing.
+                * Compensate for all plugins between the this route's disk-reader
+                * and the common final downstream output (ie alignment point for playback).
+                */
+               _capturing_processor.reset (new CapturingProcessor (_session, playback_latency (true)));
                configure_processors_unlocked (0, &lw);
-
+               _capturing_processor->activate ();
        }
 
        return _capturing_processor;
 }
 
-framecnt_t
-Route::update_signal_latency ()
+samplecnt_t
+Route::update_signal_latency (bool apply_to_delayline)
 {
-       framecnt_t l = _output->user_latency();
-       framecnt_t lamp = 0;
-       bool before_amp = true;
-       framecnt_t ltrim = 0;
-       bool before_trim = true;
+       // TODO: bail out if !active() and set/assume _signal_latency = 0,
+       // here or in Session::* ? -> also zero send latencies,
+       // and make sure that re-enabling a route updates things again...
 
-       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               if ((*i)->active ()) {
-                       l += (*i)->signal_latency ();
+       samplecnt_t capt_lat_in = _input->connected_latency (false);
+       samplecnt_t play_lat_out = _output->connected_latency (true);
+
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+
+       samplecnt_t l_in  = 0;
+       samplecnt_t l_out = _output->user_latency();
+       for (ProcessorList::reverse_iterator i = _processors.rbegin(); i != _processors.rend(); ++i) {
+               if (boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (*i)) {
+                       snd->set_delay_in (l_out + _output->latency());
                }
-               if ((*i) == _amp) {
-                       before_amp = false;
+
+               if (boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (*i)) {
+                       if (boost::shared_ptr<IO> pio = pi->sidechain_input ()) {
+                               samplecnt_t lat = l_out + _output->latency();
+                               pio->set_private_port_latencies (lat, true);
+                               pio->set_public_port_latencies (lat, true);
+                       }
                }
-               if ((*i) == _trim) {
-                       before_amp = false;
+               (*i)->set_output_latency (l_out);
+               if ((*i)->active ()) {
+                       l_out += (*i)->signal_latency ();
                }
-               if (before_amp) {
-                       lamp = l;
+       }
+
+       DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: internal signal latency = %2\n", _name, l_out));
+
+       _signal_latency = l_out;
+
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+
+               /* set sidechain, send and insert port latencies */
+               if (boost::shared_ptr<PortInsert> pi = boost::dynamic_pointer_cast<PortInsert> (*i)) {
+                       if (pi->input ()) {
+                               /* propagate playback latency from output to input */
+                               pi->input ()->set_private_port_latencies (play_lat_out + l_in, true);
+                       }
+                       if (pi->output ()) {
+                               /* propagate capture latency from input to output */
+                               pi->output ()->set_private_port_latencies (capt_lat_in + l_in, false);
+                       }
+
+               } else if (boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (*i)) {
+                       if (snd->output ()) {
+                               /* set capture latency */
+                               snd->output ()->set_private_port_latencies (capt_lat_in + l_in, false);
+                               /* take send-target's playback latency into account */
+                               snd->set_delay_out (snd->output ()->connected_latency (true));
+                       }
                }
-               if (before_trim) {
-                       lamp = l;
+
+               (*i)->set_input_latency (l_in);
+               (*i)->set_playback_offset (_signal_latency + _output->latency ());
+               (*i)->set_capture_offset (_input->latency ());
+               if ((*i)->active ()) {
+                       l_in += (*i)->signal_latency ();
                }
        }
 
-       DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: internal signal latency = %2\n", _name, l));
+       lm.release ();
 
-       // TODO: (lamp - _signal_latency) to sync to output (read-ahed),  currently _roll_delay shifts this around
-       _signal_latency_at_amp_position = lamp;
-       _signal_latency_at_trim_position = ltrim;
+       if (apply_to_delayline) {
+               /* see also Session::post_playback_latency() */
+               apply_latency_compensation ();
+       }
 
-       if (_signal_latency != l) {
-               _signal_latency = l;
+       if (_signal_latency != l_out) {
                signal_latency_changed (); /* EMIT SIGNAL */
        }
 
@@ -3870,34 +4092,35 @@ Route::update_signal_latency ()
 }
 
 void
-Route::set_user_latency (framecnt_t nframes)
+Route::set_user_latency (samplecnt_t nframes)
 {
        _output->set_user_latency (nframes);
        _session.update_latency_compensation ();
 }
 
 void
-Route::set_latency_compensation (framecnt_t longest_session_latency)
+Route::apply_latency_compensation ()
 {
-       framecnt_t old = _initial_delay;
+       if (_delayline) {
+               samplecnt_t old = _delayline->delay ();
 
-       if (_signal_latency < longest_session_latency) {
-               _initial_delay = longest_session_latency - _signal_latency;
-       } else {
-               _initial_delay = 0;
-       }
+               samplecnt_t play_lat_in = _input->connected_latency (true);
+               samplecnt_t play_lat_out = _output->connected_latency (true);
+               samplecnt_t latcomp = play_lat_in - play_lat_out - _signal_latency;
 
-       DEBUG_TRACE (DEBUG::Latency, string_compose (
-                            "%1: compensate for maximum latency of %2,"
-                            "given own latency of %3, using initial delay of %4\n",
-                            name(), longest_session_latency, _signal_latency, _initial_delay));
+#if 0 // DEBUG
+               samplecnt_t capt_lat_in = _input->connected_latency (false);
+               samplecnt_t capt_lat_out = _output->connected_latency (false);
+               samplecnt_t latcomp_capt = capt_lat_out - capt_lat_in - _signal_latency;
 
-       if (_initial_delay != old) {
-               initial_delay_changed (); /* EMIT SIGNAL */
-       }
+               cout << "ROUTE " << name() << " delay for " << latcomp << " (c: " << latcomp_capt << ")" << endl;
+#endif
 
-       if (_session.transport_stopped()) {
-               _roll_delay = _initial_delay;
+               _delayline->set_delay (latcomp > 0 ? latcomp : 0);
+
+               if (old !=  _delayline->delay ()) {
+                       signal_latency_updated (); /* EMIT SIGNAL */
+               }
        }
 }
 
@@ -3918,38 +4141,22 @@ Route::protect_automation ()
                (*i)->protect_automation();
 }
 
-/** @param declick 1 to set a pending declick fade-in,
- *                -1 to set a pending declick fade-out
- */
-void
-Route::set_pending_declick (int declick)
-{
-       if (_declickable) {
-               /* this call is not allowed to turn off a pending declick */
-               if (declick) {
-                       _pending_declick = declick;
-               }
-       } else {
-               _pending_declick = 0;
-       }
-}
-
 /** Shift automation forwards from a particular place, thereby inserting time.
  *  Adds undo commands for any shifts that are performed.
  *
  * @param pos Position to start shifting from.
- * @param frames Amount to shift forwards by.
+ * @param samples Amount to shift forwards by.
  */
 
 void
-Route::shift (framepos_t pos, framecnt_t frames)
+Route::shift (samplepos_t pos, samplecnt_t samples)
 {
        /* gain automation */
        {
                boost::shared_ptr<AutomationControl> gc = _amp->gain_control();
 
                XMLNode &before = gc->alist()->get_state ();
-               gc->alist()->shift (pos, frames);
+               gc->alist()->shift (pos, samples);
                XMLNode &after = gc->alist()->get_state ();
                _session.add_command (new MementoCommand<AutomationList> (*gc->alist().get(), &before, &after));
        }
@@ -3959,7 +4166,7 @@ Route::shift (framepos_t pos, framecnt_t frames)
                boost::shared_ptr<AutomationControl> gc = _trim->gain_control();
 
                XMLNode &before = gc->alist()->get_state ();
-               gc->alist()->shift (pos, frames);
+               gc->alist()->shift (pos, samples);
                XMLNode &after = gc->alist()->get_state ();
                _session.add_command (new MementoCommand<AutomationList> (*gc->alist().get(), &before, &after));
        }
@@ -3975,7 +4182,7 @@ Route::shift (framepos_t pos, framecnt_t frames)
                        if (pc) {
                                boost::shared_ptr<AutomationList> al = pc->alist();
                                XMLNode& before = al->get_state ();
-                               al->shift (pos, frames);
+                               al->shift (pos, samples);
                                XMLNode& after = al->get_state ();
                                _session.add_command (new MementoCommand<AutomationList> (*al.get(), &before, &after));
                        }
@@ -3994,7 +4201,7 @@ Route::shift (framepos_t pos, framecnt_t frames)
                                if (ac) {
                                        boost::shared_ptr<AutomationList> al = ac->alist();
                                        XMLNode &before = al->get_state ();
-                                       al->shift (pos, frames);
+                                       al->shift (pos, samples);
                                        XMLNode &after = al->get_state ();
                                        _session.add_command (new MementoCommand<AutomationList> (*al.get(), &before, &after));
                                }
@@ -4015,12 +4222,22 @@ Route::set_plugin_state_dir (boost::weak_ptr<Processor> p, const std::string& d)
 }
 
 int
-Route::save_as_template (const string& path, const string& name)
+Route::save_as_template (const string& path, const string& name, const string& description)
 {
        std::string state_dir = path.substr (0, path.find_last_of ('.')); // strip template_suffix
        PBD::Unwinder<std::string> uw (_session._template_state_dir, state_dir);
 
        XMLNode& node (state (false));
+       node.set_property (X_("name"), name);
+
+       node.remove_nodes (X_("description"));
+       if (!description.empty()) {
+               XMLNode* desc = new XMLNode(X_("description"));
+               XMLNode* desc_cont = new XMLNode(X_("content"), description);
+               desc->add_child_nocopy (*desc_cont);
+
+               node.add_child_nocopy (*desc);
+       }
 
        XMLTree tree;
 
@@ -4044,10 +4261,15 @@ Route::set_name (const string& str)
                return true;
        }
 
-       string name = Route::ensure_track_or_route_name (str, _session);
-       SessionObject::set_name (name);
+       string newname = Route::ensure_track_or_route_name (str);
+
+       if (newname == name()) {
+               return true;
+       }
 
-       bool ret = (_input->set_name(name) && _output->set_name(name));
+       SessionObject::set_name (newname);
+
+       bool ret = (_input->set_name(newname) && _output->set_name(newname));
 
        if (ret) {
                /* rename the main outs. Leave other IO processors
@@ -4057,7 +4279,7 @@ Route::set_name (const string& str)
                 */
 
                if (_main_outs) {
-                       if (_main_outs->set_name (name)) {
+                       if (_main_outs->set_name (newname)) {
                                /* XXX returning false here is stupid because
                                   we already changed the route name.
                                */
@@ -4352,8 +4574,8 @@ Route::unknown_processors () const
 }
 
 
-framecnt_t
-Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, framecnt_t our_latency) const
+samplecnt_t
+Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, samplecnt_t our_latency) const
 {
        /* we assume that all our input ports feed all our output ports. its not
           universally true, but the alternative is way too corner-case to worry about.
@@ -4401,10 +4623,10 @@ Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, framecn
        return all_connections.max;
 }
 
-framecnt_t
+samplecnt_t
 Route::set_private_port_latencies (bool playback) const
 {
-       framecnt_t own_latency = 0;
+       samplecnt_t own_latency = 0;
 
        /* Processor list not protected by lock: MUST BE CALLED FROM PROCESS THREAD
           OR LATENCY CALLBACK.
@@ -4418,6 +4640,7 @@ Route::set_private_port_latencies (bool playback) const
        */
 
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
+
                if ((*i)->active ()) {
                        own_latency += (*i)->signal_latency ();
                }
@@ -4433,30 +4656,28 @@ Route::set_private_port_latencies (bool playback) const
 }
 
 void
-Route::set_public_port_latencies (framecnt_t value, bool playback) const
+Route::set_public_port_latencies (samplecnt_t value, bool playback) const
 {
-       /* this is called to set the JACK-visible port latencies, which take
-          latency compensation into account.
-       */
-
-       LatencyRange range;
-
-       range.min = value;
-       range.max = value;
-
-       {
-               const PortSet& ports (_input->ports());
-               for (PortSet::const_iterator p = ports.begin(); p != ports.end(); ++p) {
-                       p->set_public_latency_range (range, playback);
+       /* publish private latencies */
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+       for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               boost::shared_ptr<IOProcessor> iop = boost::dynamic_pointer_cast<IOProcessor>(*i);
+               if (!iop) {
+                       continue;
                }
-       }
-
-       {
-               const PortSet& ports (_output->ports());
-               for (PortSet::const_iterator p = ports.begin(); p != ports.end(); ++p) {
-                       p->set_public_latency_range (range, playback);
+               if (iop->input ()) {
+                       iop->input ()->set_public_port_latencies (iop->input()->latency(), true);
+               }
+               if (iop->output ()) {
+                       iop->output ()->set_public_port_latencies (iop->output()->latency(), false);
                }
        }
+
+       /* this is called to set the JACK-visible port latencies, which take
+        * latency compensation into account.
+        */
+       _input->set_public_port_latencies (value, playback);
+       _output->set_public_port_latencies (value, playback);
 }
 
 /** Put the invisible processors in the right place in _processors.
@@ -4484,13 +4705,20 @@ Route::setup_invisible_processors ()
         */
 
        ProcessorList new_processors;
+       ProcessorList personal_sends;
+       ProcessorList::iterator dr;
+       ProcessorList::iterator dw;
 
        /* find visible processors */
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               boost::shared_ptr<Send> auxsnd = boost::dynamic_pointer_cast<Send> ((*i));
                if ((*i)->display_to_user ()) {
                        new_processors.push_back (*i);
                }
+               else if (auxsnd && auxsnd->is_personal ()) {
+                       personal_sends.push_back (*i);
+               }
        }
 
        /* find the amp */
@@ -4508,28 +4736,12 @@ Route::setup_invisible_processors ()
        ProcessorList::iterator after_amp = amp;
        ++after_amp;
 
-       /* METER */
+       /* Pre-fader METER */
 
-       if (_meter) {
-               switch (_meter_point) {
-               case MeterInput:
-                       assert (!_meter->display_to_user ());
-                       new_processors.push_front (_meter);
-                       break;
-               case MeterPreFader:
-                       assert (!_meter->display_to_user ());
-                       new_processors.insert (amp, _meter);
-                       break;
-               case MeterPostFader:
-                       /* do nothing here */
-                       break;
-               case MeterOutput:
-                       /* do nothing here */
-                       break;
-               case MeterCustom:
-                       /* the meter is visible, so we don't touch it here */
-                       break;
-               }
+       if (_meter && _meter_point == MeterPreFader) {
+               /* add meter just before the fader */
+               assert (!_meter->display_to_user ());
+               new_processors.insert (amp, _meter);
        }
 
        /* MAIN OUTS */
@@ -4558,6 +4770,12 @@ Route::setup_invisible_processors ()
                new_processors.insert (meter_point, _meter);
        }
 
+       /* Personal Sends */
+
+       for (ProcessorList::iterator i = personal_sends.begin(); i != personal_sends.end(); ++i) {
+               new_processors.insert (amp, (*i));
+       }
+
        /* MONITOR SEND */
 
        if (_monitor_send && !is_monitor ()) {
@@ -4588,12 +4806,6 @@ Route::setup_invisible_processors ()
                }
        }
 
-#if 0 // not used - just yet
-       if (!is_master() && !is_monitor() && !is_auditioner()) {
-               new_processors.push_front (_delayline);
-       }
-#endif
-
        /* MONITOR CONTROL */
 
        if (_monitor_control && is_monitor ()) {
@@ -4603,9 +4815,12 @@ Route::setup_invisible_processors ()
 
        /* TRIM CONTROL */
 
-       if (_trim && _trim->active()) {
+       ProcessorList::iterator trim = new_processors.end();
+
+       if (_trim->active()) {
                assert (!_trim->display_to_user ());
                new_processors.push_front (_trim);
+               trim = new_processors.begin();
        }
 
        /* INTERNAL RETURN */
@@ -4619,11 +4834,123 @@ Route::setup_invisible_processors ()
                new_processors.push_front (_intreturn);
        }
 
-       /* EXPORT PROCESSOR */
+       /* DISK READER & WRITER (for Track objects) */
 
+       if (_disk_reader || _disk_writer) {
+               switch (_disk_io_point) {
+               case DiskIOPreFader:
+                       if (trim != new_processors.end()) {
+                               /* insert BEFORE TRIM */
+                               if (_disk_writer) {
+                                       new_processors.insert (trim, _disk_writer);
+                               }
+                               if (_disk_reader) {
+                                       new_processors.insert (trim, _disk_reader);
+                               }
+                       } else {
+                               if (_disk_writer) {
+                                       new_processors.push_front (_disk_writer);
+                               }
+                               if (_disk_reader) {
+                                       new_processors.push_front (_disk_reader);
+                               }
+                       }
+                       break;
+               case DiskIOPostFader:
+                       /* insert BEFORE main outs */
+                       if (_disk_writer) {
+                               new_processors.insert (main, _disk_writer);
+                       }
+                       if (_disk_reader) {
+                               new_processors.insert (main, _disk_reader);
+                       }
+                       break;
+               case DiskIOCustom:
+                       /* reader and writer are visible under this condition, so they
+                        * are not invisible and thus not handled here.
+                        */
+                       break;
+               }
+       }
+
+       /* ensure dist-writer is before disk-reader */
+       if (_disk_reader && _disk_writer) {
+               ProcessorList::iterator reader_pos = find (new_processors.begin(), new_processors.end(), _disk_reader);
+               ProcessorList::iterator writer_pos = find (new_processors.begin(), new_processors.end(), _disk_writer);
+               assert (reader_pos != new_processors.end ());
+               assert (writer_pos != new_processors.end ());
+               if (std::distance (new_processors.begin(), reader_pos) < std::distance (new_processors.begin(), writer_pos)) {
+                       new_processors.erase (reader_pos);
+                       assert (writer_pos == find (new_processors.begin(), new_processors.end(), _disk_writer));
+                       new_processors.insert (++writer_pos, _disk_reader);
+               }
+       }
+
+       /* EXPORT PROCESSOR */
        if (_capturing_processor) {
                assert (!_capturing_processor->display_to_user ());
-               new_processors.push_front (_capturing_processor);
+               ProcessorList::iterator reader_pos = find (new_processors.begin(), new_processors.end(), _disk_reader);
+               if (reader_pos != new_processors.end()) {
+                       /* insert after disk-reader */
+                       new_processors.insert (++reader_pos, _capturing_processor);
+               } else {
+                       ProcessorList::iterator return_pos = find (new_processors.begin(), new_processors.end(), _intreturn);
+                       /* insert after return */
+                       if (return_pos != new_processors.end()) {
+                               new_processors.insert (++return_pos, _capturing_processor);
+                       } else {
+                               new_processors.push_front (_capturing_processor);
+                       }
+               }
+       }
+
+       /* Polarity Invert */
+       if (_polarity) {
+               ProcessorList::iterator reader_pos = find (new_processors.begin(), new_processors.end(), _disk_reader);
+               if (reader_pos != new_processors.end()) {
+                       /* insert after disk-reader */
+                       new_processors.insert (++reader_pos, _polarity);
+               } else {
+                       ProcessorList::iterator return_pos = find (new_processors.begin(), new_processors.end(), _intreturn);
+                       /* insert after return */
+                       if (return_pos != new_processors.end()) {
+                               new_processors.insert (++return_pos, _polarity);
+                       } else {
+                               new_processors.push_front (_polarity);
+                       }
+               }
+       }
+
+       /* Input meter */
+       if (_meter && _meter_point == MeterInput) {
+               /* add meter just before the disk-writer (if any)
+                * otherwise at the top, but after the latency delayline
+                * (perhaps it should also be after intreturn on busses ??)
+                */
+               assert (!_meter->display_to_user ());
+               ProcessorList::iterator writer_pos = find (new_processors.begin(), new_processors.end(), _disk_writer);
+               if (writer_pos != new_processors.end()) {
+                       /* insert before disk-writer */
+                       new_processors.insert (writer_pos, _meter);
+               } else {
+                       ProcessorList::iterator return_pos = find (new_processors.begin(), new_processors.end(), _intreturn);
+                       /* insert after return */
+                       if (return_pos != new_processors.end()) {
+                               new_processors.insert (++return_pos, _meter);
+                       } else {
+                               new_processors.push_front (_meter);
+                       }
+               }
+       }
+
+       if (!is_master() && !is_monitor() && !is_auditioner()) {
+               ProcessorList::iterator reader_pos = find (new_processors.begin(), new_processors.end(), _disk_reader);
+               if (reader_pos != new_processors.end()) {
+                       /* insert before disk-reader */
+                       new_processors.insert (reader_pos, _delayline);
+               } else {
+                       new_processors.push_front (_delayline);
+               }
        }
 
        _processors = new_processors;
@@ -4712,15 +5039,6 @@ Route::processor_by_id (PBD::ID id) const
        return boost::shared_ptr<Processor> ();
 }
 
-/** @return the monitoring state, or in other words what data we are pushing
- *  into the route (data from the inputs, data from disk or silence)
- */
-MonitorState
-Route::monitoring_state () const
-{
-       return MonitoringInput;
-}
-
 /** @return what we should be metering; either the data coming from the input
  *  IO or the data that is flowing through the route.
  */
@@ -4766,28 +5084,35 @@ Route::the_instrument_unlocked () const
        return boost::shared_ptr<Processor>();
 }
 
-
+bool
+Route::is_track()
+{
+       return dynamic_cast<Track*>(this) != 0;
+}
 
 void
-Route::non_realtime_locate (framepos_t pos)
+Route::non_realtime_locate (samplepos_t pos)
 {
+       Automatable::non_realtime_locate (pos);
+
        if (_pannable) {
-               _pannable->transport_located (pos);
+               _pannable->non_realtime_locate (pos);
        }
 
-       if (_delayline.get()) {
-               _delayline.get()->flush();
+#if 0 // XXX mayhaps clear delayline here (and at stop?)
+       if (_delayline) {
+               _delayline->flush ();
        }
+#endif
 
        {
                //Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ());
                Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
                for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-                       (*i)->transport_located (pos);
+                       (*i)->non_realtime_locate (pos);
                }
        }
-       _roll_delay = _initial_delay;
 }
 
 void
@@ -4836,7 +5161,6 @@ Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr<IO> io, pfram
                boost::shared_ptr<AudioPort> source_port = io->audio (i);
                AudioBuffer& buf (bufs.get_audio (i%n_buffers));
 
-
                if (i < n_buffers) {
 
                        /* first time through just copy a channel into
@@ -5165,6 +5489,21 @@ Route::filter_enable_controllable (bool) const
 #endif
 }
 
+boost::shared_ptr<AutomationControl>
+Route::tape_drive_controllable () const
+{
+#ifdef MIXBUS
+       if (_ch_pre && mixbus()) {
+               return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (_ch_pre->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, 4)));
+       }
+       if (_ch_pre && is_master()) {
+               return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (_ch_pre->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, 1)));
+       }
+#endif
+
+       return boost::shared_ptr<AutomationControl>();
+}
+
 string
 Route::eq_band_name (uint32_t band) const
 {
@@ -5330,6 +5669,43 @@ Route::comp_speed_name (uint32_t mode) const
 #endif
 }
 
+boost::shared_ptr<AutomationControl>
+Route::send_pan_azi_controllable (uint32_t n) const
+{
+#ifdef  MIXBUS
+# undef MIXBUS_PORTS_H
+# include "../../gtk2_ardour/mixbus_ports.h"
+       boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post();
+       if (plug && !mixbus()) {
+               uint32_t port_id = 0;
+               switch (n) {
+# ifdef MIXBUS32C
+                       case  0: port_id = port_channel_post_aux0_pan; break;  //32c mb "pan" controls use zero-based names, unlike levels. ugh
+                       case  1: port_id = port_channel_post_aux1_pan; break;
+                       case  2: port_id = port_channel_post_aux2_pan; break;
+                       case  3: port_id = port_channel_post_aux3_pan; break;
+                       case  4: port_id = port_channel_post_aux4_pan; break;
+                       case  5: port_id = port_channel_post_aux5_pan; break;
+                       case  6: port_id = port_channel_post_aux6_pan; break;
+                       case  7: port_id = port_channel_post_aux7_pan; break;
+                       case  8: port_id = port_channel_post_aux8_pan; break;
+                       case  9: port_id = port_channel_post_aux9_pan; break;
+                       case 10: port_id = port_channel_post_aux10_pan; break;
+                       case 11: port_id = port_channel_post_aux11_pan; break;
+# endif
+                       default:
+                               break;
+               }
+
+               if (port_id > 0) {
+                       return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (plug->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, port_id)));
+               }
+       }
+#endif
+
+       return boost::shared_ptr<AutomationControl>();
+}
+
 boost::shared_ptr<AutomationControl>
 Route::send_level_controllable (uint32_t n) const
 {
@@ -5337,7 +5713,7 @@ Route::send_level_controllable (uint32_t n) const
 # undef MIXBUS_PORTS_H
 # include "../../gtk2_ardour/mixbus_ports.h"
        boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post();
-       if (plug) {
+       if (plug && !mixbus()) {
                uint32_t port_id = 0;
                switch (n) {
                        case  0: port_id = port_channel_post_aux1_level; break;
@@ -5384,7 +5760,7 @@ Route::send_enable_controllable (uint32_t n) const
 # undef MIXBUS_PORTS_H
 # include "../../gtk2_ardour/mixbus_ports.h"
        boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post();
-       if (plug) {
+       if (plug && !mixbus()) {
                uint32_t port_id = 0;
                switch (n) {
                        case  0: port_id = port_channel_post_aux1_asgn; break;
@@ -5429,17 +5805,20 @@ string
 Route::send_name (uint32_t n) const
 {
 #ifdef MIXBUS
+       boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post();
+       if (plug && !mixbus()) {
 # ifdef MIXBUS32C
-       if (n < 12) {
-               return _session.get_mixbus (n)->name();
-       }
-       n -= 12;
+               if (n < 12) {
+                       return _session.get_mixbus (n)->name();
+               }
+               n -= 12;
 #else
-       if (n < 8) {
-               return _session.get_mixbus (n)->name();
-       }
-       n -= 8;
+               if (n < 8) {
+                       return _session.get_mixbus (n)->name();
+               }
+               n -= 8;
 # endif
+       }
 #endif
        boost::shared_ptr<Processor> p = nth_send (n);
        if (p) {
@@ -5453,13 +5832,15 @@ boost::shared_ptr<AutomationControl>
 Route::master_send_enable_controllable () const
 {
 #ifdef  MIXBUS
-       boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post();
+       if (is_master() || is_monitor() || is_auditioner()) {
+               return boost::shared_ptr<AutomationControl>();
+       }
+
+       boost::shared_ptr<ARDOUR::PluginInsert> plug = mixbus() ? ch_pre () : ch_post();
        if (!plug) {
                return boost::shared_ptr<AutomationControl>();
        }
-# undef MIXBUS_PORTS_H
-# include "../../gtk2_ardour/mixbus_ports.h"
-       return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (plug->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, port_channel_post_mstr_assign)));
+       return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (plug->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, mixbus() ? 3 : 19)));
 #else
        return boost::shared_ptr<AutomationControl>();
 #endif
@@ -5532,3 +5913,147 @@ Route::slavables () const
        rv.push_back (_solo_control);
        return rv;
 }
+
+void
+Route::set_disk_io_point (DiskIOPoint diop)
+{
+       bool display = false;
+
+       cerr << "set disk io to " << enum_2_string (diop) << endl;
+
+       switch (diop) {
+       case DiskIOCustom:
+               display = true;
+               break;
+       default:
+               display = false;
+       }
+
+       if (_disk_writer) {
+               _disk_writer->set_display_to_user (display);
+       }
+
+       if (_disk_reader) {
+               _disk_reader->set_display_to_user (display);
+       }
+
+       const bool changed = (diop != _disk_io_point);
+
+       _disk_io_point = diop;
+
+       if (changed) {
+               Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ());
+               configure_processors (0);
+       }
+
+       processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
+}
+
+void
+Route::set_loop (Location* l)
+{
+       _loop_location = l;
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+       for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               (*i)->set_loop (l);
+       }
+}
+
+#ifdef USE_TRACKS_CODE_FEATURES
+
+/* This is the Tracks version of Track::monitoring_state().
+ *
+ * Ardour developers: try to flag or fix issues if parts of the libardour API
+ * change in ways that invalidate this
+ */
+
+MonitorState
+Route::monitoring_state () const
+{
+       /* Explicit requests */
+
+       if (_monitoring != MonitorInput) {
+               return MonitoringInput;
+       }
+
+       if (_monitoring & MonitorDisk) {
+               return MonitoringDisk;
+       }
+
+       /* This is an implementation of the truth table in doc/monitor_modes.pdf;
+          I don't think it's ever going to be too pretty too look at.
+       */
+
+       // GZ: NOT USED IN TRACKS
+       //bool const auto_input = _session.config.get_auto_input ();
+       //bool const software_monitor = Config->get_monitoring_model() == SoftwareMonitoring;
+       //bool const tape_machine_mode = Config->get_tape_machine_mode ();
+
+       bool const roll = _session.transport_rolling ();
+       bool const track_rec = _diskstream->record_enabled ();
+       bool session_rec = _session.actively_recording ();
+
+       if (track_rec) {
+
+               if (!session_rec && roll) {
+                       return MonitoringDisk;
+               } else {
+                       return MonitoringInput;
+               }
+
+       } else {
+
+               if (roll) {
+                       return MonitoringDisk;
+               }
+       }
+
+       return MonitoringSilence;
+}
+
+#else
+
+/* This is the Ardour/Mixbus version of Track::monitoring_state().
+ *
+ * Tracks developers: do NOT modify this method under any circumstances.
+ */
+
+MonitorState
+Route::monitoring_state () const
+{
+       if (!_disk_reader) {
+               return MonitoringInput;
+       }
+
+       /* Explicit requests */
+       MonitorChoice m (_monitoring_control->monitoring_choice());
+
+       if (m != MonitorAuto) {
+
+               MonitorState ms ((MonitorState) 0);
+
+               if (m & MonitorInput) {
+                       ms = MonitoringInput;
+               }
+
+               if (m & MonitorDisk) {
+                       ms = MonitorState (ms | MonitoringDisk);
+               }
+
+               return ms;
+       }
+
+       switch (_session.config.get_session_monitoring ()) {
+               case MonitorDisk:
+                       return MonitoringDisk;
+                       break;
+               case MonitorInput:
+                       return MonitoringInput;
+                       break;
+               default:
+                       break;
+       }
+
+       return get_auto_monitoring_state();
+}
+#endif