*** NEW CODING POLICY ***
[ardour.git] / libs / ardour / route.cc
index e8e469b44633ab6c136f810770480ad6e0991999..0111ca8e103aedc059fd12855b1981cba72039da 100644 (file)
 #include <cassert>
 
 #include <sigc++/bind.h>
-#include <pbd/xml++.h>
-#include <pbd/enumwriter.h>
-
-#include <ardour/timestamps.h>
-#include <ardour/audioengine.h>
-#include <ardour/route.h>
-#include <ardour/buffer.h>
-#include <ardour/processor.h>
-#include <ardour/plugin_insert.h>
-#include <ardour/port_insert.h>
-#include <ardour/send.h>
-#include <ardour/session.h>
-#include <ardour/utils.h>
-#include <ardour/configuration.h>
-#include <ardour/cycle_timer.h>
-#include <ardour/route_group.h>
-#include <ardour/port.h>
-#include <ardour/audio_port.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/panner.h>
-#include <ardour/dB.h>
-#include <ardour/amp.h>
-#include <ardour/meter.h>
-#include <ardour/buffer_set.h>
+#include "pbd/xml++.h"
+#include "pbd/enumwriter.h"
+#include "pbd/stacktrace.h"
+#include "pbd/memento_command.h"
+
+#include "evoral/Curve.hpp"
+
+#include "ardour/timestamps.h"
+#include "ardour/audioengine.h"
+#include "ardour/route.h"
+#include "ardour/buffer.h"
+#include "ardour/processor.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/port_insert.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
+#include "ardour/utils.h"
+#include "ardour/configuration.h"
+#include "ardour/cycle_timer.h"
+#include "ardour/route_group.h"
+#include "ardour/port.h"
+#include "ardour/audio_port.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/panner.h"
+#include "ardour/dB.h"
+#include "ardour/amp.h"
+#include "ardour/meter.h"
+#include "ardour/buffer_set.h"
+#include "ardour/mix.h"
+#include "ardour/profile.h"
+
 #include "i18n.h"
 
 using namespace std;
@@ -53,21 +60,23 @@ using namespace ARDOUR;
 using namespace PBD;
 
 uint32_t Route::order_key_cnt = 0;
+sigc::signal<void,const char*> Route::SyncOrderKeys;
 
-
-Route::Route (Session& sess, string name, int input_min, int input_max, int output_min, int output_max, Flag flg, DataType default_type)
-       : IO (sess, name, input_min, input_max, output_min, output_max, default_type),
-         _flags (flg),
-         _solo_control (new ToggleControllable (X_("solo"), *this, ToggleControllable::SoloControl)),
-         _mute_control (new ToggleControllable (X_("mute"), *this, ToggleControllable::MuteControl))
+Route::Route (Session& sess, string name,
+               int in_min, int in_max, int out_min, int out_max,
+               Flag flg, DataType default_type)
+       : IO (sess, name, in_min, in_max, out_min, out_max, default_type)
+       , _flags (flg)
+       , _solo_control (new ToggleControllable (X_("solo"), *this, ToggleControllable::SoloControl))
+       , _mute_control (new ToggleControllable (X_("mute"), *this, ToggleControllable::MuteControl))
 {
        init ();
 }
 
 Route::Route (Session& sess, const XMLNode& node, DataType default_type)
-       : IO (sess, *node.child ("IO"), default_type),
-         _solo_control (new ToggleControllable (X_("solo"), *this, ToggleControllable::SoloControl)),
-         _mute_control (new ToggleControllable (X_("mute"), *this, ToggleControllable::MuteControl))
+       : IO (sess, *node.child ("IO"), default_type)
+       ,  _solo_control (new ToggleControllable (X_("solo"), *this, ToggleControllable::SoloControl))
+       ,  _mute_control (new ToggleControllable (X_("mute"), *this, ToggleControllable::MuteControl))
 {
        init ();
        _set_state (node, false);
@@ -80,10 +89,11 @@ Route::init ()
        _muted = false;
        _soloed = false;
        _solo_safe = false;
+       _recordable = true;
+       _active = true;
        _phase_invert = false;
        _denormal_protection = false;
        order_keys[strdup (N_("signal"))] = order_key_cnt++;
-       _active = true;
        _silent = false;
        _meter_point = MeterPostFader;
        _initial_delay = 0;
@@ -123,9 +133,7 @@ Route::~Route ()
                free ((void*)(i->first));
        }
 
-       if (_control_outs) {
-               delete _control_outs;
-       }
+       delete _control_outs;
 }
 
 void
@@ -161,9 +169,55 @@ void
 Route::set_order_key (const char* name, long n)
 {
        order_keys[strdup(name)] = n;
+
+       if (Config->get_sync_all_route_ordering()) {
+               for (OrderKeys::iterator x = order_keys.begin(); x != order_keys.end(); ++x) {
+                       x->second = n;
+               }
+       } 
+
        _session.set_dirty ();
 }
 
+void
+Route::sync_order_keys (const char* base)
+{
+       if (order_keys.empty()) {
+               return;
+       }
+
+       OrderKeys::iterator i;
+       uint32_t key;
+
+       if ((i = order_keys.find (base)) == order_keys.end()) {
+               /* key doesn't exist, use the first existing key (during session initialization) */
+               i = order_keys.begin();
+               key = i->second;
+               ++i;
+       } else {
+               /* key exists - use it and reset all others (actually, itself included) */
+               i = order_keys.begin();
+               key = i->second;
+       }
+
+       for (; i != order_keys.end(); ++i) {
+               i->second = key;
+       }
+}
+
+string
+Route::ensure_track_or_route_name(string name, Session &session)
+{
+       string newname = name;
+
+       while (session.route_by_name (newname) != NULL) {
+               newname = bump_name_once (newname);
+       }
+
+       return newname;
+}
+
+
 void
 Route::inc_gain (gain_t fraction, void *src)
 {
@@ -238,9 +292,8 @@ Route::set_gain (gain_t val, void *src)
  */
 void
 Route::process_output_buffers (BufferSet& bufs,
-                              nframes_t start_frame, nframes_t end_frame, 
-                              nframes_t nframes, nframes_t offset, bool with_processors, int declick,
-                              bool meter)
+               nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset,
+               bool with_processors, int declick, bool meter)
 {
        // This is definitely very audio-only for now
        assert(_default_type == DataType::AUDIO);
@@ -290,37 +343,37 @@ Route::process_output_buffers (BufferSet& bufs,
                }
        }
 
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           GLOBAL DECLICK (for transport changes etc.)
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        if (declick > 0) {
-               Amp::run (bufs, nframes, 0.0, 1.0, false);
+               Amp::run_in_place (bufs, nframes, 0.0, 1.0, false);
                _pending_declick = 0;
        } else if (declick < 0) {
-               Amp::run (bufs, nframes, 1.0, 0.0, false);
+               Amp::run_in_place (bufs, nframes, 1.0, 0.0, false);
                _pending_declick = 0;
        } else {
 
                /* no global declick */
 
                if (solo_gain != dsg) {
-                       Amp::run (bufs, nframes, solo_gain, dsg, false);
+                       Amp::run_in_place (bufs, nframes, solo_gain, dsg, false);
                        solo_gain = dsg;
                }
        }
 
 
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           INPUT METERING & MONITORING
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        if (meter && (_meter_point == MeterInput)) {
-               _meter->run(bufs, start_frame, end_frame, nframes, offset);
+               _meter->run_in_place(bufs, start_frame, end_frame, nframes, offset);
        }
 
        if (!_soloed && _mute_affects_pre_fader && (mute_gain != dmg)) {
-               Amp::run (bufs, nframes, mute_gain, dmg, false);
+               Amp::run_in_place (bufs, nframes, mute_gain, dmg, false);
                mute_gain = dmg;
                mute_declick_applied = true;
        }
