fix clang compilation (include header ordering)
[ardour.git] / libs / ardour / route.cc
index 741757691a0c189b6f3568d4c483c9c4ded29d7f..4d473eb7406d2a945c981a830e69f2a4bc49744c 100644 (file)
@@ -57,6 +57,7 @@
 #include "ardour/delayline.h"
 #include "ardour/midi_buffer.h"
 #include "ardour/midi_port.h"
+#include "ardour/monitor_control.h"
 #include "ardour/monitor_processor.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
@@ -94,10 +95,7 @@ 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)
@@ -293,7 +291,7 @@ Route::set_trim (gain_t val, Controllable::GroupControlDisposition /* group over
 }
 
 void
-Route::maybe_declick (BufferSet&, framecnt_t, int)
+Route::maybe_declick (BufferSet&, samplecnt_t, int)
 {
        /* this is the "bus" implementation and they never declick.
         */
@@ -303,16 +301,16 @@ Route::maybe_declick (BufferSet&, framecnt_t, int)
 /** 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,
+                              samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes,
                               int declick, bool gain_automation_ok)
 {
        /* Caller must hold process lock */
@@ -326,24 +324,21 @@ Route::process_output_buffers (BufferSet& bufs,
                return;
        }
 
-       automation_run (start_frame, nframes);
+       automation_run (start_sample, 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
@@ -423,7 +418,7 @@ Route::process_output_buffers (BufferSet& bufs,
        /* 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;
+       samplecnt_t latency = 0;
        const double speed = (is_auditioner() ? 1.0 : _session.transport_speed ());
 
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
@@ -455,13 +450,13 @@ Route::process_output_buffers (BufferSet& bufs,
                        boost::dynamic_pointer_cast<Send>(*i)->set_delay_in(_signal_latency - latency);
                }
                if (boost::dynamic_pointer_cast<PluginInsert>(*i) != 0) {
-                       const framecnt_t longest_session_latency = _initial_delay + _signal_latency;
+                       const samplecnt_t longest_session_latency = _initial_delay + _signal_latency;
                        boost::dynamic_pointer_cast<PluginInsert>(*i)->set_sidechain_latency (
                                        _initial_delay + latency, longest_session_latency - latency);
                }
 
                //cerr << name() << " run " << (*i)->name() << endl;
-               (*i)->run (bufs, start_frame - latency, end_frame - latency, speed, nframes, *i != _processors.back());
+               (*i)->run (bufs, start_sample - latency, end_sample - latency, speed, nframes, *i != _processors.back());
                bufs.set_count ((*i)->output_streams());
 
                if ((*i)->active ()) {
@@ -471,7 +466,7 @@ Route::process_output_buffers (BufferSet& bufs,
 }
 
 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)
 {
@@ -480,7 +475,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);
 
@@ -531,11 +526,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;
        }
@@ -595,16 +590,16 @@ 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, int declick)
 {
        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);
+       passthru (bufs, start_sample, end_sample, nframes, declick, true);
 }
 
 void
-Route::passthru (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, int declick)
+Route::passthru (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, int declick, bool gain_automation_ok)
 {
        _silent = false;
 
@@ -618,18 +613,23 @@ 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);
+       /* append immediate messages to the first MIDI buffer (thus sending it to the first output port) */
+
+       write_out_of_band_data (bufs, start_sample, end_sample, nframes);
+
+       /* run processor chain */
+
+       process_output_buffers (bufs, start_sample, end_sample, nframes, declick, gain_automation_ok);
 }
 
 void
-Route::passthru_silence (framepos_t start_frame, framepos_t end_frame, pframes_t nframes, int declick)
+Route::passthru_silence (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, int declick)
 {
        BufferSet& bufs (_session.get_route_buffers (n_process_buffers(), true));
 
        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);
+       write_out_of_band_data (bufs, start_sample, end_sample, nframes);
+       process_output_buffers (bufs, start_sample, end_sample, nframes, declick, false);
 }
 
 void
@@ -1809,8 +1809,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err, Glib::Threads::RWLo
        // TODO check for a potential ReaderLock after ReaderLock ??
        Glib::Threads::RWLock::ReaderLock lr (_processor_lock);
 
-       framecnt_t chain_latency = _input->latency ();
-
        list< pair<ChanCount,ChanCount> >::iterator c = configuration.begin();
        for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p, ++c) {
 
@@ -1822,9 +1820,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err, Glib::Threads::RWLo
                        return -1;
                }
 
