NO-OP: a ToDo comment for discussion
[ardour.git] / libs / ardour / route.cc
index 73b3ee7662fa3eaf544b9dbbb43141564528b070..3b615c517b1a00c12e6d31e65db259b0e0fa69ce 100644 (file)
@@ -57,6 +57,7 @@
 #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"
@@ -65,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"
@@ -107,6 +109,7 @@ Route::Route (Session& sess, string name, PresentationInfo::Flag flag, DataType
        , _declickable (false)
        , _have_internal_generator (false)
        , _default_type (default_type)
+       , _loop_location (NULL)
        , _track_number (0)
        , _strict_io (false)
        , _in_configure_processors (false)
@@ -187,6 +190,10 @@ 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"));
        }
@@ -329,6 +336,10 @@ Route::process_output_buffers (BufferSet& bufs,
         */
        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 ());
@@ -355,21 +366,25 @@ Route::process_output_buffers (BufferSet& bufs,
         * By the Time T=0 is reached (dt=15 later) that sample is audible.
         */
 
-       start_sample += _signal_latency;
-       end_sample += _signal_latency;
-
-       start_sample += _output->latency ();
-       end_sample += _output->latency ();
-
        const double speed = (is_auditioner() ? 1.0 : _session.transport_speed ());
 
+       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;
+       }
+
        /* 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);
+       assert (!_disk_reader || !run_disk_reader || start_sample >= 0 || speed < 0);
 
        /* 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).
@@ -381,7 +396,7 @@ Route::process_output_buffers (BufferSet& bufs,
         * given that
         */
        bool run_disk_writer = false;
-       if (_disk_writer && speed != 0) {
+       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 ()) {
@@ -402,7 +417,8 @@ Route::process_output_buffers (BufferSet& bufs,
         * Also during remaining_latency_preroll, transport_rolling () is false, but
         * we may need to monitor disk instead.
         */
-       bool silence = _have_internal_generator ? false : (monitoring_state () == MonitoringSilence);
+       MonitorState ms = monitoring_state ();
+       bool silence = _have_internal_generator ? false : (ms == MonitoringSilence);
 
        _main_outs->no_outs_cuz_we_no_monitor (silence);
 
@@ -416,65 +432,25 @@ Route::process_output_buffers (BufferSet& bufs,
        _pending_declick = 0;
 
        /* -------------------------------------------------------------------------------------------
-          DENORMAL CONTROL/PHASE INVERT
+          DENORMAL CONTROL
           ----------------------------------------------------------------------------------------- */
-
-       /* TODO phase-control should become a processor, or rather a Stub-processor:
-        * a point in the chain which calls a special-cased private Route method.
-        * _phase_control is route-owned and dynamic.)
-        * and we should rename it to polarity.
+       /* 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).
         *
-        * denormals: we'll need to protect silent inputs as well as silent disk
-        * (when not monitoring input).  Or simply drop that feature.
+        * ...or simply drop that feature.
         */
-       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();
+       if (_denormal_protection || Config->get_denormal_protection()) {
 
-                               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;
-                                       }
-                               }
-                       }
-
-               } else {
-
-                       for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i, ++chn) {
-                               Sample* const sp = i->data();
-
-                               if (_phase_control->inverted (chn)) {
-                                       for (pframes_t nx = 0; nx < nframes; ++nx) {
-                                               sp[nx] = -sp[nx];
-                                       }
-                               }
-                       }
-               }
-
-       } else {
-
-               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;
-                               }
+               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 ....
           ----------------------------------------------------------------------------------------- */
@@ -503,25 +479,22 @@ Route::process_output_buffers (BufferSet& bufs,
                }
 #endif
 
-               if (boost::dynamic_pointer_cast<PluginInsert>(*i) != 0) {
-                       /* set potential sidechain ports, capture and playback latency.
-                        * This effectively sets jack port latency which should include
-                        * up/downstream latencies.
+               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.
                         *
-                        * However, the value is not used by Ardour (2017-09-20) and calling
-                        * IO::latency() is expensive, so we punt.
+                        * Even when not doing MonitoringDisk, we need to run the processors,
+                        * so that it advances its internal buffers (IFF run_disk_reader is true).
                         *
-                        * capture should be
-                        *      input()->latenct + latency,
-                        * playback should be
-                        *      output->latency() + _signal_latency - latency
-                        *
-                        * Also see note below, _signal_latency may be smaller than latency
-                        * if a plugin's latency increases while it's running.
                         */
-                       const samplecnt_t playback_latency = std::max ((samplecnt_t)0, _signal_latency - latency);
-                       boost::dynamic_pointer_cast<PluginInsert>(*i)->set_sidechain_latency (
-                                       /* input->latency() + */ latency, /* output->latency() + */ playback_latency);
+                       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);
+                       }
                }
 
                double pspeed = speed;