@@ -342,7 +395,8 @@ Route::process_output_buffers (BufferSet& bufs,
                        
                        // TODO: this is probably wrong
 
-                       (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording()))
+                       ( no_monitor && record_enabled()
+                               && (!Config->get_auto_input() || _session.actively_recording()) )
 
                        ) {
                        
@@ -355,9 +409,9 @@ Route::process_output_buffers (BufferSet& bufs,
                } 
        } 
 
-       /* -----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           DENORMAL CONTROL
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        if (_denormal_protection || Config->get_denormal_protection()) {
 
@@ -370,9 +424,9 @@ Route::process_output_buffers (BufferSet& bufs,
                }
        }
 
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           PRE-FADER REDIRECTS
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        if (with_processors) {
                Glib::RWLock::ReaderLock rm (_processor_lock, Glib::TRY_LOCK);
@@ -381,7 +435,7 @@ Route::process_output_buffers (BufferSet& bufs,
                                for (i = _processors.begin(); i != _processors.end(); ++i) {
                                        switch ((*i)->placement()) {
                                        case PreFader:
-                                               (*i)->run (bufs, start_frame, end_frame, nframes, offset);
+                                               (*i)->run_in_place (bufs, start_frame, end_frame, nframes, offset);
                                                break;
                                        case PostFader:
                                                post_fader_work = true;
@@ -403,21 +457,25 @@ Route::process_output_buffers (BufferSet& bufs,
                } 
        }
 
-       // This really should already be true...
-       bufs.set_count(pre_fader_streams());
+       /* When we entered this method, the number of bufs was set by n_process_buffers(), so
+        * it may be larger than required.  Consider e.g a mono track with two redirects A and B.
+        * If A has one input and three outputs, and B three inputs and one output, n_process_buffers()
+        * will be 3.  In this case, now we've done pre-fader redirects, we can reset the number of bufs.
+        */
+       bufs.set_count (pre_fader_streams());
        
        if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_post_fader) {
-               Amp::run (bufs, nframes, mute_gain, dmg, false);
+               Amp::run_in_place (bufs, nframes, mute_gain, dmg, false);
                mute_gain = dmg;
                mute_declick_applied = true;
        }
 
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           PRE-FADER METERING & MONITORING
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        if (meter && (_meter_point == MeterPreFader)) {
-               _meter->run(bufs, start_frame, end_frame, nframes, offset);
+               _meter->run_in_place(bufs, start_frame, end_frame, nframes, offset);
        }
 
        
@@ -436,7 +494,8 @@ Route::process_output_buffers (BufferSet& bufs,
                        
                        // rec-enabled but not s/w monitoring 
                        
-                       (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording()))
+                       ( no_monitor && record_enabled()
+                               && (!Config->get_auto_input() || _session.actively_recording()) )
 
                        ) {
                        
@@ -448,9 +507,9 @@ Route::process_output_buffers (BufferSet& bufs,
                } 
        } 
        
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           GAIN STAGE
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        /* if not recording or recording and requiring any monitor signal, then apply gain */
 