-               (*p)->set_input_latency (chain_latency);
-               chain_latency += (*p)->signal_latency ();
-
                processor_max_streams = ChanCount::max(processor_max_streams, c->first);
                processor_max_streams = ChanCount::max(processor_max_streams, c->second);
 
@@ -2104,6 +2099,11 @@ 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;
 }
 
@@ -2990,7 +2990,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()) {
@@ -3001,11 +3001,11 @@ 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) {
 
@@ -3335,7 +3335,7 @@ Route::feeds_according_to_graph (boost::shared_ptr<Route> other)
 
 /** Called from the (non-realtime) butler thread when the transport is stopped */
 void
-Route::non_realtime_transport_stop (framepos_t now, bool flush)
+Route::non_realtime_transport_stop (samplepos_t now, bool flush)
 {
        {
                Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
@@ -3352,7 +3352,9 @@ Route::non_realtime_transport_stop (framepos_t now, bool flush)
                }
        }
 
-       _roll_delay = _initial_delay;
+       if (_disk_reader) {
+               _disk_reader->set_roll_delay (_initial_delay);
+       }
 }
 
 void
@@ -3529,7 +3531,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);
@@ -3545,7 +3547,7 @@ Route::flush_processor_buffers_locked (framecnt_t nframes)
 }
 
 int
-Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool session_state_changing)
+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);
 
@@ -3578,12 +3580,10 @@ Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
        fill_buffers_with_input (bufs, _input, nframes);
 
        if (_meter_point == MeterInput) {
-               _meter->run (bufs, start_frame, end_frame, 0.0, nframes, true);
+               _meter->run (bufs, start_sample, end_sample, 0.0, nframes, true);
        }
 
-       _amp->apply_gain_automation (false);
-       _trim->apply_gain_automation (false);
-       passthru (bufs, start_frame, end_frame, nframes, 0);
+       passthru (bufs, start_sample, end_sample, nframes, 0, true);
 
        flush_processor_buffers_locked (nframes);
 
@@ -3591,35 +3591,41 @@ Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 }
 
 int
-Route::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& /* need_butler */)
+Route::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, int declick, bool& need_butler)
 {
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
+
        if (!lm.locked()) {
                return 0;
        }
 
        if (!_active) {
                silence_unlocked (nframes);
-               return 0;
-       }
-
-       framepos_t unused = 0;
-
-       if ((nframes = check_initial_delay (nframes, unused)) == 0) {
+               if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || (!_disk_writer || _disk_writer->record_enabled()))) {
+                       _meter->reset();
+               }
                return 0;
        }
 
        _silent = false;
 
-       BufferSet& bufs = _session.get_route_buffers (n_process_buffers());
+       BufferSet& bufs = _session.get_route_buffers (n_process_buffers ());
 
        fill_buffers_with_input (bufs, _input, nframes);
 
-       if (_meter_point == MeterInput) {
-               _meter->run (bufs, start_frame, end_frame, 1.0, nframes, true);
+       /* filter captured data before meter sees it */
+       filter_input (bufs);
+
+       if (_meter_point == MeterInput &&
+           ((_monitoring_control->monitoring_choice() & MonitorInput) || (_disk_writer && _disk_writer->record_enabled()))) {
+               _meter->run (bufs, start_sample, end_sample, 1.0 /*speed()*/, nframes, true);
        }
 
-       passthru (bufs, start_frame, end_frame, nframes, declick);
+       passthru (bufs, start_sample, end_sample, nframes, declick, (!_disk_writer || !_disk_writer->record_enabled()) && _session.transport_rolling());
+
+       if ((_disk_reader && _disk_reader->need_butler()) || (_disk_writer && _disk_writer->need_butler())) {
+               need_butler = true;
+       }
 
        flush_processor_buffers_locked (nframes);
 
@@ -3627,7 +3633,7 @@ Route::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, in
 }
 
 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);