@@ -530,7 +503,12 @@ Route::process_output_buffers (BufferSet& bufs,
                        pspeed = 0;
                }
 
-               (*i)->run (bufs, start_sample - latency, end_sample - latency, pspeed, nframes, *i != _processors.back());
+               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());
+               }
+
                bufs.set_count ((*i)->output_streams());
 
                /* Note: plugin latency may change. While the plugin does inform the session via
@@ -542,9 +520,14 @@ Route::process_output_buffers (BufferSet& bufs,
                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->get_delay ();
+                       latency += _delayline->delay ();
                }
 #endif
        }
@@ -678,6 +661,7 @@ void
 Route::monitor_run (samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes, int declick)
 {
        assert (is_monitor());
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        run_route (start_sample, end_sample, nframes, declick, true, false);
 }
 
@@ -701,14 +685,18 @@ Route::run_route (samplepos_t start_sample, samplepos_t end_sample, pframes_t nf
                bufs.silence (nframes, 0);
        }
 
+       snapshot_out_of_band_data (nframes);
        /* 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);
+       write_out_of_band_data (bufs, nframes);
 
        /* run processor chain */
 
        process_output_buffers (bufs, start_sample, end_sample, nframes, declick, gain_automation_ok, run_disk_reader);
 
+       /* map events (e.g. MIDI-CC) back to control-parameters */
+       update_controls (bufs);
+
        flush_processor_buffers_locked (nframes);
 }
 
@@ -1384,7 +1372,7 @@ Route::clear_processors (Placement p)
 bool
 Route::is_internal_processor (boost::shared_ptr<Processor> p) const
 {
-       if (p == _amp || p == _meter || p == _main_outs || p == _delayline || p == _trim) {
+       if (p == _amp || p == _meter || p == _main_outs || p == _delayline || p == _trim || p == _polarity) {
                return true;
        }
        return false;
@@ -2399,17 +2387,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));
@@ -2440,14 +2428,14 @@ Route::state(bool full_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 ());
        }
 
@@ -2457,7 +2445,7 @@ Route::state(bool full_state)
        }
 
        if (_pannable) {
-               node->add_child_nocopy (_pannable->state (full_state));
+               node->add_child_nocopy (_pannable->get_state ());
        }
 
        {
@@ -2466,7 +2454,7 @@ Route::state(bool full_state)
                        if (*i == _delayline) {
                                continue;
                        }
-                       if (!full_state) {
+                       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
@@ -2484,7 +2472,7 @@ Route::state(bool full_state)
                                        }
                                }
                        }
-                       node->add_child_nocopy((*i)->state (full_state));
+                       node->add_child_nocopy((*i)->get_state ());
                }
        }
 
@@ -2879,7 +2867,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;
@@ -2920,6 +2908,9 @@ 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") {
                        // skip -- internal
                } else if (prop->value() == "main-outs") {
@@ -3104,6 +3095,9 @@ Route::silence_unlocked (samplecnt_t nframes)
 
        // update owned automated controllables
        automation_run (now, nframes);
+       if (_pannable) {
+               _pannable->automation_run (now, nframes);
+       }
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                boost::shared_ptr<PluginInsert> pi;
@@ -3445,7 +3439,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 */
        }
 
@@ -3626,47 +3619,14 @@ Route::flush_processor_buffers_locked (samplecnt_t nframes)
        }
 }
 
-int
-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;
-       }
-
-       return no_roll_unlocked (nframes, start_sample, end_sample, session_state_changing);
-}
-
-int
-Route::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing)
+void
+Route::flush_processors ()
 {
-       /* Must be called with the processor lock held */
-
-       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.
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
-                          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.
-               */
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               (*i)->flush ();
        }
-
-       run_route (start_sample, end_sample, nframes, 0, false, false);
-       return 0;
 }
 
 samplecnt_t
@@ -3737,21 +3697,54 @@ Route::roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample
 }
 
 int
-Route::silent_roll (pframes_t nframes, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/, bool& /* need_butler */)
+Route::no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing)
 {
-       silence (nframes);
-       flush_processor_buffers_locked (nframes);
-       return 0;
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
+
+       if (!lm.locked()) {
+               return 0;
+       }
+
+       return no_roll_unlocked (nframes, start_sample, end_sample, session_state_changing);
 }
 