@@ -458,15 +517,11 @@ Route::process_output_buffers (BufferSet& bufs,
 
                !(record_enabled() && _session.actively_recording()) || 
                
-           // OR recording 
-               
-               // h/w monitoring not in use 
+               // OR recording 
                
-               (!Config->get_monitoring_model() == HardwareMonitoring && 
+               // AND software monitoring required
 
-                // AND software monitoring required
-
-                Config->get_monitoring_model() == SoftwareMonitoring)) { 
+               Config->get_monitoring_model() == SoftwareMonitoring) { 
                
                if (apply_gain_automation) {
                        
@@ -498,7 +553,7 @@ Route::process_output_buffers (BufferSet& bufs,
                        
                        if (_gain != dg) {
                                
-                               Amp::run (bufs, nframes, _gain, dg, _phase_invert);
+                               Amp::run_in_place (bufs, nframes, _gain, dg, _phase_invert);
                                _gain = dg;
                                
                        } else if (_gain != 0 && (_phase_invert || _gain != 1.0)) {
@@ -535,11 +590,13 @@ Route::process_output_buffers (BufferSet& bufs,
 
        }
 
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           POST-FADER REDIRECTS
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
-       /* note that post_fader_work cannot be true unless with_processors was also true, so don't test both */
+       /* note that post_fader_work cannot be true unless with_processors was also true,
+          so don't test both
+       */
 
        if (post_fader_work) {
 
@@ -551,7 +608,7 @@ Route::process_output_buffers (BufferSet& bufs,
                                        case PreFader:
                                                break;
                                        case PostFader:
-                                               (*i)->run (bufs, start_frame, end_frame, nframes, offset);
+                                               (*i)->run_in_place (bufs, start_frame, end_frame, nframes, offset);
                                                break;
                                        }
                                }
@@ -566,18 +623,346 @@ Route::process_output_buffers (BufferSet& bufs,
                                        }
                                }
                        }
-               } 
-       }
+               } 
+       }
+
+       if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_control_outs) {
+               Amp::run_in_place (bufs, nframes, mute_gain, dmg, false);
+               mute_gain = dmg;
+               mute_declick_applied = true;
+       }
+
+       /* -------------------------------------------------------------------------------------------
+          CONTROL OUTPUT STAGE
+          ----------------------------------------------------------------------------------------- */
+
+       if ((_meter_point == MeterPostFader) && co) {
+               
+               solo_audible = solo_gain > 0;
+               mute_audible = dmg > 0 || !_mute_affects_control_outs;
+
+               if ( // silent anyway
+
+                       (_gain == 0 && !apply_gain_automation) ||
+
+                       // muted by solo of another track
+
+                       !solo_audible || 
+
+                       // muted by mute of this track 
+
+                       !mute_audible ||
+
+                       // recording but not s/w monitoring 
+                       
+                       ( no_monitor && record_enabled()
+                               && (!Config->get_auto_input() || _session.actively_recording()) )
+
+                       ) {
+                       
+                       co->silence (nframes, offset);
+                       
+               } else {
+
+                       co->deliver_output (bufs, start_frame, end_frame, nframes, offset);
+               } 
+       } 
+
+       /* -------------------------------------------------------------------------------------------
+          GLOBAL MUTE 
+          ----------------------------------------------------------------------------------------- */
+
+       if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_main_outs) {
+               Amp::run_in_place (bufs, nframes, mute_gain, dmg, false);
+               mute_gain = dmg;
+               mute_declick_applied = true;
+       }
+       
+       /* -------------------------------------------------------------------------------------------
+          MAIN OUTPUT STAGE
+          ----------------------------------------------------------------------------------------- */
+
+       solo_audible = dsg > 0;
+       mute_audible = dmg > 0 || !_mute_affects_main_outs;
+       
+       if (n_outputs().get(_default_type) == 0) {
+           
+           /* relax */
+
+       } else if (no_monitor && record_enabled()
+                       && (!Config->get_auto_input() || _session.actively_recording())) {
+               
+               IO::silence (nframes, offset);
+               
+       } else {
+
+               if ( // silent anyway
+
+                       (_gain == 0 && !apply_gain_automation) ||
+                       
+                       // muted by solo of another track, but not using control outs for solo
+
+                       (!solo_audible && (Config->get_solo_model() != SoloBus)) ||
+                       
+                       // muted by mute of this track
+
+                       !mute_audible
+
+                       ) {
+
+                       /* don't use Route::silence() here, because that causes
+                          all outputs (sends, port processors, etc. to be silent).
+                       */
+                       
+                       if (_meter_point == MeterPostFader) {
+                               peak_meter().reset();
+                       }
+
+                       IO::silence (nframes, offset);
+                       
+               } else {
+                       
+                       deliver_output(bufs, start_frame, end_frame, nframes, offset);
+
+               }
+
+       }
+
+       /* -------------------------------------------------------------------------------------------
+          POST-FADER METERING
+          ----------------------------------------------------------------------------------------- */
+
+       if (meter && (_meter_point == MeterPostFader)) {
+               if ((_gain == 0 && !apply_gain_automation) || dmg == 0) {
+                       _meter->reset();
+               } else {
+                       _meter->run_in_place(output_buffers(), start_frame, end_frame, nframes, offset);
+               }
+       }
+}
+
+#ifdef NEW_POB
+/** 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 offset Output offset (of port buffers, for split cycles)
+ *
+ * Note that (end_frame - start_frame) may not be equal to nframes when the
+ * transport speed isn't 1.0 (eg varispeed).
+ */
+void
+Route::process_output_buffers (BufferSet& bufs,
+               nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset,
+               bool with_processors, int declick, bool meter)
+{
+       // This is definitely very audio-only for now
+       assert(_default_type == DataType::AUDIO);
+       
+       ProcessorList::iterator i;
+       bool post_fader_work = false;
+       bool mute_declick_applied = false;
+       gain_t dmg, dsg, dg;
+       IO *co;
+       bool mute_audible;
+       bool solo_audible;
+       bool no_monitor;
+       gain_t* gab = _session.gain_automation_buffer();
+
+       switch (Config->get_monitoring_model()) {
+       case HardwareMonitoring:
+       case ExternalMonitoring:
+               no_monitor = true;
+               break;
+       default:
+               no_monitor = false;
+       }
+
+       declick = _pending_declick;
+
+       {
+               Glib::Mutex::Lock cm (_control_outs_lock, Glib::TRY_LOCK);
+               
+               if (cm.locked()) {
+                       co = _control_outs;
+               } else {
+                       co = 0;
+               }
+       }
+       
+       { 
+               Glib::Mutex::Lock dm (declick_lock, Glib::TRY_LOCK);
+               
+               if (dm.locked()) {
+                       dmg = desired_mute_gain;
+                       dsg = desired_solo_gain;
+                       dg = _desired_gain;
+               } else {
+                       dmg = mute_gain;
+                       dsg = solo_gain;
+                       dg = _gain;
+               }
+       }
+
+       /* -------------------------------------------------------------------------------------------
+          GLOBAL DECLICK (for transport changes etc.)
+          input metering & monitoring (control outs)
+          denormal control
+          pre-fader redirects
+          pre-fader metering & monitoring (control outs)
+          gain stage
+          post-fader redirects
+          global mute
+          main output
+          post-fader metering & monitoring (control outs)
+          ----------------------------------------------------------------------------------------- */
+
+       {
+               Glib::RWLock::ReaderLock rm (_processor_lock, Glib::TRY_LOCK);
+               for (i = processors.begin(); i != processors.end(); ++i) {
+                       (*i)->run_in_place (bufs, start_frame, end_frame, nframes, offset);
+               }
+       }
+
+       
+       /* -------------------------------------------------------------------------------------------
+          INPUT METERING & MONITORING
+          ----------------------------------------------------------------------------------------- */
+
+       if (meter && (_meter_point == MeterInput)) {
+               _meter->run_in_place(bufs, start_frame, end_frame, nframes, offset);
+       }
+
+       if (!_soloed && _mute_affects_pre_fader && (mute_gain != dmg)) {
+               Amp::run_in_place (bufs, nframes, mute_gain, dmg, false);
+               mute_gain = dmg;
+               mute_declick_applied = true;
+       }
+
+       /* -------------------------------------------------------------------------------------------
+          PRE-FADER REDIRECTS
+          ----------------------------------------------------------------------------------------- */
+
+       // This really should already be true...
+       bufs.set_count(pre_fader_streams());
+       
+
+       if ((_meter_point == MeterPreFader) && co) {
+               
+               solo_audible = dsg > 0;
+               mute_audible = dmg > 0 || !_mute_affects_pre_fader;
+               
+               if ( // muted by solo of another track
+                       
+                       !solo_audible || 
+                       
+                       // muted by mute of this track 
+                       
+                       !mute_audible ||
+                       
+                       // rec-enabled but not s/w monitoring 
+                       
+                       ( no_monitor && record_enabled()
+                               && (!Config->get_auto_input() || _session.actively_recording()) )
+
+                       ) {
+                       
+                       co->silence (nframes, offset);
+                       
+               } else {
+
+                       co->deliver_output (bufs, start_frame, end_frame, nframes, offset);
+               } 
+       } 
+       
+       /* -------------------------------------------------------------------------------------------
+          GAIN STAGE
+          ----------------------------------------------------------------------------------------- */
+
+       /* if not recording or recording and requiring any monitor signal, then apply gain */
+
+       if ( // not recording 
+
+               !(record_enabled() && _session.actively_recording()) || 
+               
+               // OR recording 
+               
+               // AND software monitoring required
+
+               Config->get_monitoring_model() == SoftwareMonitoring) { 
+               
+               if (apply_gain_automation) {
+                       
+                       if (_phase_invert) {
+                               for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
+                                       Sample* const sp = i->data();
+                                       
+                                       for (nframes_t nx = 0; nx < nframes; ++nx) {
+                                               sp[nx] *= -gab[nx];
+                                       }
+                               }
+                       } else {
+                               for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
+                                       Sample* const sp = i->data();
+                                       
+                                       for (nframes_t nx = 0; nx < nframes; ++nx) {
+                                               sp[nx] *= gab[nx];
+                                       }
+                               }
+                       }
+                       
+                       if (apply_gain_automation && _session.transport_rolling() && nframes > 0) {
+                               _effective_gain = gab[nframes-1];
+                       }
+                       
+               } else {
+                       
+                       /* manual (scalar) gain */
+                       
+                       if (_gain != dg) {
+                               
+                               Amp::run_in_place (bufs, nframes, _gain, dg, _phase_invert);
+                               _gain = dg;
+                               
+                       } else if (_gain != 0 && (_phase_invert || _gain != 1.0)) {
+                               
+                               /* no need to interpolate current gain value,
+                                  but its non-unity, so apply it. if the gain
+                                  is zero, do nothing because we'll ship silence
+                                  below.
+                               */
+
+                               gain_t this_gain;
+                               
+                               if (_phase_invert) {
+                                       this_gain = -_gain;
+                               } else {
+                                       this_gain = _gain;
+                               }
+                               
+                               for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
+                                       Sample* const sp = i->data();
+                                       apply_gain_to_buffer(sp,nframes,this_gain);
+                               }
+
+                       } else if (_gain == 0) {
+                               for (BufferSet::audio_iterator i = bufs.audio_begin(); i != bufs.audio_end(); ++i) {
+                                       i->clear();
+                               }
+                       }
+               }
+
+       } else {
+
+               /* actively recording, no monitoring required; leave buffers as-is to save CPU cycles */
 
-       if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_control_outs) {
-               Amp::run (bufs, nframes, mute_gain, dmg, false);
-               mute_gain = dmg;
-               mute_declick_applied = true;
        }
 
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           CONTROL OUTPUT STAGE
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        if ((_meter_point == MeterPostFader) && co) {
                
@@ -587,17 +972,17 @@ Route::process_output_buffers (BufferSet& bufs,
                if ( // silent anyway
 
                        (_gain == 0 && !apply_gain_automation) || 
-                   
-                     // muted by solo of another track
+
+                       // muted by solo of another track
 
                        !solo_audible || 
-                   
-                     // muted by mute of this track 
+
+                       // muted by mute of this track 
 
                        !mute_audible ||
 
-                   // recording but not s/w monitoring 
-                       
+                       // recording but not s/w monitoring 
+
                        (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording()))
 
                        ) {
@@ -610,19 +995,9 @@ Route::process_output_buffers (BufferSet& bufs,
                } 
        } 
 
-       /* ----------------------------------------------------------------------
-          GLOBAL MUTE 
-          ----------------------------------------------------------------------*/
-
-       if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_main_outs) {
-               Amp::run (bufs, nframes, mute_gain, dmg, false);
-               mute_gain = dmg;
-               mute_declick_applied = true;
-       }
-       
-       /* ----------------------------------------------------------------------------------------------------
+       /* -------------------------------------------------------------------------------------------
           MAIN OUTPUT STAGE
-          -------------------------------------------------------------------------------------------------- */
+          ----------------------------------------------------------------------------------------- */
 
        solo_audible = dsg > 0;
        mute_audible = dmg > 0 || !_mute_affects_main_outs;