@@ -3679,6 +3685,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);
@@ -3851,8 +3861,9 @@ Route::add_export_point()
                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));
+               samplecnt_t latency = _session.worst_track_roll_delay ();
+               assert (latency >= _initial_delay);
+               _capturing_processor.reset (new CapturingProcessor (_session, latency - _initial_delay));
                _capturing_processor->activate ();
 
                configure_processors_unlocked (0, &lw);
@@ -3862,41 +3873,40 @@ Route::add_export_point()
        return _capturing_processor;
 }
 
-framecnt_t
-Route::update_signal_latency ()
+samplecnt_t
+Route::update_signal_latency (bool set_initial_delay)
 {
-       framecnt_t l = _output->user_latency();
-       framecnt_t lamp = 0;
-       bool before_amp = true;
-       framecnt_t ltrim = 0;
-       bool before_trim = true;
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+
+       samplecnt_t l_in  = _input->latency ();
+       samplecnt_t l_out = _output->user_latency();
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if ((*i)->active ()) {
-                       l += (*i)->signal_latency ();
-               }
-               if ((*i) == _amp) {
-                       before_amp = false;
-               }
-               if ((*i) == _trim) {
-                       before_amp = false;
+                       l_in += (*i)->signal_latency ();
                }
-               if (before_amp) {
-                       lamp = l;
-               }
-               if (before_trim) {
-                       lamp = l;
+               (*i)->set_input_latency (l_in);
+       }
+
+       for (ProcessorList::reverse_iterator i = _processors.rbegin(); i != _processors.rend(); ++i) {
+               (*i)->set_output_latency (l_out);
+               if ((*i)->active ()) {
+                       l_out += (*i)->signal_latency ();
                }
        }
 
-       DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: internal signal latency = %2\n", _name, l));
+       DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: internal signal latency = %2\n", _name, l_out));
 
-       // 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;
+       _signal_latency = l_out;
+
+       lm.release ();
+
+       if (set_initial_delay) {
+               /* see also Session::post_playback_latency() */
+               set_latency_compensation (_session.worst_track_latency () + _session.worst_track_out_latency () - output ()->latency ());
+       }
 
-       if (_signal_latency != l) {
-               _signal_latency = l;
+       if (_signal_latency != l_out) {
                signal_latency_changed (); /* EMIT SIGNAL */
        }
 
@@ -3904,19 +3914,20 @@ 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::set_latency_compensation (samplecnt_t longest_session_latency)
 {
-       framecnt_t old = _initial_delay;
+       samplecnt_t old = _initial_delay;
+       assert (!_disk_reader || _disk_reader->output_latency () <= _signal_latency);
 
-       if (_signal_latency < longest_session_latency) {
-               _initial_delay = longest_session_latency - _signal_latency;
+       if (_disk_reader &&  _disk_reader->output_latency () < longest_session_latency) {
+               _initial_delay = longest_session_latency - _disk_reader->output_latency ();
        } else {
                _initial_delay = 0;
        }
@@ -3931,7 +3942,9 @@ Route::set_latency_compensation (framecnt_t longest_session_latency)
        }
 
        if (_session.transport_stopped()) {
-               _roll_delay = _initial_delay;
+               if (_disk_reader) {
+                       _disk_reader->set_roll_delay (_initial_delay);
+               }
        }
 }
 
@@ -3972,18 +3985,18 @@ Route::set_pending_declick (int declick)
  *  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));
        }
@@ -3993,7 +4006,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));
        }
@@ -4009,7 +4022,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));
                        }
@@ -4028,7 +4041,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));
                                }