-void
-Route::flush_processors ()
+int
+Route::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool session_state_changing)
 {
-       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
+       /* Must be called with the processor lock held */
 
-       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               (*i)->flush ();
+       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);
+                       _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.
+               */
        }
+
+       run_route (start_sample, end_sample, nframes, 0, false, false);
+       return 0;
+}
+
+int
+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;
 }
 
 #ifdef __clang__
@@ -3983,6 +3976,9 @@ Route::update_signal_latency (bool apply_to_delayline)
        // here or in Session::* ? -> also zero send latencies,
        // and make sure that re-enabling a route updates things again...
 
+       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;
@@ -3991,6 +3987,14 @@ Route::update_signal_latency (bool apply_to_delayline)
                if (boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (*i)) {
                        snd->set_delay_in (l_out + _output->latency());
                }
+
+               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);
+                       }
+               }
                (*i)->set_output_latency (l_out);
                if ((*i)->active ()) {
                        l_out += (*i)->signal_latency ();
@@ -4002,6 +4006,27 @@ Route::update_signal_latency (bool apply_to_delayline)
        _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));
+                       }
+               }
+
                (*i)->set_input_latency (l_in);
                (*i)->set_playback_offset (_signal_latency + _output->latency ());
                (*i)->set_capture_offset (_input->latency ());
@@ -4035,7 +4060,7 @@ void
 Route::apply_latency_compensation ()
 {
        if (_delayline) {
-               samplecnt_t old = _delayline->get_delay ();
+               samplecnt_t old = _delayline->delay ();
 
                samplecnt_t play_lat_in = _input->connected_latency (true);
                samplecnt_t play_lat_out = _output->connected_latency (true);
@@ -4051,7 +4076,7 @@ Route::apply_latency_compensation ()
 
                _delayline->set_delay (latcomp > 0 ? latcomp : 0);
 
-               if (old !=  _delayline->get_delay ()) {
+               if (old !=  _delayline->delay ()) {
                        signal_latency_updated (); /* EMIT SIGNAL */
                }
        }
@@ -4584,6 +4609,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 ();
                }
@@ -4601,28 +4627,26 @@ Route::set_private_port_latencies (bool playback) const
 void
 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.
@@ -4820,7 +4844,6 @@ Route::setup_invisible_processors ()
                }
        }
 
-
        /* EXPORT PROCESSOR */
        if (_capturing_processor) {
                assert (!_capturing_processor->display_to_user ());
@@ -4829,7 +4852,30 @@ Route::setup_invisible_processors ()
                        /* insert after disk-reader */
                        new_processors.insert (++reader_pos, _capturing_processor);
                } else {
-                       new_processors.push_front (_capturing_processor);
+                       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);
+                       }
                }
        }
 
@@ -4842,9 +4888,16 @@ Route::setup_invisible_processors ()
                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 {
-                       new_processors.push_front (_meter);
+                       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);
+                       }
                }
        }
 
@@ -4989,7 +5042,11 @@ 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 (samplepos_t pos)
@@ -5390,6 +5447,19 @@ Route::filter_enable_controllable (bool) const
 #endif
 }
 
+boost::shared_ptr<AutomationControl>
+Route::tape_drive_controllable () const
+{
+#ifdef MIXBUS
+
+       if ( _ch_pre && (is_master() || mixbus()) ) {
+               return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (_ch_pre->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, 4)));
+       }
+#endif
+
+       return boost::shared_ptr<AutomationControl>();
+}
+
 string
 Route::eq_band_name (uint32_t band) const
 {
@@ -5555,6 +5625,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
 {
@@ -5796,6 +5903,16 @@ Route::set_disk_io_point (DiskIOPoint diop)
        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().
@@ -5891,68 +6008,6 @@ Route::monitoring_state () const
                        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: sept 30 2017: Above is not the case: punch-in/out location is
-        * global session playhead position.
-        * When this method is called from process_output_buffers() we need
-        * to use delay-compensated route's process-position.
-        *
-        * NB. Disk reader/writer may also be offset by a same amount of time.
-        *
-        * Also keep in mind that _session.transport_rolling() is false during
-        * pre-roll but the disk already produces output.
-        *
-        * TODO: FIXME
-        */
-
-       if (_session.config.get_punch_in() || _session.config.get_punch_out()) {
-               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;
+       return get_auto_monitoring_state();
 }
-
 #endif