@@ -631,7 +1006,8 @@ Route::process_output_buffers (BufferSet& bufs,
            
            /* relax */
 
-       } else if (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording())) {
+       } else if (no_monitor && record_enabled()
+                       && (!Config->get_auto_input() || _session.actively_recording())) {
                
                IO::silence (nframes, offset);
                
@@ -639,22 +1015,22 @@ Route::process_output_buffers (BufferSet& bufs,
 
                if ( // silent anyway
 
-                   (_gain == 0 && !apply_gain_automation) ||
-                   
-                   // muted by solo of another track, but not using control outs for solo
+                       (_gain == 0 && !apply_gain_automation) ||
+
+                       // muted by solo of another track, but not using control outs for solo
 
-                   (!solo_audible && (Config->get_solo_model() != SoloBus)) ||
-                   
-                   // muted by mute of this track
+                       (!solo_audible && (Config->get_solo_model() != SoloBus)) ||
 
-                   !mute_audible
+                       // muted by mute of this track
+
+                       !mute_audible
 
                        ) {
 
                        /* don't use Route::silence() here, because that causes
                           all outputs (sends, port processors, etc. to be silent).
                        */
-                       
+
                        if (_meter_point == MeterPostFader) {
                                peak_meter().reset();
                        }
@@ -668,20 +1044,10 @@ Route::process_output_buffers (BufferSet& bufs,
                }
 
        }
-
-       /* ----------------------------------------------------------------------------------------------------
-          POST-FADER METERING
-          -------------------------------------------------------------------------------------------------- */
-
-       if (meter && (_meter_point == MeterPostFader)) {
-               if ((_gain == 0 && !apply_gain_automation) || dmg == 0) {
-                       _meter->reset();
-               } else {
-                       _meter->run(output_buffers(), start_frame, end_frame, nframes, offset);
-               }
-       }
 }
 
+#endif /* NEW_POB */
+
 ChanCount
 Route::n_process_buffers ()
 {
@@ -698,9 +1064,11 @@ Route::passthru (nframes_t start_frame, nframes_t end_frame, nframes_t nframes,
        collect_input (bufs, nframes, offset);
 
        if (meter_first) {
-               _meter->run(bufs, start_frame, end_frame, nframes, offset);
+               _meter->run_in_place(bufs, start_frame, end_frame, nframes, offset);
                meter_first = false;
-       }
+        } else {
+               meter_first = true;
+        }
                
        process_output_buffers (bufs, start_frame, end_frame, nframes, offset, true, declick, meter_first);
 }
@@ -727,6 +1095,31 @@ Route::set_solo (bool yn, void *src)
                _soloed = yn;
                solo_changed (src); /* EMIT SIGNAL */
                _solo_control->Changed (); /* EMIT SIGNAL */
+       }       
+       
+       catch_up_on_solo_mute_override ();
+}
+
+void
+Route::catch_up_on_solo_mute_override ()
+{
+       if (Config->get_solo_model() != InverseMute) {
+               return;
+       }
+       
+       {
+
+               Glib::Mutex::Lock lm (declick_lock);
+               
+               if (_muted) {
+                       if (Config->get_solo_mute_override()) {
+                               desired_mute_gain = (_soloed?1.0:0.0);
+                       } else {
+                               desired_mute_gain = 0.0;
+                       }
+               } else {
+                       desired_mute_gain = 1.0;
+               }
        }
 }
 
@@ -766,14 +1159,19 @@ Route::set_mute (bool yn, void *src)
                _mute_control->Changed (); /* EMIT SIGNAL */
                
                Glib::Mutex::Lock lm (declick_lock);