@@ -4396,8 +4409,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.
@@ -4445,10 +4458,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.
@@ -4477,7 +4490,7 @@ 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.
@@ -4651,7 +4664,7 @@ Route::setup_invisible_processors ()
 
        ProcessorList::iterator trim = new_processors.end();
 
-       if (_trim && _trim->active()) {
+       if (_trim->active()) {
                assert (!_trim->display_to_user ());
                new_processors.push_front (_trim);
                trim = new_processors.begin();
@@ -4670,25 +4683,18 @@ Route::setup_invisible_processors ()
 
        /* EXPORT PROCESSOR */
 
-       if (_capturing_processor) {
-               assert (!_capturing_processor->display_to_user ());
-               new_processors.push_front (_capturing_processor);
-       }
-
        /* DISK READER & WRITER (for Track objects) */
 
        if (_disk_reader || _disk_writer) {
                switch (_disk_io_point) {
                case DiskIOPreFader:
                        if (trim != new_processors.end()) {
-                               /* insert AFTER TRIM */
-                               ProcessorList::iterator insert_pos = trim;
-                               ++insert_pos;
+                               /* insert BEFORE TRIM */
                                if (_disk_writer) {
-                                       new_processors.insert (insert_pos, _disk_writer);
+                                       new_processors.insert (trim, _disk_writer);
                                }
                                if (_disk_reader) {
-                                       new_processors.insert (insert_pos, _disk_reader);
+                                       new_processors.insert (trim, _disk_reader);
                                }
                        } else {
                                if (_disk_writer) {
@@ -4716,6 +4722,18 @@ Route::setup_invisible_processors ()
                }
        }
 
+       if (_capturing_processor) {
+               assert (!_capturing_processor->display_to_user ());
+               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 {
+                       new_processors.push_front (_capturing_processor);
+               }
+       }
+
+
        _processors = new_processors;
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
@@ -4802,15 +4820,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.
  */
@@ -4859,7 +4868,7 @@ Route::the_instrument_unlocked () const
 
 
 void
-Route::non_realtime_locate (framepos_t pos)
+Route::non_realtime_locate (samplepos_t pos)
 {
        Automatable::non_realtime_locate (pos);
 
@@ -4879,7 +4888,10 @@ Route::non_realtime_locate (framepos_t pos)
                        (*i)->non_realtime_locate (pos);
                }
        }
-       _roll_delay = _initial_delay;
+
+       if (_disk_reader) {
+               _disk_reader->set_roll_delay (_initial_delay);
+       }
 }
 
 void
@@ -5661,3 +5673,154 @@ Route::set_disk_io_point (DiskIOPoint diop)
 
        processors_changed (RouteProcessorChange ()); /* EMIT SIGNAL */
 }
+
+#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;
+       }
+
+       /* 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.
+       */
+
+       bool const roll = _session.transport_rolling ();
+       bool const track_rec = _disk_writer->record_enabled ();
+       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 session_rec;
+
+       /* I suspect that just use actively_recording() is good enough all the
+        * time, but just to keep the semantics the same as they were before
+        * sept 26th 2012, we differentiate between the cases where punch is
+        * enabled and those where it is not.
+        *
+        * rg: I suspect this is not the case: monitoring may differ
+        */
+
+       if (_session.config.get_punch_in() || _session.config.get_punch_out() || _session.preroll_record_punch_enabled ()) {
+               session_rec = _session.actively_recording ();
+       } else {
+               session_rec = _session.get_record_enabled();
+       }
+
+       if (track_rec) {
+
+               if (!session_rec && roll && auto_input) {
+                       return MonitoringDisk;
+               } else {
+                       return software_monitor ? MonitoringInput : MonitoringSilence;
+               }
+
+       } else {
+
+               if (tape_machine_mode) {
+
+                       return MonitoringDisk;
+
+               } else {
+
+                       if (!roll && auto_input) {
+                               return software_monitor ? MonitoringInput : MonitoringSilence;
+                       } else {
+                               return MonitoringDisk;
+                       }
+
+               }
+       }
+
+       abort(); /* NOTREACHED */
+       return MonitoringSilence;
+}
+
+#endif