-               desired_mute_gain = (yn?0.0f:1.0f);
+               
+               if (_soloed && Config->get_solo_mute_override()){
+                       desired_mute_gain = 1.0f;
+               } else {
+                       desired_mute_gain = (yn?0.0f:1.0f);
+               }
        }
 }
 
 int
 Route::add_processor (boost::shared_ptr<Processor> processor, ProcessorStreams* err)
 {
-       ChanCount old_rmo = processor_max_outs;
+       ChanCount old_pmo = processor_max_outs;
 
        if (!_session.engine().connected()) {
                return 1;
@@ -787,9 +1185,18 @@ Route::add_processor (boost::shared_ptr<Processor> processor, ProcessorStreams*
 
                //processor->set_default_type(_default_type);
 
-               if ((pi = boost::dynamic_pointer_cast<PluginInsert>(processor)) != 0) {
-                       pi->set_count (1);
+               _processors.push_back (processor);
+
+               // Set up processor list channels.  This will set processor->[input|output]_streams(),
+               // configure redirect ports properly, etc.
+               if (_reset_processor_counts (err)) {
+                       _processors.pop_back ();
+                       _reset_processor_counts (0); // it worked before we tried to add it ...
+                       return -1;
+               }
 
+               if ((pi = boost::dynamic_pointer_cast<PluginInsert>(processor)) != 0) {
+                       
                        if (pi->natural_input_streams() == ChanCount::ZERO) {
                                /* generator plugin */
                                _have_internal_generator = true;
@@ -797,39 +1204,42 @@ Route::add_processor (boost::shared_ptr<Processor> processor, ProcessorStreams*
                        
                }
                
-               _processors.push_back (processor);
+               // Ensure peak vector sizes before the plugin is activated
 
-               // Set up processor list channels.  This will set processor->[input|output]_streams(),
-               // configure redirect ports properly, etc.
-               if (_reset_plugin_counts (err)) {
-                       _processors.pop_back ();
-                       _reset_plugin_counts (0); // it worked before we tried to add it ...
-                       return -1;
-               }
+               ChanCount potential_max_streams;
 
-               // Ensure peak vector sizes before the plugin is activated
-               ChanCount potential_max_streams = max(processor->input_streams(), processor->output_streams());
-               _meter->configure_io(potential_max_streams, potential_max_streams);
+               potential_max_streams.set (DataType::AUDIO, max (processor->input_streams().n_audio(), 
+                                                                processor->output_streams().n_audio()));
+               potential_max_streams.set (DataType::MIDI, max (processor->input_streams().n_midi(), 
+                                                               processor->output_streams().n_midi()));
 
+               _meter->configure_io (potential_max_streams, potential_max_streams);
+
+               // XXX: do we want to emit the signal here ? change call order.
                processor->activate ();
                processor->ActiveChanged.connect (bind (mem_fun (_session, &Session::update_latency_compensation), false, false));
 
                _user_latency = 0;
        }
        
-       if (processor_max_outs != old_rmo || old_rmo == ChanCount::ZERO) {
+       if (processor_max_outs != old_pmo || old_pmo == ChanCount::ZERO) {
                reset_panner ();
        }
 
-
        processors_changed (); /* EMIT SIGNAL */
+       
        return 0;
 }
 
 int
 Route::add_processors (const ProcessorList& others, ProcessorStreams* err)
 {
-       ChanCount old_rmo = processor_max_outs;
+       /* NOTE: this is intended to be used ONLY when copying
+          processors from another Route. Hence the subtle
+          differences between this and ::add_processor()
+       */
+
+       ChanCount old_pmo = processor_max_outs;
 
        if (!_session.engine().connected()) {
                return 1;
@@ -856,25 +1266,24 @@ Route::add_processors (const ProcessorList& others, ProcessorStreams* err)
                        }
 
                        // Ensure peak vector sizes before the plugin is activated
-                       _meter->configure_io(potential_max_streams, potential_max_streams);
+                       _meter->configure_io (potential_max_streams, potential_max_streams);
 
                        _processors.push_back (*i);
                        
-                       if (_reset_plugin_counts (err)) {
+                       if (_reset_processor_counts (err)) {
                                ++existing_end;
                                _processors.erase (existing_end, _processors.end());
-                               _reset_plugin_counts (0); // it worked before we tried to add it ...
+                               _reset_processor_counts (0); // it worked before we tried to add it ...
                                return -1;
                        }
                        
-                       (*i)->activate ();
                        (*i)->ActiveChanged.connect (bind (mem_fun (_session, &Session::update_latency_compensation), false, false));
                }
 
                _user_latency = 0;
        }
        
-       if (processor_max_outs != old_rmo || old_rmo == ChanCount::ZERO) {
+       if (processor_max_outs != old_pmo || old_pmo == ChanCount::ZERO) {
                reset_panner ();
        }
 
@@ -885,7 +1294,6 @@ Route::add_processors (const ProcessorList& others, ProcessorStreams* err)
 /** Turn off all processors with a given placement
  * @param p Placement of processors to disable
  */
-
 void
 Route::disable_processors (Placement p)
 {
@@ -893,7 +1301,7 @@ Route::disable_processors (Placement p)
        
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if ((*i)->placement() == p) {
-                       (*i)->set_active (false);
+                       (*i)->deactivate ();
                }
        }
 
@@ -902,14 +1310,13 @@ Route::disable_processors (Placement p)
 
 /** Turn off all redirects 
  */
-
 void
 Route::disable_processors ()
 {
        Glib::RWLock::ReaderLock lm (_processor_lock);
        
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               (*i)->set_active (false);
+               (*i)->deactivate ();
        }
        
        _session.set_dirty ();
@@ -918,7 +1325,6 @@ Route::disable_processors ()
 /** Turn off all redirects with a given placement
  * @param p Placement of redirects to disable
  */
-
 void
 Route::disable_plugins (Placement p)
 {
@@ -926,7 +1332,7 @@ Route::disable_plugins (Placement p)
        
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if (boost::dynamic_pointer_cast<PluginInsert> (*i) && (*i)->placement() == p) {
-                       (*i)->set_active (false);
+                       (*i)->deactivate ();
                }
        }
        
@@ -935,7 +1341,6 @@ Route::disable_plugins (Placement p)
 
 /** Turn off all plugins
  */
-
 void
 Route::disable_plugins ()
 {
@@ -943,7 +1348,7 @@ Route::disable_plugins ()
        
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if (boost::dynamic_pointer_cast<PluginInsert> (*i)) {
-                       (*i)->set_active (false);
+                       (*i)->deactivate ();
                }
        }
        
@@ -968,7 +1373,7 @@ Route::ab_plugins (bool forward)
                        }
 
                        if ((*i)->active()) {
-                               (*i)->set_active (false);
+                               (*i)->deactivate ();
                                (*i)->set_next_ab_is_active (true);
                        } else {
                                (*i)->set_next_ab_is_active (false);
@@ -986,9 +1391,9 @@ Route::ab_plugins (bool forward)
                        }
 
                        if ((*i)->get_next_ab_is_active()) {
-                               (*i)->set_active (true);
+                               (*i)->activate ();
                        } else {
-                               (*i)->set_active (false);
+                               (*i)->deactivate ();
                        }
                }
        }
@@ -1003,9 +1408,10 @@ Route::pre_fader_streams() const
 {
        boost::shared_ptr<Processor> processor;
 
-       // Find the last pre-fader redirect
+       /* Find the last pre-fader redirect that isn't a send; sends don't affect the number
+        * of streams. */
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               if ((*i)->placement() == PreFader) {
+               if ((*i)->placement() == PreFader && boost::dynamic_pointer_cast<Send> (*i) == 0) {
                        processor = *i;
                }
        }
@@ -1024,7 +1430,7 @@ Route::pre_fader_streams() const
 void
 Route::clear_processors (Placement p)
 {
-       const ChanCount old_rmo = processor_max_outs;
+       const ChanCount old_pmo = processor_max_outs;
 
        if (!_session.engine().connected()) {
                return;
@@ -1048,7 +1454,7 @@ Route::clear_processors (Placement p)
        }
 
        /* FIXME: can't see how this test can ever fire */
-       if (processor_max_outs != old_rmo) {
+       if (processor_max_outs != old_pmo) {
                reset_panner ();
        }
        
@@ -1060,7 +1466,7 @@ Route::clear_processors (Placement p)
 int
 Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStreams* err)
 {
-       ChanCount old_rmo = processor_max_outs;
+       ChanCount old_pmo = processor_max_outs;
 
        if (!_session.engine().connected()) {
                return 1;
@@ -1078,7 +1484,7 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
 
                                ProcessorList::iterator tmp;
 
-                               /* move along, see failure case for reset_plugin_counts()
+                               /* move along, see failure case for reset_processor_counts()
                                   where we may need to reprocessor the processor.
                                */
 
@@ -1112,30 +1518,29 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
                        return 1;
                }
 
-               if (_reset_plugin_counts (err)) {
+               if (_reset_processor_counts (err)) {
                        /* get back to where we where */
                        _processors.insert (i, processor);
                        /* we know this will work, because it worked before :) */
-                       _reset_plugin_counts (0);
+                       _reset_processor_counts (0);
                        return -1;
                }
 
-               bool foo = false;
+               _have_internal_generator = false;
 
                for (i = _processors.begin(); i != _processors.end(); ++i) {
                        boost::shared_ptr<PluginInsert> pi;
                        
                        if ((pi = boost::dynamic_pointer_cast<PluginInsert>(*i)) != 0) {
                                if (pi->is_generator()) {
-                                       foo = true;
+                                       _have_internal_generator = true;
+                                       break;
                                }
                        }
                }
-
-               _have_internal_generator = foo;
        }
 
-       if (old_rmo != processor_max_outs) {
+       if (old_pmo != processor_max_outs) {
                reset_panner ();
        }
 
@@ -1146,86 +1551,180 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
 }
 
 int
-Route::reset_plugin_counts (ProcessorStreams* err)
+Route::reset_processor_counts (ProcessorStreams* err)
 {
        Glib::RWLock::WriterLock lm (_processor_lock);
-       return _reset_plugin_counts (err);
+       return _reset_processor_counts (err);
 }
 
 
 int
-Route::_reset_plugin_counts (ProcessorStreams* err)
+Route::_reset_processor_counts (ProcessorStreams* err)
 {
        ProcessorList::iterator r;
-       map<Placement,list<ProcessorCount> > processor_map;
-       ChanCount initial_streams;
-
-       /* Process each placement in order, checking to see if we 
-          can really do what has been requested.
-       */
+       uint32_t insert_cnt = 0;
+       uint32_t send_cnt = 0;
+       map<Placement,list<ProcessorCount> > proc_map;
+       ProcessorList::iterator prev;
+       ChanCount initial_streams = n_inputs ();
+       ChanCount previous_initial_streams = n_inputs ();
+       int ret = -1;
+       uint32_t max_audio = 0;
+       uint32_t max_midi = 0;
+
+       processor_max_outs.reset ();
        
-       /* divide processors up by placement so we get the signal flow
+       /* Step 1: build a map that links each insert to an in/out channel count 
+
+          Divide inserts up by placement so we get the signal flow
           properly modelled. we need to do this because the _processors
-          list is not sorted by placement
+          list is not sorted by placement, and because other reasons may 
+          exist now or in the future for this separate treatment.
        */
 
        /* ... but it should/will be... */
        
        for (r = _processors.begin(); r != _processors.end(); ++r) {
 
-               boost::shared_ptr<Processor> processor;
+               boost::shared_ptr<PluginInsert> plugin_insert;
+               boost::shared_ptr<PortInsert> port_insert;
 
-               if ((processor = boost::dynamic_pointer_cast<Processor>(*r)) != 0) {
-                       processor_map[processor->placement()].push_back (ProcessorCount (processor));
+               if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert>(*r)) != 0) {
+
+                       ++insert_cnt;
+                       proc_map[(*r)->placement()].push_back (ProcessorCount (*r));
+
+                       /* reset plugin counts back to one for now so
+                          that we have a predictable, controlled
+                          state to try to configure.
+                       */
+
+                       plugin_insert->set_count (1);
+
+               } else if ((port_insert = boost::dynamic_pointer_cast<PortInsert>(*r)) != 0) {
+
+                       ++insert_cnt;
+                       proc_map[(*r)->placement()].push_back (ProcessorCount (*r));
+
+               } else if (boost::dynamic_pointer_cast<Send> (*r) != 0) {
+                       ++send_cnt;
                }
        }
-       
+
+       if (insert_cnt == 0) {
+               if (send_cnt) {
+                       goto recompute;
+               } else {
+                       ret = 0;
+                       goto streamcount;
+               }
+       }
+
+       /* Now process each placement in order, checking to see if we 
+          can really do what has been requested.
+       */
 
        /* A: PreFader */
        
-       if ( ! check_some_plugin_counts (processor_map[PreFader], n_inputs (), err)) {
-               return -1;
+       if (check_some_processor_counts (proc_map[PreFader], n_inputs (), err)) {
+               goto streamcount;
        }
 
-       ChanCount post_fader_input = (err ? err->count : n_inputs());
+       if (!proc_map[PreFader].empty()) {
+               previous_initial_streams = n_inputs ();
+               for (list<ProcessorCount>::iterator i = proc_map[PreFader].begin(); i != proc_map[PreFader].end(); i++) {
+                       if (i->processor->can_support_io_configuration (previous_initial_streams, initial_streams) == false) {
+                               goto streamcount;
+                       }
+                       previous_initial_streams = initial_streams;
+               }
+       }
 
        /* B: PostFader */
 
-       if ( ! check_some_plugin_counts (processor_map[PostFader], post_fader_input, err)) {
-               return -1;
+       if (check_some_processor_counts (proc_map[PostFader], initial_streams, err)) {
+               goto streamcount;
+       }
+
+       if (!proc_map[PostFader].empty()) {
+               for (list<ProcessorCount>::iterator i = proc_map[PostFader].begin(); i != proc_map[PostFader].end(); i++) {
+                       if (i->processor->can_support_io_configuration (previous_initial_streams, initial_streams) == false) {
+                               goto streamcount;
+                       }
+                       previous_initial_streams = initial_streams;
+               }
        }
 
        /* OK, everything can be set up correctly, so lets do it */
 
-       apply_some_plugin_counts (processor_map[PreFader]);
-       apply_some_plugin_counts (processor_map[PostFader]);
+       apply_some_processor_counts (proc_map[PreFader]);
+       apply_some_processor_counts (proc_map[PostFader]);
 
        /* recompute max outs of any processor */
 
-       processor_max_outs.reset();
-       ProcessorList::iterator prev = _processors.end();
+       ret = 0;
+
+  recompute:
+
+       processor_max_outs.reset ();
+       prev = _processors.end();
 
        for (r = _processors.begin(); r != _processors.end(); prev = r, ++r) {
-               processor_max_outs = max ((*r)->output_streams (), processor_max_outs);
+               boost::shared_ptr<Send> s;
+
+               if ((s = boost::dynamic_pointer_cast<Send> (*r)) != 0) {
+
+                       /* don't pay any attention to send output configuration, since it doesn't
+                          affect the route.
+                        */
+
+                       if (r == _processors.begin()) {
+                               s->expect_inputs (n_inputs());
+                       } else {
+                               s->expect_inputs ((*prev)->output_streams());
+                       }
+
+               } else {
+                       
+                       max_audio = max ((*r)->output_streams ().n_audio(), max_audio);
+                       max_midi = max ((*r)->output_streams ().n_midi(), max_midi);
+               }
        }
 
+       processor_max_outs.set (DataType::AUDIO, max_audio);
+       processor_max_outs.set (DataType::MIDI, max_midi);
+                       
        /* we're done */
-
        return 0;
+
+  streamcount:
+       for (r = _processors.begin(); r != _processors.end(); ++r) {
+               max_audio = max ((*r)->output_streams ().n_audio(), max_audio);
+               max_midi = max ((*r)->output_streams ().n_midi(), max_midi);
+       }
+
+       processor_max_outs.set (DataType::AUDIO, max_audio);
+       processor_max_outs.set (DataType::MIDI, max_midi);
+
+       return ret;
 }                                 
 
 int32_t
-Route::apply_some_plugin_counts (list<ProcessorCount>& iclist)
+Route::apply_some_processor_counts (list<ProcessorCount>& iclist)
 {
        list<ProcessorCount>::iterator i;
-
+       
        for (i = iclist.begin(); i != iclist.end(); ++i) {
-               
-               if ((*i).processor->configure_io ((*i).in, (*i).out)) {
+
+               ProcessorCount& pc (*i);
+
+               if (pc.processor->configure_io (pc.in, pc.out)) {
                        return -1;
                }
+
                /* make sure that however many we have, they are all active */
-               (*i).processor->activate ();
+
+               pc.processor->activate ();
        }
 
        return 0;
@@ -1237,7 +1736,7 @@ Route::apply_some_plugin_counts (list<ProcessorCount>& iclist)
  * Otherwise, \a err is set to the output of the list.
  */
 bool
-Route::check_some_plugin_counts (list<ProcessorCount>& iclist, ChanCount required_inputs, ProcessorStreams* err)
+Route::check_some_processor_counts (list<ProcessorCount>& iclist, ChanCount required_inputs, ProcessorStreams* err)
 {
        list<ProcessorCount>::iterator i;
        size_t index = 0;
@@ -1247,113 +1746,21 @@ Route::check_some_plugin_counts (list<ProcessorCount>& iclist, ChanCount require
                err->count = required_inputs;
        }
 
-       for (i = iclist.begin(); i != iclist.end(); ++i) {
+       for (i = iclist.begin(); i != iclist.end(); ++i, ++index) {
 
-               if ((*i).processor->can_support_input_configuration (required_inputs) < 0) {
+               if (!(*i).processor->can_support_io_configuration (required_inputs, (*i).out)) {
                        if (err) {
                                err->index = index;
                                err->count = required_inputs;
                        }
-                       return false;
+                       return true;
                }
                
                (*i).in = required_inputs;
-               (*i).out = (*i).processor->output_for_input_configuration (required_inputs);
-
                required_inputs = (*i).out;
-               
-               ++index;
-       }
-                       
-       if (err) {
-               if (!iclist.empty()) {
-                       err->index = index;
-                       err->count = iclist.back().processor->output_for_input_configuration(required_inputs);
-               }
-       }
-
-       return true;
-}
-
-int
-Route::copy_processors (const Route& other, Placement placement, ProcessorStreams* err)
-{
-       ChanCount old_rmo = processor_max_outs;
-
-       ProcessorList to_be_deleted;
-
-       {
-               Glib::RWLock::WriterLock lm (_processor_lock);
-               ProcessorList::iterator tmp;
-               ProcessorList the_copy;
-
-               the_copy = _processors;
-               
-               /* remove all relevant processors */
-
-               for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ) {
-                       tmp = i;
-                       ++tmp;
-
-                       if ((*i)->placement() == placement) {
-                               to_be_deleted.push_back (*i);
-                               _processors.erase (i);
-                       }
-
-                       i = tmp;
-               }
-
-               /* now copy the relevant ones from "other" */
-               
-               for (ProcessorList::const_iterator i = other._processors.begin(); i != other._processors.end(); ++i) {
-                       if ((*i)->placement() == placement) {
-                               _processors.push_back (IOProcessor::clone (*i));
-                       }
-               }
-
-               /* reset plugin stream handling */
-
-               if (_reset_plugin_counts (err)) {
-
-                       /* FAILED COPY ATTEMPT: we have to restore order */
-
-                       /* delete all cloned processors */
-
-                       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ) {
-
-                               tmp = i;
-                               ++tmp;
-
-                               if ((*i)->placement() == placement) {
-                                       _processors.erase (i);
-                               }
-                               
-                               i = tmp;
-                       }
-
-                       /* restore the natural order */
-
-                       _processors = the_copy;
-                       processor_max_outs = old_rmo;
-
-                       /* we failed, even though things are OK again */
-
-                       return -1;
-
-               } else {
-                       
-                       /* SUCCESSFUL COPY ATTEMPT: delete the processors we removed pre-copy */
-                       to_be_deleted.clear ();
-                       _user_latency = 0;
-               }
-       }
-
-       if (processor_max_outs != old_rmo || old_rmo == ChanCount::ZERO) {
-               reset_panner ();
        }
 
-       processors_changed (); /* EMIT SIGNAL */
-       return 0;
+       return false;
 }
 
 void
@@ -1368,7 +1775,11 @@ Route::all_processors_flip ()
        bool first_is_on = _processors.front()->active();
        
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               (*i)->set_active (!first_is_on);
+               if (first_is_on) {
+                       (*i)->deactivate ();
+               } else {
+                       (*i)->activate ();
+               }
        }
        
        _session.set_dirty ();
@@ -1389,7 +1800,11 @@ Route::all_processors_active (Placement p, bool state)
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if ((*i)->placement() == p) {
-                       (*i)->set_active (state);
+                       if (state) {
+                               (*i)->activate ();
+                       } else {
+                               (*i)->deactivate ();
+                       }
                }
        }
        
@@ -1408,7 +1823,7 @@ Route::sort_processors (ProcessorStreams* err)
        {
                ProcessorSorter comparator;
                Glib::RWLock::WriterLock lm (_processor_lock);
-               ChanCount old_rmo = processor_max_outs;
+               ChanCount old_pmo = processor_max_outs;
 
                /* the sweet power of C++ ... */
 
@@ -1416,9 +1831,9 @@ Route::sort_processors (ProcessorStreams* err)
 
                _processors.sort (comparator);
        
-               if (_reset_plugin_counts (err)) {
+               if (_reset_processor_counts (err)) {
                        _processors = as_it_was_before;
-                       processor_max_outs = old_rmo;
+                       processor_max_outs = old_pmo;
                        return -1;
                } 
        } 
@@ -1445,7 +1860,7 @@ XMLNode&
 Route::state(bool full_state)
 {
        XMLNode *node = new XMLNode("Route");
-       ProcessorList:: iterator i;
+       ProcessorList::iterator i;
        char buf[32];
 
        if (_flags) {
@@ -1462,7 +1877,8 @@ Route::state(bool full_state)
        node->add_property("mute-affects-pre-fader", _mute_affects_pre_fader?"yes":"no"); 
        node->add_property("mute-affects-post-fader", _mute_affects_post_fader?"yes":"no"); 
        node->add_property("mute-affects-control-outs", _mute_affects_control_outs?"yes":"no"); 
-       node->add_property("mute-affects-main-outs", _mute_affects_main_outs?"yes":"no"); 
+       node->add_property("mute-affects-main-outs", _mute_affects_main_outs?"yes":"no");
+       node->add_property("meter-point", enum_2_string (_meter_point));
 
        if (_edit_group) {
                node->add_property("edit-group", _edit_group->name());
@@ -1494,7 +1910,7 @@ Route::state(bool full_state)
        node->add_child_nocopy (_solo_control->get_state ());
        node->add_child_nocopy (_mute_control->get_state ());
 
-       XMLNode* remote_control_node = new XMLNode (X_("remote_control"));
+       XMLNode* remote_control_node = new XMLNode (X_("RemoteControl"));
        snprintf (buf, sizeof (buf), "%d", _remote_control_id);
        remote_control_node->add_property (X_("id"), buf);
        node->add_child_nocopy (*remote_control_node);
@@ -1634,10 +2050,15 @@ Route::add_processor_from_xml (const XMLNode& node)
                        if ((prop = node.property ("type")) != 0) {
 
                                boost::shared_ptr<Processor> processor;
+                               bool have_insert = false;
 
-                               if (prop->value() == "ladspa" || prop->value() == "Ladspa" || prop->value() == "vst") {
-
+                               if (prop->value() == "ladspa" || prop->value() == "Ladspa" || 
+                                   prop->value() == "lv2" ||
+                                   prop->value() == "vst" ||
+                                   prop->value() == "audiounit") {
+                                       
                                        processor.reset (new PluginInsert(_session, node));
+                                       have_insert = true;
                                        
                                } else if (prop->value() == "port") {
 
@@ -1646,19 +2067,20 @@ Route::add_processor_from_xml (const XMLNode& node)
                                } else if (prop->value() == "send") {
 
                                        processor.reset (new Send (_session, node));
+                                       have_insert = true;
 
                                } else {
 
                                        error << string_compose(_("unknown Processor type \"%1\"; ignored"), prop->value()) << endmsg;
                                }
-
+                               
                                add_processor (processor);
                                
                        } else {
                                error << _("Processor XML node has no type property") << endmsg;
                        }
                }
-               
+
                catch (failed_constructor &err) {
                        warning << _("processor could not be created. Ignored.") << endmsg;
                        return;
@@ -1704,7 +2126,8 @@ Route::_set_state (const XMLNode& node, bool call_base)
        if ((prop = node.property (X_("denormal-protection"))) != 0) {
                set_denormal_protection (prop->value()=="yes"?true:false, this);
        }
-
+       
+       _active = true;
        if ((prop = node.property (X_("active"))) != 0) {
                set_active (prop->value() == "yes");
        }
@@ -1745,6 +2168,10 @@ Route::_set_state (const XMLNode& node, bool call_base)
                _mute_affects_main_outs = (prop->value()=="yes")?true:false;
        }
 
+       if ((prop = node.property (X_("meter-point"))) != 0) {
+               _meter_point = MeterPoint (string_2_enum (prop->value (), _meter_point));
+       }
+       
        if ((prop = node.property (X_("edit-group"))) != 0) {
                RouteGroup* edit_group = _session.edit_group_by_name(prop->value());
                if(edit_group == 0) {
@@ -1787,10 +2214,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
 
        nlist = node.children();
 
-       if (deferred_state) {
-               delete deferred_state;
-       }
-
+       delete deferred_state;
        deferred_state = new XMLNode(X_("deferred state"));
 
        /* set parent class properties before anything else */
@@ -1836,6 +2260,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
                        string coutname = _name;
                        coutname += _("[control]");
 
+                       delete _control_outs;
                        _control_outs = new IO (_session, coutname);
                        _control_outs->set_state (**(child->children().begin()));
 
@@ -1846,22 +2271,21 @@ Route::_set_state (const XMLNode& node, bool call_base)
                        XMLNode *cmt = *(child->children().begin());
                        _comment = cmt->content();
 
-               } else if (child->name() == X_("extra")) {
+               } else if (child->name() == X_("Extra")) {
 
                        _extra_xml = new XMLNode (*child);
 
-               } else if (child->name() == X_("controllable") && (prop = child->property("name")) != 0) {
+               } else if (child->name() == X_("Controllable") && (prop = child->property("name")) != 0) {
                        
                        if (prop->value() == "solo") {
                                _solo_control->set_state (*child);
                                _session.add_controllable (_solo_control);
-                       }
-                       else if (prop->value() == "mute") {
+                       } else if (prop->value() == "mute") {
                                _mute_control->set_state (*child);
                                _session.add_controllable (_mute_control);
                        }
                }
-               else if (child->name() == X_("remote_control")) {
+               else if (child->name() == X_("RemoteControl")) {
                        if ((prop = child->property (X_("id"))) != 0) {
                                int32_t x;
                                sscanf (prop->value().c_str(), "%d", &x);
@@ -2033,10 +2457,8 @@ Route::set_control_outs (const vector<string>& ports)
        vector<string>::const_iterator i;
        size_t limit;
        
-       if (_control_outs) {
-               delete _control_outs;
-               _control_outs = 0;
-       }
+       delete _control_outs;
+       _control_outs = 0;
 
        if (is_control() || is_master()) {
                /* no control outs for these two special busses */
@@ -2067,7 +2489,7 @@ Route::set_control_outs (const vector<string>& ports)
        /* now connect to the named ports */
        
        for (size_t n = 0; n < limit; ++n) {
-               if (_control_outs->connect_output (_control_outs->output (n), ports[n], this)) {
+               if (_control_outs->connect_output (_control_outs->output (n), ports[n % ports.size()], this)) {
                        error << string_compose (_("could not connect %1 to %2"), _control_outs->output(n)->name(), ports[n]) << endmsg;
                        return -1;
                }
@@ -2246,13 +2668,6 @@ Route::get_mute_config (mute_type t)
        return onoff;
 }
 
-void
-Route::set_active (bool yn)
-{
-       _active = yn; 
-       active_changed(); /* EMIT SIGNAL */
-}
-
 void
 Route::handle_transport_stopped (bool abort_ignored, bool did_locate, bool can_flush_processors)
 {
@@ -2262,7 +2677,7 @@ Route::handle_transport_stopped (bool abort_ignored, bool did_locate, bool can_f
                Glib::RWLock::ReaderLock lm (_processor_lock);
 
                if (!did_locate) {
-                       automation_snapshot (now);
+                       automation_snapshot (now, true);
                }
 
                for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
@@ -2285,7 +2700,7 @@ void
 Route::input_change_handler (IOChange change, void *ignored)
 {
        if (change & ConfigurationChanged) {
-               reset_plugin_counts (0);
+               reset_processor_counts (0);
        }
 }
 
@@ -2297,7 +2712,7 @@ Route::output_change_handler (IOChange change, void *ignored)
                        _control_outs->ensure_io (ChanCount::ZERO, ChanCount(DataType::AUDIO, n_outputs().n_audio()), true, this);
                }
                
-               reset_plugin_counts (0);
+               reset_processor_counts (0);
        }
 }
 
@@ -2308,7 +2723,7 @@ Route::pans_required () const
                return 0;
        }
        
-       return max (n_inputs ().n_audio(), static_cast<size_t>(processor_max_outs.n_audio()));
+       return max (n_inputs ().n_audio(), processor_max_outs.n_audio());
 }
 
 int 
@@ -2369,7 +2784,7 @@ Route::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nfra
                if (lm.locked()) {
                        // automation snapshot can also be called from the non-rt context
                        // and it uses the processor list, so we take the lock out here
-                       automation_snapshot (_session.transport_frame());
+                       automation_snapshot (_session.transport_frame(), false);
                }
        }
 
@@ -2389,11 +2804,11 @@ Route::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nfra
        apply_gain_automation = false;
 
        { 
-               Glib::Mutex::Lock am (_automation_lock, Glib::TRY_LOCK);
+               Glib::Mutex::Lock am (data().control_lock(), Glib::TRY_LOCK);
                
                if (am.locked() && _session.transport_rolling()) {
                        
-                       if (_gain_control->list()->automation_playback()) {
+                       if (_gain_control->automation_playback()) {
                                apply_gain_automation = _gain_control->list()->curve().rt_safe_get_vector (
                                                start_frame, end_frame, _session.gain_automation_buffer(), nframes);
                        }
@@ -2491,6 +2906,11 @@ Route::update_total_latency ()
                }
        }
 
+#undef DEBUG_LATENCY
+#ifdef DEBUG_LATENCY
+       cerr << _name << ": internal redirect latency = " << _own_latency << endl;
+#endif
+
        set_port_latency (_own_latency);
        
        if (!_user_latency) {
@@ -2509,6 +2929,11 @@ Route::update_total_latency ()
                signal_latency_changed (); /* EMIT SIGNAL */
        }
        
+#ifdef DEBUG_LATENCY
+       cerr << _name << ": input latency = " << input_latency() << " total = "
+            << _own_latency << endl;
+#endif
+
        return _own_latency;
 }
 
@@ -2540,12 +2965,16 @@ Route::set_latency_delay (nframes_t longest_session_latency)
 }
 
 void
-Route::automation_snapshot (nframes_t now)
+Route::automation_snapshot (nframes_t now, bool force)
 {
-       IO::automation_snapshot (now);
+       if (!force && !should_snapshot(now)) {
+               return;
+       }
+
+       IO::automation_snapshot (now, force);
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               (*i)->automation_snapshot (now);
+               (*i)->automation_snapshot (now, force);
        }
 }
 
@@ -2622,3 +3051,51 @@ Route::set_pending_declick (int declick)
        }
 
 }
+
+/** 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.
+ */
+
+void
+Route::shift (nframes64_t pos, nframes64_t frames)
+{
+#ifdef THIS_NEEDS_FIXING_FOR_V3
+
+       /* gain automation */
+       XMLNode &before = _gain_control->get_state ();
+       _gain_control->shift (pos, frames);
+       XMLNode &after = _gain_control->get_state ();
+       _session.add_command (new MementoCommand<AutomationList> (_gain_automation_curve, &before, &after));
+
+       /* pan automation */
+       for (std::vector<StreamPanner*>::iterator i = _panner->begin (); i != _panner->end (); ++i) {
+               Curve & c = (*i)->automation ();
+               XMLNode &before = c.get_state ();
+               c.shift (pos, frames);
+               XMLNode &after = c.get_state ();
+               _session.add_command (new MementoCommand<AutomationList> (c, &before, &after));
+       }
+
+       /* redirect automation */
+       {
+               Glib::RWLock::ReaderLock lm (redirect_lock);
+               for (RedirectList::iterator i = _redirects.begin (); i != _redirects.end (); ++i) {
+                       
+                       set<uint32_t> a;
+                       (*i)->what_has_automation (a);
+                       
+                       for (set<uint32_t>::const_iterator j = a.begin (); j != a.end (); ++j) {
+                               AutomationList & al = (*i)->automation_list (*j);
+                               XMLNode &before = al.get_state ();
+                               al.shift (pos, frames);
+                               XMLNode &after = al.get_state ();
+                               _session.add_command (new MementoCommand<AutomationList> (al, &before, &after));
+                       }
+               }
+       }
+#endif
+
+}