For now, only use the multi-threaded process code if we are
[ardour.git] / libs / ardour / session.cc
index f5df3a0e6be79d826029f7f11a9f4aad08bc27fe..f2343e1013af059a50a7a03fffd07df3b940da2a 100644 (file)
@@ -45,6 +45,8 @@
 #include "pbd/file_utils.h"
 #include "pbd/convert.h"
 #include "pbd/strsplit.h"
+#include "pbd/strsplit.h"
+#include "pbd/unwind.h"
 
 #include "ardour/amp.h"
 #include "ardour/analyser.h"
@@ -63,6 +65,7 @@
 #include "ardour/butler.h"
 #include "ardour/click.h"
 #include "ardour/configuration.h"
+#include "ardour/control_protocol_manager.h"
 #include "ardour/crossfade.h"
 #include "ardour/cycle_timer.h"
 #include "ardour/data_type.h"
@@ -85,6 +88,7 @@
 #include "ardour/recent_sessions.h"
 #include "ardour/region_factory.h"
 #include "ardour/return.h"
+#include "ardour/route_graph.h"
 #include "ardour/route_group.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 #include "ardour/utils.h"
 #include "ardour/graph.h"
-#include "ardour/vbap_speakers.h"
+#include "ardour/speakers.h"
+#include "ardour/operations.h"
 
 #include "midi++/port.h"
 #include "midi++/mmc.h"
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
-using boost::shared_ptr;
-using boost::weak_ptr;
 
 bool Session::_disable_all_loaded_plugins = false;
 
 PBD::Signal1<void,std::string> Session::Dialog;
 PBD::Signal0<int> Session::AskAboutPendingState;
-PBD::Signal2<int,nframes_t,nframes_t> Session::AskAboutSampleRateMismatch;
+PBD::Signal2<int, framecnt_t, framecnt_t> Session::AskAboutSampleRateMismatch;
 PBD::Signal0<void> Session::SendFeedback;
 PBD::Signal3<int,Session*,std::string,DataType> Session::MissingFile;
 
-PBD::Signal0<void> Session::TimecodeOffsetChanged;
 PBD::Signal1<void, framepos_t> Session::StartTimeChanged;
 PBD::Signal1<void, framepos_t> Session::EndTimeChanged;
 PBD::Signal0<void> Session::AutoBindingOn;
@@ -129,44 +131,53 @@ PBD::Signal0<void> Session::AutoBindingOff;
 PBD::Signal2<void,std::string, std::string> Session::Exported;
 PBD::Signal1<int,boost::shared_ptr<Playlist> > Session::AskAboutPlaylistDeletion;
 PBD::Signal0<void> Session::Quit;
+PBD::Signal0<void> Session::FeedbackDetected;
+PBD::Signal0<void> Session::SuccessfulGraphSort;
 
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
 const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event);
 
+/** @param snapshot_name Snapshot name, without .ardour prefix */
 Session::Session (AudioEngine &eng,
-                 const string& fullpath,
-                 const string& snapshot_name,
+                  const string& fullpath,
+                  const string& snapshot_name,
                   BusProfile* bus_profile,
-                 string mix_template)
-
+                  string mix_template)
        : _engine (eng)
-        , _target_transport_speed (0.0)
-        , _requested_return_frame (-1)
-        , _session_dir (new SessionDirectory(fullpath))
-        , state_tree (0)
+       , _target_transport_speed (0.0)
+       , _requested_return_frame (-1)
+       , _session_dir (new SessionDirectory(fullpath))
+       , state_tree (0)
        , _state_of_the_state (Clean)
-        , _butler (new Butler (*this))
-        , _post_transport_work (0)
-        , _send_timecode_update (false)
-        , _all_route_group (new RouteGroup (*this, "all"))
-        , route_graph (new Graph(*this))
-        , routes (new RouteList)
-        , _total_free_4k_blocks (0)
-        , _bundles (new BundleList)
-        , _bundle_xml_node (0)
-        , _click_io ((IO*) 0)
-        , click_data (0)
-        , click_emphasis_data (0)
-        , main_outs (0)
-        , _metadata (new SessionMetadata())
-        , _have_rec_enabled_track (false)
-        , _suspend_timecode_transmission (0)
+       , _butler (new Butler (*this))
+       , _post_transport_work (0)
+       , _send_timecode_update (false)
+       , _all_route_group (new RouteGroup (*this, "all"))
+       , routes (new RouteList)
+       , _total_free_4k_blocks (0)
+       , _bundles (new BundleList)
+       , _bundle_xml_node (0)
+       , _current_trans (0)
+       , _click_io ((IO*) 0)
+       , click_data (0)
+       , click_emphasis_data (0)
+       , main_outs (0)
+       , _metadata (new SessionMetadata())
+       , _have_rec_enabled_track (false)
+       , _suspend_timecode_transmission (0)
 {
        _locations = new Locations (*this);
-               
+
+       if (how_many_dsp_threads () > 1) {
+               /* For now, only create the graph if we are using >1 DSP threads, as
+                  it is a bit slower than the old code with 1 thread.
+               */
+               _process_graph.reset (new Graph (*this));
+       }
+
        playlists.reset (new SessionPlaylists);
 
-        _all_route_group->set_active (true, this);
+       _all_route_group->set_active (true, this);
 
        interpolation.add_channel_to (0, 0);
 
@@ -179,14 +190,14 @@ Session::Session (AudioEngine &eng,
 
        first_stage_init (fullpath, snapshot_name);
 
-        _is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
+       _is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
 
        if (_is_new) {
                if (create (mix_template, bus_profile)) {
                        destroy ();
                        throw failed_constructor ();
                }
-        }
+       }
 
        if (second_stage_init ()) {
                destroy ();
@@ -209,11 +220,14 @@ Session::Session (AudioEngine &eng,
        StartTimeChanged.connect_same_thread (*this, boost::bind (&Session::start_time_changed, this, _1));
        EndTimeChanged.connect_same_thread (*this, boost::bind (&Session::end_time_changed, this, _1));
 
-        _is_new = false;
+       _is_new = false;
 }
 
 Session::~Session ()
 {
+#ifdef PT_TIMING       
+       ST.dump ("ST.dump");
+#endif 
        destroy ();
 }
 
@@ -240,10 +254,6 @@ Session::destroy ()
 
        delete state_tree;
 
-        /* remove all stubfiles that might still be lurking */
-
-        cleanup_stubfiles ();
-
        /* reset dynamic state version back to default */
 
        Stateful::loading_state_version = 0;
@@ -251,7 +261,7 @@ Session::destroy ()
        _butler->drop_references ();
        delete _butler;
        delete midi_control_ui;
-        delete _all_route_group;
+       delete _all_route_group;
 
        if (click_data != default_click) {
                delete [] click_data;
@@ -267,7 +277,7 @@ Session::destroy ()
 
        routes.flush ();
        _bundles.flush ();
-       
+
        AudioDiskstream::free_working_buffers();
 
        /* tell everyone who is still standing that we're about to die */
@@ -303,11 +313,9 @@ Session::destroy ()
        }
        routes.flush ();
 
-       boost::shared_ptr<RouteList> r = routes.reader ();
-
        DEBUG_TRACE (DEBUG::Destruction, "delete sources\n");
        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
-               DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for source %1 ; pre-ref = %2\n", i->second->path(), i->second.use_count()));
+               DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for source %1 ; pre-ref = %2\n", i->second->name(), i->second.use_count()));
                i->second->drop_references ();
        }
 
@@ -315,7 +323,7 @@ Session::destroy ()
 
        DEBUG_TRACE (DEBUG::Destruction, "delete route groups\n");
        for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
-               
+
                delete *i;
        }
 
@@ -324,30 +332,13 @@ Session::destroy ()
        /* not strictly necessary, but doing it here allows the shared_ptr debugging to work */
        playlists.reset ();
 
-       boost_debug_list_ptrs ();
-
        delete _locations;
-        delete _speakers;
 
        DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
-}
-
-void
-Session::set_worst_io_latencies ()
-{
-       _worst_output_latency = 0;
-       _worst_input_latency = 0;
-
-       if (!_engine.connected()) {
-               return;
-       }
-
-       boost::shared_ptr<RouteList> r = routes.reader ();
 
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               _worst_output_latency = max (_worst_output_latency, (*i)->output()->latency());
-               _worst_input_latency = max (_worst_input_latency, (*i)->input()->latency());
-       }
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+       boost_debug_list_ptrs ();
+#endif
 }
 
 void
@@ -370,7 +361,7 @@ Session::when_engine_running ()
 
        /* every time we reconnect, recompute worst case output latencies */
 
-       _engine.Running.connect_same_thread (*this, boost::bind (&Session::set_worst_io_latencies, this));
+       _engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this));
 
        if (synced_to_jack()) {
                _engine.transport_stop ();
@@ -397,13 +388,13 @@ Session::when_engine_running ()
                        } else {
                                c = _click_io->set_state (*child->children().front(), Stateful::loading_state_version);
                        }
-                                       
+
 
                        if (c == 0) {
                                _clicking = Config->get_clicking ();
-                               
+
                        } else {
-                               
+
                                error << _("could not setup Click I/O") << endmsg;
                                _clicking = false;
                        }
@@ -423,21 +414,19 @@ Session::when_engine_running ()
                                        }
                                }
                        }
-                       
+
                        if (_click_io->n_ports () > ChanCount::ZERO) {
                                _clicking = Config->get_clicking ();
                        }
                }
        }
-       
+
        catch (failed_constructor& err) {
                error << _("cannot setup Click I/O") << endmsg;
        }
 
        BootMessage (_("Compute I/O Latencies"));
 
-       set_worst_io_latencies ();
-
        if (_clicking) {
                // XXX HOW TO ALERT UI TO THIS ? DO WE NEED TO?
        }
@@ -465,7 +454,7 @@ Session::when_engine_running ()
                char buf[32];
                snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1);
 
-               shared_ptr<Bundle> c (new Bundle (buf, true));
+               boost::shared_ptr<Bundle> c (new Bundle (buf, true));
                c->add_channel (_("mono"), DataType::AUDIO);
                c->set_port (0, outputs[DataType::AUDIO][np]);
 
@@ -478,7 +467,7 @@ Session::when_engine_running ()
                if (np + 1 < outputs[DataType::AUDIO].size()) {
                        char buf[32];
                        snprintf (buf, sizeof(buf), _("out %" PRIu32 "+%" PRIu32), np + 1, np + 2);
-                       shared_ptr<Bundle> c (new Bundle (buf, true));
+                        boost::shared_ptr<Bundle> c (new Bundle (buf, true));
                        c->add_channel (_("L"), DataType::AUDIO);
                        c->set_port (0, outputs[DataType::AUDIO][np]);
                        c->add_channel (_("R"), DataType::AUDIO);
@@ -494,7 +483,7 @@ Session::when_engine_running ()
                char buf[32];
                snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1);
 
-               shared_ptr<Bundle> c (new Bundle (buf, false));
+               boost::shared_ptr<Bundle> c (new Bundle (buf, false));
                c->add_channel (_("mono"), DataType::AUDIO);
                c->set_port (0, inputs[DataType::AUDIO][np]);
 
@@ -508,7 +497,7 @@ Session::when_engine_running ()
                        char buf[32];
                        snprintf (buf, sizeof(buf), _("in %" PRIu32 "+%" PRIu32), np + 1, np + 2);
 
-                       shared_ptr<Bundle> c (new Bundle (buf, false));
+                       boost::shared_ptr<Bundle> c (new Bundle (buf, false));
                        c->add_channel (_("L"), DataType::AUDIO);
                        c->set_port (0, inputs[DataType::AUDIO][np]);
                        c->add_channel (_("R"), DataType::AUDIO);
@@ -523,20 +512,20 @@ Session::when_engine_running ()
        for (uint32_t np = 0; np < inputs[DataType::MIDI].size(); ++np) {
                string n = inputs[DataType::MIDI][np];
                boost::erase_first (n, X_("alsa_pcm:"));
-               
-               shared_ptr<Bundle> c (new Bundle (n, false));
+
+               boost::shared_ptr<Bundle> c (new Bundle (n, false));
                c->add_channel ("", DataType::MIDI);
                c->set_port (0, inputs[DataType::MIDI][np]);
                add_bundle (c);
        }
-               
+
        /* MIDI output bundles */
 
        for (uint32_t np = 0; np < outputs[DataType::MIDI].size(); ++np) {
                string n = outputs[DataType::MIDI][np];
                boost::erase_first (n, X_("alsa_pcm:"));
 
-               shared_ptr<Bundle> c (new Bundle (n, true));
+               boost::shared_ptr<Bundle> c (new Bundle (n, true));
                c->add_channel ("", DataType::MIDI);
                c->set_port (0, outputs[DataType::MIDI][np]);
                add_bundle (c);
@@ -544,104 +533,221 @@ Session::when_engine_running ()
 
        BootMessage (_("Setup signal flow and plugins"));
 
+       ControlProtocolManager::instance().set_session (this);
+
+       /* This must be done after the ControlProtocolManager set_session above,
+          as it will set states for ports which the ControlProtocolManager creates.
+       */
+       MIDI::Manager::instance()->set_port_states (Config->midi_port_states ());
+
+       /* And this must be done after the MIDI::Manager::set_port_states as
+        * it will try to make connections whose details are loaded by set_port_states.
+        */
+
        hookup_io ();
 
        if (_is_new && !no_auto_connect()) {
+               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
+               auto_connect_master_bus ();
+       }
 
-                /* don't connect the master bus outputs if there is a monitor bus */
+       _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
-               if (_master_out && Config->get_auto_connect_standard_busses() && !_monitor_out) {
+        /* update latencies */
 
-                       /* if requested auto-connect the outputs to the first N physical ports.
-                        */
+        initialize_latencies ();
 
-                       uint32_t limit = _master_out->n_outputs().n_total();
+       /* hook us up to the engine */
 
-                       for (uint32_t n = 0; n < limit; ++n) {
-                               Port* p = _master_out->output()->nth (n);
-                               string connect_to;
-                               if (outputs[p->type()].size() > n) {
-                                       connect_to = outputs[p->type()][n];
-                               }
+       BootMessage (_("Connect to engine"));
+       _engine.set_session (this);
+}
 
-                               if (!connect_to.empty() && p->connected_to (connect_to) == false) {
-                                       if (_master_out->output()->connect (p, connect_to, this)) {
-                                               error << string_compose (_("cannot connect master output %1 to %2"), n, connect_to)
-                                                     << endmsg;
-                                               break;
-                                       }
-                               }
+void
+Session::auto_connect_master_bus ()
+{
+       if (!_master_out || !Config->get_auto_connect_standard_busses() || _monitor_out) {
+               return;
+       }
+               
+       /* if requested auto-connect the outputs to the first N physical ports.
+        */
+       
+       uint32_t limit = _master_out->n_outputs().n_total();
+       vector<string> outputs[DataType::num_types];
+       
+       for (uint32_t i = 0; i < DataType::num_types; ++i) {
+               _engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]);
+       }
+       
+       for (uint32_t n = 0; n < limit; ++n) {
+               boost::shared_ptr<Port> p = _master_out->output()->nth (n);
+               string connect_to;
+               if (outputs[p->type()].size() > n) {
+                       connect_to = outputs[p->type()][n];
+               }
+               
+               if (!connect_to.empty() && p->connected_to (connect_to) == false) {
+                       if (_master_out->output()->connect (p, connect_to, this)) {
+                               error << string_compose (_("cannot connect master output %1 to %2"), n, connect_to)
+                                     << endmsg;
+                               break;
                        }
                }
+       }
+}
 
-               if (_monitor_out) {
+void
+Session::remove_monitor_section ()
+{
+       if (!_monitor_out) {
+               return;
+       }
 
-                       /* AUDIO ONLY as of june 29th 2009, because listen semantics for anything else
-                          are undefined, at best.
-                        */
+       /* force reversion to Solo-In-Pace */
+       Config->set_solo_control_is_listen_control (false);
 
-                       /* control out listens to master bus (but ignores it
-                          under some conditions)
-                       */
+       {
+               /* Hold process lock while doing this so that we don't hear bits and
+                * pieces of audio as we work on each route.
+                */
+               
+               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               
+               /* Connect tracks to monitor section. Note that in an
+                  existing session, the internal sends will already exist, but we want the
+                  routes to notice that they connect to the control out specifically.
+               */
+               
+               
+               boost::shared_ptr<RouteList> r = routes.reader ();
+               PBD::Unwinder<bool> uw (ignore_route_processor_changes, true);
+               
+               for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
+                       
+                       if ((*x)->is_monitor()) {
+                               /* relax */
+                       } else if ((*x)->is_master()) {
+                               /* relax */
+                       } else {
+                               (*x)->remove_aux_or_listen (_monitor_out);
+                       }
+               }
+       }
 
-                       uint32_t limit = _monitor_out->n_inputs().n_audio();
+       remove_route (_monitor_out);
+       auto_connect_master_bus ();
+}
 
-                       if (_master_out) {
-                               for (uint32_t n = 0; n < limit; ++n) {
-                                       AudioPort* p = _monitor_out->input()->ports().nth_audio_port (n);
-                                       AudioPort* o = _master_out->output()->ports().nth_audio_port (n);
+void
+Session::add_monitor_section ()
+{
+       RouteList rl;
 
-                                       if (o) {
-                                               string connect_to = o->name();
-                                               if (_monitor_out->input()->connect (p, connect_to, this)) {
-                                                       error << string_compose (_("cannot connect control input %1 to %2"), n, connect_to)
-                                                             << endmsg;
-                                                       break;
-                                               }
-                                       }
-                               }
-                       }
+       if (_monitor_out || !_master_out) {
+               return;
+       }
 
-                       /* if control out is not connected, connect control out to physical outs
-                       */
+       boost::shared_ptr<Route> r (new Route (*this, _("monitor"), Route::MonitorOut, DataType::AUDIO));
 
-                       if (!_monitor_out->output()->connected ()) {
+       if (r->init ()) {
+               return;
+       }
 
-                               if (!Config->get_monitor_bus_preferred_bundle().empty()) {
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+       // boost_debug_shared_ptr_mark_interesting (r.get(), "Route");
+#endif
+       {
+               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               r->input()->ensure_io (_master_out->output()->n_ports(), false, this);
+               r->output()->ensure_io (_master_out->output()->n_ports(), false, this);
+       }
 
-                                       boost::shared_ptr<Bundle> b = bundle_by_name (Config->get_monitor_bus_preferred_bundle());
+       rl.push_back (r);
+       add_routes (rl, false, false);
+       
+       assert (_monitor_out);
 
-                                       if (b) {
-                                               _monitor_out->output()->connect_ports_to_bundle (b, this);
-                                       } else {
-                                               warning << string_compose (_("The preferred I/O for the monitor bus (%1) cannot be found"),
-                                                                          Config->get_monitor_bus_preferred_bundle())
-                                                       << endmsg;
-                                       }
+       /* AUDIO ONLY as of june 29th 2009, because listen semantics for anything else
+          are undefined, at best.
+       */
+       
+       uint32_t limit = _monitor_out->n_inputs().n_audio();
+       
+       if (_master_out) {
+               
+               /* connect the inputs to the master bus outputs. this
+                * represents a separate data feed from the internal sends from
+                * each route. as of jan 2011, it allows the monitor section to
+                * conditionally ignore either the internal sends or the normal
+                * input feed, but we should really find a better way to do
+                * this, i think.
+                */
+
+               _master_out->output()->disconnect (this);
+
+               for (uint32_t n = 0; n < limit; ++n) {
+                       boost::shared_ptr<AudioPort> p = _monitor_out->input()->ports().nth_audio_port (n);
+                       boost::shared_ptr<AudioPort> o = _master_out->output()->ports().nth_audio_port (n);
+                       
+                       if (o) {
+                               string connect_to = o->name();
+                               if (_monitor_out->input()->connect (p, connect_to, this)) {
+                                       error << string_compose (_("cannot connect control input %1 to %2"), n, connect_to)
+                                             << endmsg;
+                                       break;
+                               }
+                       }
+               }
+       }
+       
+       /* if monitor section is not connected, connect it to physical outs
+        */
+       
+       if (Config->get_auto_connect_standard_busses() && !_monitor_out->output()->connected ()) {
+               
+               if (!Config->get_monitor_bus_preferred_bundle().empty()) {
+                       
+                       boost::shared_ptr<Bundle> b = bundle_by_name (Config->get_monitor_bus_preferred_bundle());
+                       
+                       if (b) {
+                               _monitor_out->output()->connect_ports_to_bundle (b, this);
+                       } else {
+                               warning << string_compose (_("The preferred I/O for the monitor bus (%1) cannot be found"),
+                                                          Config->get_monitor_bus_preferred_bundle())
+                                       << endmsg;
+                       }
+                       
+               } else {
+                       
+                       /* Monitor bus is audio only */
 
-                               } else {
-                                        
-                                       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                                               uint32_t mod = n_physical_outputs.get (*t);
-                                               uint32_t limit = _monitor_out->n_outputs().get(*t);
-
-                                               for (uint32_t n = 0; n < limit; ++n) {
-
-                                                       Port* p = _monitor_out->output()->ports().port(*t, n);
-                                                       string connect_to;
-                                                       if (outputs[*t].size() > (n % mod)) {
-                                                               connect_to = outputs[*t][n % mod];
-                                                       }
-
-                                                       if (!connect_to.empty()) {
-                                                               if (_monitor_out->output()->connect (p, connect_to, this)) {
-                                                                       error << string_compose (
-                                                                                       _("cannot connect control output %1 to %2"),
-                                                                                       n, connect_to)
-                                                                               << endmsg;
-                                                                       break;
-                                                               }
-                                                       }
+                       uint32_t mod = n_physical_outputs.get (DataType::AUDIO);
+                       uint32_t limit = _monitor_out->n_outputs().get (DataType::AUDIO);
+                       vector<string> outputs[DataType::num_types];
+
+                       for (uint32_t i = 0; i < DataType::num_types; ++i) {
+                               _engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]);
+                       }
+                       
+                       
+                       if (mod != 0) {
+                               
+                               for (uint32_t n = 0; n < limit; ++n) {
+                                       
+                                       boost::shared_ptr<Port> p = _monitor_out->output()->ports().port(DataType::AUDIO, n);
+                                       string connect_to;
+                                       if (outputs[DataType::AUDIO].size() > (n % mod)) {
+                                               connect_to = outputs[DataType::AUDIO][n % mod];
+                                       }
+                                       
+                                       if (!connect_to.empty()) {
+                                               if (_monitor_out->output()->connect (p, connect_to, this)) {
+                                                       error << string_compose (
+                                                               _("cannot connect control output %1 to %2"),
+                                                               n, connect_to)
+                                                             << endmsg;
+                                                       break;
                                                }
                                        }
                                }
@@ -649,15 +755,32 @@ Session::when_engine_running ()
                }
        }
 
-       /* catch up on send+insert cnts */
+       /* Hold process lock while doing this so that we don't hear bits and
+        * pieces of audio as we work on each route.
+        */
+        
+       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
-       _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
+       /* Connect tracks to monitor section. Note that in an
+          existing session, the internal sends will already exist, but we want the
+          routes to notice that they connect to the control out specifically.
+       */
 
-       /* hook us up to the engine */
 
-       BootMessage (_("Connect to engine"));
+       boost::shared_ptr<RouteList> rls = routes.reader ();
 
-       _engine.set_session (this);
+       PBD::Unwinder<bool> uw (ignore_route_processor_changes, true);
+
+       for (RouteList::iterator x = rls->begin(); x != rls->end(); ++x) {
+               
+               if ((*x)->is_monitor()) {
+                       /* relax */
+               } else if ((*x)->is_master()) {
+                       /* relax */
+               } else {
+                       (*x)->enable_monitor_send ();
+               }
+       }
 }
 
 void
@@ -669,7 +792,6 @@ Session::hookup_io ()
 
        _state_of_the_state = StateOfTheState (_state_of_the_state | InitialConnecting);
 
-
        if (!auditioner) {
 
                /* we delay creating the auditioner till now because
@@ -677,13 +799,12 @@ Session::hookup_io ()
                */
 
                try {
-                        Auditioner* a = new Auditioner (*this);
-                        if (a->init()) {
-                                delete a;
-                                throw failed_constructor();
-                        }
-                        a->use_new_diskstream ();
-                       auditioner.reset (a);
+                       boost::shared_ptr<Auditioner> a (new Auditioner (*this));
+                       if (a->init()) {
+                               throw failed_constructor ();
+                       }
+                       a->use_new_diskstream ();
+                       auditioner = a;
                }
 
                catch (failed_constructor& err) {
@@ -706,33 +827,6 @@ Session::hookup_io ()
 
        Delivery::reset_panners ();
 
-       /* Connect tracks to monitor/listen bus if there is one.
-           Note that in an existing session, the internal sends will
-           already exist, but we want the routes to notice that
-           they connect to the control out specifically.
-         */
-
-        if (_monitor_out) {
-               boost::shared_ptr<RouteList> r = routes.reader ();
-                for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
-                        
-                        if ((*x)->is_monitor()) {
-                                
-                                /* relax */
-                                
-                        } else if ((*x)->is_master()) {
-                                
-                                /* relax */
-                                
-                        } else {
-                                
-                                (*x)->listen_via (_monitor_out,
-                                                  (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
-                                                  false, false);
-                        }
-                }
-        }
-
        /* Anyone who cares about input state, wake up and do something */
 
        IOConnectionsComplete (); /* EMIT SIGNAL */
@@ -754,12 +848,6 @@ Session::hookup_io ()
        update_route_solo_state ();
 }
 
-void
-Session::playlist_length_changed ()
-{
-       update_session_range_location_marker ();
-}
-
 void
 Session::track_playlist_changed (boost::weak_ptr<Track> wp)
 {
@@ -767,14 +855,14 @@ Session::track_playlist_changed (boost::weak_ptr<Track> wp)
        if (!track) {
                return;
        }
-       
+
        boost::shared_ptr<Playlist> playlist;
 
        if ((playlist = track->playlist()) != 0) {
-               playlist->LengthChanged.connect_same_thread (*this, boost::bind (&Session::playlist_length_changed, this));
+               playlist->RegionAdded.connect_same_thread (*this, boost::bind (&Session::playlist_region_added, this, _1));
+               playlist->RangesMoved.connect_same_thread (*this, boost::bind (&Session::playlist_ranges_moved, this, _1));
+               playlist->RegionsExtended.connect_same_thread (*this, boost::bind (&Session::playlist_regions_extended, this, _1));
        }
-
-       update_session_range_location_marker ();
 }
 
 bool
@@ -792,28 +880,14 @@ Session::record_enabling_legal () const
 }
 
 void
-Session::reset_input_monitor_state ()
+Session::set_track_monitor_input_status (bool yn)
 {
-       if (transport_rolling()) {
-
-               boost::shared_ptr<RouteList> rl = routes.reader ();
-               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                       if (tr && tr->record_enabled ()) {
-                               //cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
-                               tr->monitor_input (Config->get_monitoring_model() == HardwareMonitoring && !config.get_auto_input());
-                       }
-               }
-               
-       } else {
-               
-               boost::shared_ptr<RouteList> rl = routes.reader ();
-               for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                       boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                       if (tr && tr->record_enabled ()) {
-                               //cerr << "switching to input = " << !Config->get_auto_input() << __FILE__ << __LINE__ << endl << endl;
-                               tr->monitor_input (Config->get_monitoring_model() == HardwareMonitoring);
-                       }
+       boost::shared_ptr<RouteList> rl = routes.reader ();
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               boost::shared_ptr<AudioTrack> tr = boost::dynamic_pointer_cast<AudioTrack> (*i);
+               if (tr && tr->record_enabled ()) {
+                       //cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
+                       tr->request_jack_monitors_input (yn);
                }
        }
 }
@@ -832,7 +906,7 @@ Session::auto_punch_start_changed (Location* location)
 void
 Session::auto_punch_end_changed (Location* location)
 {
-       nframes_t when_to_stop = location->end();
+       framepos_t when_to_stop = location->end();
        // when_to_stop += _worst_output_latency + _worst_input_latency;
        replace_event (SessionEvent::PunchOut, when_to_stop);
 }
@@ -840,7 +914,7 @@ Session::auto_punch_end_changed (Location* location)
 void
 Session::auto_punch_changed (Location* location)
 {
-       nframes_t when_to_stop = location->end();
+       framepos_t when_to_stop = location->end();
 
        replace_event (SessionEvent::PunchIn, location->start());
        //when_to_stop += _worst_output_latency + _worst_input_latency;
@@ -1012,33 +1086,31 @@ Session::handle_locations_changed (Locations::LocationList& locations)
 void
 Session::enable_record ()
 {
-        while (1) {
-                RecordState rs = (RecordState) g_atomic_int_get (&_record_status);
-                
-                if (rs == Recording) {
-                        break;
-                }
+       if (_transport_speed != 0.0 && _transport_speed != 1.0) {
+               /* no recording at anything except normal speed */
+               return;
+       }
+
+       while (1) {
+               RecordState rs = (RecordState) g_atomic_int_get (&_record_status);
+
+               if (rs == Recording) {
+                       break;
+               }
+               
+               if (g_atomic_int_compare_and_exchange (&_record_status, rs, Recording)) {
 
-                if (g_atomic_int_compare_and_exchange (&_record_status, rs, Recording)) {
-                        
-                        _last_record_location = _transport_frame;
+                       _last_record_location = _transport_frame;
                        MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordStrobe));
-                        
-                        if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
-                                
-                                boost::shared_ptr<RouteList> rl = routes.reader ();
-                                for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                                        boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                                        if (tr && tr->record_enabled ()) {
-                                                tr->monitor_input (true);
-                                        }
-                                }
-                        }
-                        
-                        RecordStateChanged ();
-                        break;
-                }
-        }
+
+                       if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
+                               set_track_monitor_input_status (true);
+                       }
+
+                       RecordStateChanged ();
+                       break;
+               }
+       }
 }
 
 void
@@ -1058,14 +1130,7 @@ Session::disable_record (bool rt_context, bool force)
                }
 
                if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
-
-                       boost::shared_ptr<RouteList> rl = routes.reader ();
-                       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                               if (tr && tr->record_enabled ()) {
-                                       tr->monitor_input (false);
-                               }
-                       }
+                       set_track_monitor_input_status (false);
                }
 
                RecordStateChanged (); /* emit signal */
@@ -1082,24 +1147,19 @@ Session::step_back_from_record ()
        if (g_atomic_int_compare_and_exchange (&_record_status, Recording, Enabled)) {
 
                if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
-                       boost::shared_ptr<RouteList> rl = routes.reader ();
-                       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-                               if (tr && tr->record_enabled ()) {
-                                       //cerr << "switching from input" << __FILE__ << __LINE__ << endl << endl;
-                                       tr->monitor_input (false);
-                               }
-                       }
+                       set_track_monitor_input_status (false);
                }
+
+               RecordStateChanged (); /* emit signal */
        }
 }
 
 void
 Session::maybe_enable_record ()
 {
-        if (_step_editors > 0) {
-                return;
-        }
+       if (_step_editors > 0) {
+               return;
+       }
 
        g_atomic_int_set (&_record_status, Enabled);
 
@@ -1108,9 +1168,9 @@ Session::maybe_enable_record ()
           means that we save pending state of which sources the next record will use,
           which gives us some chance of recovering from a crash during the record.
        */
-       
+
        save_state ("", true);
-       
+
        if (_transport_speed) {
                if (!config.get_punch_in()) {
                        enable_record ();
@@ -1128,7 +1188,7 @@ Session::audible_frame () const
 {
        framepos_t ret;
        framepos_t tf;
-       nframes_t offset;
+       framecnt_t offset;
 
        /* the first of these two possible settings for "offset"
           mean that the audible frame is stationary until
@@ -1140,7 +1200,7 @@ Session::audible_frame () const
           in the absence of any plugin latency compensation
        */
 
-       offset = _worst_output_latency;
+       offset = worst_playback_latency ();
 
        if (offset > current_block_size) {
                offset -= current_block_size;
@@ -1203,9 +1263,9 @@ Session::audible_frame () const
 }
 
 void
-Session::set_frame_rate (nframes_t frames_per_second)
+Session::set_frame_rate (framecnt_t frames_per_second)
 {
-       /** \fn void Session::set_frame_size(nframes_t)
+       /** \fn void Session::set_frame_size(framecnt_t)
                the AudioEngine object that calls this guarantees
                that it will not be called while we are also in
                ::process(). Its fine to do things that block
@@ -1216,7 +1276,7 @@ Session::set_frame_rate (nframes_t frames_per_second)
 
        sync_time_vars();
 
-       Automatable::set_automation_interval ((jack_nframes_t) ceil ((double) frames_per_second * (0.001 * Config->get_automation_interval())));
+       Automatable::set_automation_interval (ceil ((double) frames_per_second * (0.001 * Config->get_automation_interval())));
 
        clear_clicks ();
 
@@ -1229,14 +1289,14 @@ Session::set_frame_rate (nframes_t frames_per_second)
 }
 
 void
-Session::set_block_size (nframes_t nframes)
+Session::set_block_size (pframes_t nframes)
 {
        /* the AudioEngine guarantees
           that it will not be called while we are also in
           ::process(). It is therefore fine to do things that block
           here.
        */
-
+       
        {
                current_block_size = nframes;
 
@@ -1260,78 +1320,11 @@ Session::set_block_size (nframes_t nframes)
        }
 }
 
-void
-Session::set_default_fade (float /*steepness*/, float /*fade_msecs*/)
-{
-#if 0
-       nframes_t fade_frames;
-
-       /* Don't allow fade of less 1 frame */
-
-       if (fade_msecs < (1000.0 * (1.0/_current_frame_rate))) {
-
-               fade_msecs = 0;
-               fade_frames = 0;
-
-       } else {
-
-               fade_frames = (nframes_t) floor (fade_msecs * _current_frame_rate * 0.001);
-
-       }
-
-       default_fade_msecs = fade_msecs;
-       default_fade_steepness = steepness;
-
-       {
-               // jlc, WTF is this!
-               Glib::RWLock::ReaderLock lm (route_lock);
-               AudioRegion::set_default_fade (steepness, fade_frames);
-       }
-
-       set_dirty();
-
-       /* XXX have to do this at some point */
-       /* foreach region using default fade, reset, then
-          refill_all_diskstream_buffers ();
-       */
-#endif
-}
-
-struct RouteSorter {
-    /** @return true to run r1 before r2, otherwise false */
-    bool operator() (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> r2) {
-           if (r2->feeds (r1)) {
-                   /* r1 fed by r2; run r2 early */
-                   return false;
-           } else if (r1->feeds (r2)) {
-                   /* r2 fed by r1; run r1 early */
-                   return true;
-           } else {
-                   if (r1->not_fed ()) {
-                           if (r2->not_fed ()) {
-                                   /* no ardour-based connections inbound to either route. just use signal order */
-                                   return r1->order_key(N_("signal")) < r2->order_key(N_("signal"));
-                           } else {
-                                   /* r2 has connections, r1 does not; run r1 early */
-                                   return true;
-                           }
-                   } else {
-                           if (r2->not_fed()) {
-                                   /* r1 has connections, r2 does not; run r2 early */
-                                   return false;
-                           } else {
-                                   /* both r1 and r2 have connections, but not to each other. just use signal order */
-                                   return r1->order_key(N_("signal")) < r2->order_key(N_("signal"));
-                           }
-                   }
-           }
-    }
-};
 
 static void
-trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
+trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)
 {
-       shared_ptr<Route> r2;
+       boost::shared_ptr<Route> r2;
 
        if (r1->feeds (rbase) && rbase->feeds (r1)) {
                info << string_compose(_("feedback loop setup between %1 and %2"), r1->name(), rbase->name()) << endmsg;
@@ -1340,8 +1333,8 @@ trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
 
        /* make a copy of the existing list of routes that feed r1 */
 
-        Route::FedBy existing (r1->fed_by());
-                        
+       Route::FedBy existing (r1->fed_by());
+
        /* for each route that feeds r1, recurse, marking it as feeding
           rbase as well.
        */
@@ -1351,7 +1344,7 @@ trace_terminal (shared_ptr<Route> r1, shared_ptr<Route> rbase)
                        /* (*i) went away, ignore it */
                        continue;
                }
-               
+
                /* r2 is a route that feeds r1 which somehow feeds base. mark
                   base as being fed by r2
                */
@@ -1382,101 +1375,158 @@ void
 Session::resort_routes ()
 {
        /* don't do anything here with signals emitted
-          by Routes while we are being destroyed.
+          by Routes during initial setup or while we
+          are being destroyed.
        */
 
-       if (_state_of_the_state & Deletion) {
+       if (_state_of_the_state & (InitialConnecting | Deletion)) {
                return;
        }
 
        {
                RCUWriter<RouteList> writer (routes);
-               shared_ptr<RouteList> r = writer.get_copy ();
+               boost::shared_ptr<RouteList> r = writer.get_copy ();
                resort_routes_using (r);
                /* writer goes out of scope and forces update */
        }
 
-       //route_graph->dump(1);
-
 #ifndef NDEBUG
-        boost::shared_ptr<RouteList> rl = routes.reader ();
-        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-                DEBUG_TRACE (DEBUG::Graph, string_compose ("%1 fed by ...\n", (*i)->name()));
-                
-                const Route::FedBy& fb ((*i)->fed_by());
-
-                for (Route::FedBy::const_iterator f = fb.begin(); f != fb.end(); ++f) {
-                        boost::shared_ptr<Route> sf = f->r.lock();
-                        if (sf) {
-                                DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 (sends only ? %2)\n", sf->name(), f->sends_only));
-                        }
-                }
-        }
+       boost::shared_ptr<RouteList> rl = routes.reader ();
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               DEBUG_TRACE (DEBUG::Graph, string_compose ("%1 fed by ...\n", (*i)->name()));
+
+               const Route::FedBy& fb ((*i)->fed_by());
+
+               for (Route::FedBy::const_iterator f = fb.begin(); f != fb.end(); ++f) {
+                       boost::shared_ptr<Route> sf = f->r.lock();
+                       if (sf) {
+                               DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 (sends only ? %2)\n", sf->name(), f->sends_only));
+                       }
+               }
+       }
 #endif
 
 }
+
+/** This is called whenever we need to rebuild the graph of how we will process
+ *  routes.
+ *  @param r List of routes, in any order.
+ */
+
 void
-Session::resort_routes_using (shared_ptr<RouteList> r)
+Session::resort_routes_using (boost::shared_ptr<RouteList> r)
 {
-       RouteList::iterator i, j;
-
-       for (i = r->begin(); i != r->end(); ++i) {
+       /* We are going to build a directed graph of our routes;
+          this is where the edges of that graph are put.
+       */
+       
+       GraphEdges edges;
+
+       /* Go through all routes doing two things:
+        *
+        * 1. Collect the edges of the route graph.  Each of these edges
+        *    is a pair of routes, one of which directly feeds the other
+        *    either by a JACK connection or by an internal send.
+        *
+        * 2. Begin the process of making routes aware of which other
+        *    routes directly or indirectly feed them.  This information
+        *    is used by the solo code.
+        */
+          
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
+               /* Clear out the route's list of direct or indirect feeds */
                (*i)->clear_fed_by ();
 
-               for (j = r->begin(); j != r->end(); ++j) {
-
-                       /* although routes can feed themselves, it will
-                          cause an endless recursive descent if we
-                          detect it. so don't bother checking for
-                          self-feeding.
-                       */
-
-                       if (*j == *i) {
-                               continue;
-                       }
+               for (RouteList::iterator j = r->begin(); j != r->end(); ++j) {
 
-                        bool via_sends_only;
+                       bool via_sends_only;
 
-                       if ((*j)->direct_feeds (*i, &via_sends_only)) {
+                       /* See if this *j feeds *i according to the current state of the JACK
+                          connections and internal sends.
+                       */
+                       if ((*j)->direct_feeds_according_to_reality (*i, &via_sends_only)) {
+                               /* add the edge to the graph (part #1) */
+                               edges.add (*j, *i, via_sends_only);
+                               /* tell the route (for part #2) */
                                (*i)->add_fed_by (*j, via_sends_only);
                        }
                }
        }
 
-       for (i = r->begin(); i != r->end(); ++i) {
-               trace_terminal (*i, *i);
-       }
+       /* Attempt a topological sort of the route graph */
+       boost::shared_ptr<RouteList> sorted_routes = topological_sort (r, edges);
+       
+       if (sorted_routes) {
+               /* We got a satisfactory topological sort, so there is no feedback;
+                  use this new graph.
+
+                  Note: the process graph rechain does not require a
+                  topologically-sorted list, but hey ho.
+               */
+               if (_process_graph) {
+                       _process_graph->rechain (sorted_routes, edges);
+               }
+               
+               _current_route_graph = edges;
 
-       RouteSorter cmp;
-       r->sort (cmp);
+               /* Complete the building of the routes' lists of what directly
+                  or indirectly feeds them.
+               */
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       trace_terminal (*i, *i);
+               }
 
-       route_graph->rechain (r);
+               r = sorted_routes;
 
 #ifndef NDEBUG
-        DEBUG_TRACE (DEBUG::Graph, "Routes resorted, order follows:\n");
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 signal order %2\n", 
-                                                           (*i)->name(), (*i)->order_key ("signal")));
-       }
+               DEBUG_TRACE (DEBUG::Graph, "Routes resorted, order follows:\n");
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 signal order %2\n",
+                                                                  (*i)->name(), (*i)->order_key ("signal")));
+               }
 #endif
 
+               SuccessfulGraphSort (); /* EMIT SIGNAL */
+
+       } else {
+               /* The topological sort failed, so we have a problem.  Tell everyone
+                  and stick to the old graph; this will continue to be processed, so
+                  until the feedback is fixed, what is played back will not quite
+                  reflect what is actually connected.  Note also that we do not
+                  do trace_terminal here, as it would fail due to an endless recursion,
+                  so the solo code will think that everything is still connected
+                  as it was before.
+               */
+               
+               FeedbackDetected (); /* EMIT SIGNAL */
+       }
+
 }
 
-/** Find the route name starting with \a base with the lowest \a id.
+/** Find a route name starting with \a base, maybe followed by the
+ *  lowest \a id.  \a id will always be added if \a definitely_add_number
+ *  is true on entry; otherwise it will only be added if required
+ *  to make the name unique.
  *
- * Names are constructed like e.g. "Audio 3" for base="Audio" and id=3.
- * The available route name with the lowest ID will be used, and \a id
- * will be set to the ID.
+ *  Names are constructed like e.g. "Audio 3" for base="Audio" and id=3.
+ *  The available route name with the lowest ID will be used, and \a id
+ *  will be set to the ID.
  *
- * \return false if a route name could not be found, and \a track_name
- * and \a id do not reflect a free route name.
+ *  \return false if a route name could not be found, and \a track_name
+ *  and \a id do not reflect a free route name.
  */
 bool
-Session::find_route_name (const char* base, uint32_t& id, char* name, size_t name_len)
+Session::find_route_name (string const & base, uint32_t& id, char* name, size_t name_len, bool definitely_add_number)
 {
+       if (!definitely_add_number && route_by_name (base) == 0) {
+               /* juse use the base */
+               snprintf (name, name_len, "%s", base.c_str());
+               return true;
+       }
+
        do {
-               snprintf (name, name_len, "%s %" PRIu32, base, id);
+               snprintf (name, name_len, "%s %" PRIu32, base.c_str(), id);
 
                if (route_by_name (name) == 0) {
                        return true;
@@ -1489,70 +1539,73 @@ Session::find_route_name (const char* base, uint32_t& id, char* name, size_t nam
        return false;
 }
 
-/** Count the total ins and outs of all non-hidden routes in the session and return them in in and out */
+/** Count the total ins and outs of all non-hidden tracks in the session and return them in in and out */
 void
-Session::count_existing_route_channels (ChanCount& in, ChanCount& out)
+Session::count_existing_track_channels (ChanCount& in, ChanCount& out)
 {
        in  = ChanCount::ZERO;
        out = ChanCount::ZERO;
-       shared_ptr<RouteList> r = routes.reader ();
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->is_hidden()) {
-                       in  += (*i)->n_inputs();
-                       out += (*i)->n_outputs();
+                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (tr && !tr->is_hidden()) {
+                       in  += tr->n_inputs();
+                       out += tr->n_outputs();
                }
        }
 }
 
+/** Caller must not hold process lock
+ *  @param name_template string to use for the start of the name, or "" to use "MIDI".
+ */
 list<boost::shared_ptr<MidiTrack> >
-Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_many)
+Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_many, string name_template)
 {
        char track_name[32];
        uint32_t track_id = 0;
-       ChanCount existing_inputs;
-       ChanCount existing_outputs;
        string port;
        RouteList new_routes;
        list<boost::shared_ptr<MidiTrack> > ret;
        uint32_t control_id;
 
-       count_existing_route_channels (existing_inputs, existing_outputs);
+       control_id = next_control_id ();
 
-       control_id = ntracks() + nbusses();
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("MIDI");
 
        while (how_many) {
-               if (!find_route_name ("Midi", ++track_id, track_name, sizeof(track_name))) {
+               if (!find_route_name (name_template.empty() ? _("MIDI") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
                        error << "cannot find name for new midi track" << endmsg;
                        goto failed;
                }
 
-               shared_ptr<MidiTrack> track;
-                
-               try {
-                       MidiTrack* mt = new MidiTrack (*this, track_name, Route::Flag (0), mode);
-
-                        if (mt->init ()) {
-                                delete mt;
-                                goto failed;
-                        }
+               boost::shared_ptr<MidiTrack> track;
 
-                        mt->use_new_diskstream();
-
-                       boost_debug_shared_ptr_mark_interesting (mt, "Track");
-                       track = boost::shared_ptr<MidiTrack>(mt);
+               try {
+                       track.reset (new MidiTrack (*this, track_name, Route::Flag (0), mode));
 
-                       if (track->input()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
-                               error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
+                       if (track->init ()) {
                                goto failed;
                        }
 
+                       track->use_new_diskstream();
 
-                       if (track->output()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
-                               error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
-                               goto failed;
-                       }
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                       // boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+#endif
+                       {
+                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               if (track->input()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
+                                       error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
+                                       goto failed;
+                               }
 
-                       auto_connect_route (track.get(), existing_inputs, existing_outputs);
+                               if (track->output()->ensure_io (ChanCount(DataType::MIDI, 1), false, this)) {
+                                       error << "cannot configure 1 in/1 out configuration for new midi track" << endmsg;
+                                       goto failed;
+                               }
+                       }
 
                        track->non_realtime_input_change();
 
@@ -1583,22 +1636,59 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
 
   failed:
        if (!new_routes.empty()) {
-               add_routes (new_routes, false);
-               save_state (_current_snapshot_name);
+               add_routes (new_routes, true, true);
        }
 
        return ret;
 }
 
+void
+Session::midi_output_change_handler (IOChange change, void * /*src*/, boost::weak_ptr<Route> wmt)
+{
+        boost::shared_ptr<Route> midi_track (wmt.lock());
+
+        if (!midi_track) {
+                return;
+        }
+
+       if ((change.type & IOChange::ConfigurationChanged) && Config->get_output_auto_connect() != ManualConnect) {
+
+                if (change.after.n_audio() <= change.before.n_audio()) {
+                        return;
+                }
+
+                /* new audio ports: make sure the audio goes somewhere useful,
+                   unless the user has no-auto-connect selected.
+
+                   The existing ChanCounts don't matter for this call as they are only
+                   to do with matching input and output indices, and we are only changing
+                   outputs here.
+                */
+
+                ChanCount dummy;
+
+                auto_connect_route (midi_track, dummy, dummy, false, false, ChanCount(), change.before);
+        }
+}
+
 /** @param connect_inputs true to connect inputs as well as outputs, false to connect just outputs.
  *  @param input_start Where to start from when auto-connecting inputs; e.g. if this is 0, auto-connect starting from input 0.
  *  @param output_start As \a input_start, but for outputs.
  */
 void
-Session::auto_connect_route (
-       Route* route, ChanCount& existing_inputs, ChanCount& existing_outputs, bool connect_inputs, ChanCount input_start, ChanCount output_start
-       )
+Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing_inputs, ChanCount& existing_outputs,
+                             bool with_lock, bool connect_inputs, ChanCount input_start, ChanCount output_start)
 {
+       if (!IO::connecting_legal) {
+               return;
+       }
+
+       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock (), Glib::NOT_LOCK);
+
+       if (with_lock) {
+               lm.acquire ();
+       }
+
        /* If both inputs and outputs are auto-connected to physical ports,
           use the max of input and output offsets to ensure auto-connected
           port numbers always match up (e.g. the first audio input and the
@@ -1607,14 +1697,18 @@ Session::auto_connect_route (
           offset possible.
        */
 
+       DEBUG_TRACE (DEBUG::Graph,
+                    string_compose("Auto-connect: existing in = %1 out = %2\n",
+                                   existing_inputs, existing_outputs));
+
        const bool in_out_physical =
-                  (Config->get_input_auto_connect() & AutoConnectPhysical)
+               (Config->get_input_auto_connect() & AutoConnectPhysical)
                && (Config->get_output_auto_connect() & AutoConnectPhysical)
                && connect_inputs;
 
        const ChanCount in_offset = in_out_physical
                ? ChanCount::max(existing_inputs, existing_outputs)
-               : existing_inputs;
+                : existing_inputs;
 
        const ChanCount out_offset = in_out_physical
                ? ChanCount::max(existing_inputs, existing_outputs)
@@ -1629,17 +1723,32 @@ Session::auto_connect_route (
 
                if (!physinputs.empty() && connect_inputs) {
                        uint32_t nphysical_in = physinputs.size();
+
+                       DEBUG_TRACE (DEBUG::Graph,
+                                    string_compose("There are %1 physical inputs of type %2\n",
+                                                   nphysical_in, *t));
+
                        for (uint32_t i = input_start.get(*t); i < route->n_inputs().get(*t) && i < nphysical_in; ++i) {
                                string port;
 
                                if (Config->get_input_auto_connect() & AutoConnectPhysical) {
+                                       DEBUG_TRACE (DEBUG::Graph,
+                                                    string_compose("Get index %1 + %2 % %3 = %4\n",
+                                                                   in_offset.get(*t), i, nphysical_in,
+                                                                   (in_offset.get(*t) + i) % nphysical_in));
                                        port = physinputs[(in_offset.get(*t) + i) % nphysical_in];
                                }
 
-                               if (!port.empty() && route->input()->connect (
-                                               route->input()->ports().port(*t, i), port, this)) {
+                               DEBUG_TRACE (DEBUG::Graph,
+                                            string_compose("Connect route %1 IN to %2\n",
+                                                           route->name(), port));
+
+                               if (!port.empty() && route->input()->connect (route->input()->ports().port(*t, i), port, this)) {
                                        break;
                                }
+
+                                ChanCount one_added (*t, 1);
+                                existing_inputs += one_added;
                        }
                }
 
@@ -1648,81 +1757,88 @@ Session::auto_connect_route (
                        for (uint32_t i = output_start.get(*t); i < route->n_outputs().get(*t); ++i) {
                                string port;
 
-                               if (Config->get_output_auto_connect() & AutoConnectPhysical) {
+                               if ((*t) == DataType::MIDI || Config->get_output_auto_connect() & AutoConnectPhysical) {
                                        port = physoutputs[(out_offset.get(*t) + i) % nphysical_out];
-                               } else if (Config->get_output_auto_connect() & AutoConnectMaster) {
+                               } else if ((*t) == DataType::AUDIO && Config->get_output_auto_connect() & AutoConnectMaster) {
+                                        /* master bus is audio only */
                                        if (_master_out && _master_out->n_inputs().get(*t) > 0) {
                                                port = _master_out->input()->ports().port(*t,
                                                                i % _master_out->input()->n_ports().get(*t))->name();
                                        }
                                }
 
-                               if (!port.empty() && route->output()->connect (
-                                               route->output()->ports().port(*t, i), port, this)) {
+                               DEBUG_TRACE (DEBUG::Graph,
+                                            string_compose("Connect route %1 OUT to %2\n",
+                                                           route->name(), port));
+
+                               if (!port.empty() && route->output()->connect (route->output()->ports().port(*t, i), port, this)) {
                                        break;
                                }
+
+                                ChanCount one_added (*t, 1);
+                                existing_outputs += one_added;
                        }
                }
        }
-
-       existing_inputs += route->n_inputs();
-       existing_outputs += route->n_outputs();
 }
 
+/** Caller must not hold process lock
+ *  @param name_template string to use for the start of the name, or "" to use "Audio".
+ */
 list< boost::shared_ptr<AudioTrack> >
-Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group, uint32_t how_many)
+Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group, 
+                         uint32_t how_many, string name_template)
 {
        char track_name[32];
        uint32_t track_id = 0;
-       ChanCount existing_inputs;
-       ChanCount existing_outputs;
        string port;
        RouteList new_routes;
        list<boost::shared_ptr<AudioTrack> > ret;
        uint32_t control_id;
 
-       count_existing_route_channels (existing_inputs, existing_outputs);
+       control_id = next_control_id ();
 
-       control_id = ntracks() + nbusses() + 1;
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Audio");
 
        while (how_many) {
-               if (!find_route_name ("Audio", ++track_id, track_name, sizeof(track_name))) {
+               if (!find_route_name (name_template.empty() ? _("Audio") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
                        error << "cannot find name for new audio track" << endmsg;
                        goto failed;
                }
 
-               shared_ptr<AudioTrack> track;
+               boost::shared_ptr<AudioTrack> track;
 
                try {
-                       AudioTrack* at = new AudioTrack (*this, track_name, Route::Flag (0), mode);
-
-                        if (at->init ()) {
-                                delete at;
-                                goto failed;
-                        }
-
-                        at->use_new_diskstream();
-
-                       boost_debug_shared_ptr_mark_interesting (at, "Track");
-                       track = boost::shared_ptr<AudioTrack>(at);
+                       track.reset (new AudioTrack (*this, track_name, Route::Flag (0), mode));
 
-                       if (track->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
-                               error << string_compose (
-                                                       _("cannot configure %1 in/%2 out configuration for new audio track"),
-                                                        input_channels, output_channels)
-                                     << endmsg;
+                       if (track->init ()) {
                                goto failed;
                        }
 
-                       if (track->output()->ensure_io (ChanCount(DataType::AUDIO, output_channels), false, this)) {
-                               error << string_compose (
-                                                       _("cannot configure %1 in/%2 out configuration for new audio track"),
-                                                        input_channels, output_channels)
-                                     << endmsg;
-                               goto failed;
-                       }
+                       track->use_new_diskstream();
 
-                       auto_connect_route (track.get(), existing_inputs, existing_outputs);
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                       // boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+#endif
+                       {
+                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+
+                               if (track->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
+                                       error << string_compose (
+                                               _("cannot configure %1 in/%2 out configuration for new audio track"),
+                                               input_channels, output_channels)
+                                             << endmsg;
+                                       goto failed;
+                               }
+
+                               if (track->output()->ensure_io (ChanCount(DataType::AUDIO, output_channels), false, this)) {
+                                       error << string_compose (
+                                               _("cannot configure %1 in/%2 out configuration for new audio track"),
+                                               input_channels, output_channels)
+                                             << endmsg;
+                                       goto failed;
+                               }
+                       }
 
                        if (route_group) {
                                route_group->add (track);
@@ -1754,7 +1870,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
   failed:
        if (!new_routes.empty()) {
-               add_routes (new_routes, true);
+               add_routes (new_routes, true, true);
        }
 
        return ret;
@@ -1766,7 +1882,7 @@ Session::set_remote_control_ids ()
        RemoteModel m = Config->get_remote_model();
        bool emit_signal = false;
 
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if (MixerOrdered == m) {
@@ -1787,55 +1903,56 @@ Session::set_remote_control_ids ()
        }
 }
 
-
+/** Caller must not hold process lock.
+ *  @param name_template string to use for the start of the name, or "" to use "Bus".
+ */
 RouteList
-Session::new_audio_route (bool aux, int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many)
+Session::new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many, string name_template)
 {
        char bus_name[32];
        uint32_t bus_id = 0;
-       ChanCount existing_inputs;
-       ChanCount existing_outputs;
        string port;
        RouteList ret;
        uint32_t control_id;
 
-       count_existing_route_channels (existing_inputs, existing_outputs);
-
-       control_id = ntracks() + nbusses() + 1;
+       control_id = next_control_id ();
 
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Bus");
+       
        while (how_many) {
-               if (!find_route_name ("Bus", ++bus_id, bus_name, sizeof(bus_name))) {
+               if (!find_route_name (name_template.empty () ? _("Bus") : name_template, ++bus_id, bus_name, sizeof(bus_name), use_number)) {
                        error << "cannot find name for new audio bus" << endmsg;
                        goto failure;
                }
 
                try {
-                       Route* rt = new Route (*this, bus_name, Route::Flag(0), DataType::AUDIO);
-
-                        if (rt->init ()) {
-                                delete rt;
-                                goto failure;
-                        }
-
-                       boost_debug_shared_ptr_mark_interesting (rt, "Route");
-                       shared_ptr<Route> bus (rt);
+                       boost::shared_ptr<Route> bus (new Route (*this, bus_name, Route::Flag(0), DataType::AUDIO));
 
-                       if (bus->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
-                               error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
-                                                        input_channels, output_channels)
-                                     << endmsg;
+                       if (bus->init ()) {
                                goto failure;
                        }
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+                       // boost_debug_shared_ptr_mark_interesting (bus.get(), "Route");
+#endif
+                       {
+                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+
+                               if (bus->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
+                                       error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
+                                                                input_channels, output_channels)
+                                             << endmsg;
+                                       goto failure;
+                               }
 
-                       if (bus->output()->ensure_io (ChanCount(DataType::AUDIO, output_channels), false, this)) {
-                               error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
-                                                        input_channels, output_channels)
-                                     << endmsg;
-                               goto failure;
-                       }
 
-                       auto_connect_route (bus.get(), existing_inputs, existing_outputs, false);
+                               if (bus->output()->ensure_io (ChanCount(DataType::AUDIO, output_channels), false, this)) {
+                                       error << string_compose (_("cannot configure %1 in/%2 out configuration for new audio track"),
+                                                                input_channels, output_channels)
+                                             << endmsg;
+                                       goto failure;
+                               }
+                       }
 
                        if (route_group) {
                                route_group->add (bus);
@@ -1843,9 +1960,7 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou
                        bus->set_remote_control_id (control_id);
                        ++control_id;
 
-                       if (aux) {
-                               bus->add_internal_return ();
-                       }
+                       bus->add_internal_return ();
 
                        ret.push_back (bus);
                }
@@ -1867,7 +1982,7 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou
 
   failure:
        if (!ret.empty()) {
-               add_routes (ret, true);
+               add_routes (ret, false, true);
        }
 
        return ret;
@@ -1877,7 +1992,6 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou
 RouteList
 Session::new_route_from_template (uint32_t how_many, const std::string& template_path)
 {
-       char name[32];
        RouteList ret;
        uint32_t control_id;
        XMLTree tree;
@@ -1889,32 +2003,40 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
 
        XMLNode* node = tree.root();
 
-       control_id = ntracks() + nbusses() + 1;
+       control_id = next_control_id ();
 
        while (how_many) {
 
-               XMLNode node_copy (*node); // make a copy so we can change the name if we need to
-
-               std::string node_name = IO::name_from_state (*node_copy.children().front());
+               XMLNode node_copy (*node);
 
-               /* generate a new name by adding a number to the end of the template name */
-               if (!find_route_name (node_name.c_str(), ++number, name, sizeof(name))) {
-                       fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
-                       /*NOTREACHED*/
-               }
+               /* Remove IDs of everything so that new ones are used */
+               node_copy.remove_property_recursively (X_("id"));
 
-               /* set IO children to use the new name */
-               XMLNodeList const & children = node_copy.children ();
-               for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
-                       if ((*i)->name() == IO::state_node_name) {
-                               IO::set_name_in_state (**i, name);
+               try {
+                       string const route_name = node_copy.property(X_("name"))->value ();
+                       
+                       /* generate a new name by adding a number to the end of the template name */
+                       char name[32];
+                       if (!find_route_name (route_name.c_str(), ++number, name, sizeof(name), true)) {
+                               fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
+                               /*NOTREACHED*/
                        }
-               }
 
-               Track::zero_diskstream_id_in_xml (node_copy);
+                       /* set this name in the XML description that we are about to use */
+                       Route::set_name_in_state (node_copy, name);
 
-               try {
-                       shared_ptr<Route> route (XMLRouteFactory (node_copy, 3000));
+                       /* trim bitslots from listen sends so that new ones are used */
+                       XMLNodeList children = node_copy.children ();
+                       for (XMLNodeList::iterator i = children.begin(); i != children.end(); ++i) {
+                               if ((*i)->name() == X_("Processor")) {
+                                       XMLProperty* role = (*i)->property (X_("role"));
+                                       if (role && role->value() == X_("Listen")) {
+                                               (*i)->remove_property (X_("bitslot"));
+                                       }
+                               }
+                       }
+                       
+                       boost::shared_ptr<Route> route (XMLRouteFactory (node_copy, 3000));
 
                        if (route == 0) {
                                error << _("Session: cannot create track/bus from template description") << endmsg;
@@ -1926,6 +2048,9 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                                   picks up the configuration of the route. During session
                                   loading this normally happens in a different way.
                                */
+
+                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+
                                IOChange change (IOChange::Type (IOChange::ConfigurationChanged | IOChange::ConnectionsChanged));
                                change.after = route->input()->n_ports();
                                route->input()->changed (change, this);
@@ -1954,21 +2079,25 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
 
   out:
        if (!ret.empty()) {
-               add_routes (ret, true);
+               add_routes (ret, true, true);
        }
 
        return ret;
 }
 
 void
-Session::add_routes (RouteList& new_routes, bool save)
+Session::add_routes (RouteList& new_routes, bool auto_connect, bool save)
 {
+        ChanCount existing_inputs;
+        ChanCount existing_outputs;
+
+        count_existing_track_channels (existing_inputs, existing_outputs);
+
        {
                RCUWriter<RouteList> writer (routes);
-               shared_ptr<RouteList> r = writer.get_copy ();
+               boost::shared_ptr<RouteList> r = writer.get_copy ();
                r->insert (r->end(), new_routes.begin(), new_routes.end());
 
-
                /* if there is no control out and we're not in the middle of loading,
                   resort the graph here. if there is a control out, we will resort
                   toward the end of this method. if we are in the middle of loading,
@@ -2007,25 +2136,32 @@ Session::add_routes (RouteList& new_routes, bool save)
                        track_playlist_changed (boost::weak_ptr<Track> (tr));
                        tr->RecordEnableChanged.connect_same_thread (*this, boost::bind (&Session::update_have_rec_enabled_track, this));
 
-                        boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (tr);
-                        if (mt) {
-                                mt->StepEditStatusChange.connect_same_thread (*this, boost::bind (&Session::step_edit_status_change, this, _1));
-                        }
+                       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (tr);
+                       if (mt) {
+                               mt->StepEditStatusChange.connect_same_thread (*this, boost::bind (&Session::step_edit_status_change, this, _1));
+                                mt->output()->changed.connect_same_thread (*this, boost::bind (&Session::midi_output_change_handler, this, _1, _2, boost::weak_ptr<Route>(mt)));
+                       }
+               }
+
+               if (auto_connect) {
+                       auto_connect_route (r, existing_inputs, existing_outputs, true);
                }
        }
 
        if (_monitor_out && IO::connecting_legal) {
 
-               for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
-                       if ((*x)->is_monitor()) {
-                                /* relax */
-                        } else if ((*x)->is_master()) {
-                                /* relax */
-                       } else {
-                                (*x)->listen_via (_monitor_out,
-                                                  (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
-                                                  false, false);
-                        }
+               {
+                       Glib::Mutex::Lock lm (_engine.process_lock());          
+                       
+                       for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
+                               if ((*x)->is_monitor()) {
+                                       /* relax */
+                               } else if ((*x)->is_master()) {
+                                       /* relax */
+                               } else {
+                                       (*x)->enable_monitor_send ();
+                               }
+                       }
                }
 
                resort_routes ();
@@ -2047,13 +2183,9 @@ Session::globally_set_send_gains_to_zero (boost::shared_ptr<Route> dest)
        boost::shared_ptr<RouteList> r = routes.reader ();
        boost::shared_ptr<Send> s;
 
-       /* only tracks */
-
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (boost::dynamic_pointer_cast<Track>(*i)) {
-                       if ((s = (*i)->internal_send_for (dest)) != 0) {
-                               s->amp()->gain_control()->set_value (0.0);
-                       }
+               if ((s = (*i)->internal_send_for (dest)) != 0) {
+                       s->amp()->gain_control()->set_value (0.0);
                }
        }
 }
@@ -2064,13 +2196,9 @@ Session::globally_set_send_gains_to_unity (boost::shared_ptr<Route> dest)
        boost::shared_ptr<RouteList> r = routes.reader ();
        boost::shared_ptr<Send> s;
 
-       /* only tracks */
-
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (boost::dynamic_pointer_cast<Track>(*i)) {
-                       if ((s = (*i)->internal_send_for (dest)) != 0) {
-                               s->amp()->gain_control()->set_value (1.0);
-                       }
+               if ((s = (*i)->internal_send_for (dest)) != 0) {
+                       s->amp()->gain_control()->set_value (1.0);
                }
        }
 }
@@ -2081,27 +2209,23 @@ Session::globally_set_send_gains_from_track(boost::shared_ptr<Route> dest)
        boost::shared_ptr<RouteList> r = routes.reader ();
        boost::shared_ptr<Send> s;
 
-       /* only tracks */
-
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (boost::dynamic_pointer_cast<Track>(*i)) {
-                       if ((s = (*i)->internal_send_for (dest)) != 0) {
-                               s->amp()->gain_control()->set_value ((*i)->gain_control()->get_value());
-                       }
+               if ((s = (*i)->internal_send_for (dest)) != 0) {
+                       s->amp()->gain_control()->set_value ((*i)->gain_control()->get_value());
                }
        }
 }
 
+/** @param include_buses true to add sends to buses and tracks, false for just tracks */
 void
-Session::globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p)
+Session::globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p, bool include_buses)
 {
        boost::shared_ptr<RouteList> r = routes.reader ();
        boost::shared_ptr<RouteList> t (new RouteList);
 
-       /* only send tracks */
-
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (boost::dynamic_pointer_cast<Track>(*i)) {
+               /* no MIDI sends because there are no MIDI busses yet */
+               if (include_buses || boost::dynamic_pointer_cast<AudioTrack>(*i)) {
                        t->push_back (*i);
                }
        }
@@ -2120,30 +2244,31 @@ Session::add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::
                dest->add_internal_return();
        }
 
+       
        for (RouteList::iterator i = senders->begin(); i != senders->end(); ++i) {
-
+               
                if ((*i)->is_monitor() || (*i)->is_master() || (*i) == dest) {
                        continue;
                }
-
-               (*i)->listen_via (dest, p, true, true);
+               
+               (*i)->add_aux_send (dest, p);
        }
 
        graph_reordered ();
 }
 
 void
-Session::remove_route (shared_ptr<Route> route)
+Session::remove_route (boost::shared_ptr<Route> route)
 {
-        if (((route == _master_out) || (route == _monitor_out)) && !Config->get_allow_special_bus_removal()) {
-                return;
-        }
+       if (route == _master_out) {
+               return;
+       }
 
-        route->set_solo (false, this);
+       route->set_solo (false, this);
 
        {
                RCUWriter<RouteList> writer (routes);
-               shared_ptr<RouteList> rs = writer.get_copy ();
+               boost::shared_ptr<RouteList> rs = writer.get_copy ();
 
                rs->remove (route);
 
@@ -2153,25 +2278,17 @@ Session::remove_route (shared_ptr<Route> route)
                */
 
                if (route == _master_out) {
-                       _master_out = shared_ptr<Route> ();
+                       _master_out = boost::shared_ptr<Route> ();
                }
 
                if (route == _monitor_out) {
-
-                       /* cancel control outs for all routes */
-
-                       for (RouteList::iterator r = rs->begin(); r != rs->end(); ++r) {
-                               (*r)->drop_listen (_monitor_out);
-                       }
-
                        _monitor_out.reset ();
                }
 
                /* writer goes out of scope, forces route list update */
        }
 
-        update_route_solo_state ();
-       update_session_range_location_marker ();
+       update_route_solo_state ();
 
        // We need to disconnect the route's inputs and outputs
 
@@ -2188,24 +2305,26 @@ Session::remove_route (shared_ptr<Route> route)
                                (*i)->remove_processor (s);
                        }
                }
-       }       
+       }
 
-        boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
-        if (mt && mt->step_editing()) {
-                if (_step_editors > 0) {
-                        _step_editors--;
-                }
-        }
+       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
+       if (mt && mt->step_editing()) {
+               if (_step_editors > 0) {
+                       _step_editors--;
+               }
+       }
 
-       update_latency_compensation (false, false);
+       update_latency_compensation ();
        set_dirty();
 
-        /* Re-sort routes to remove the graph's current references to the one that is
+       /* Re-sort routes to remove the graph's current references to the one that is
         * going away, then flush old references out of the graph.
-         */
+        */
 
        resort_routes ();
-        route_graph->clear_other_chain ();
+       if (_process_graph) {
+               _process_graph->clear_other_chain ();
+       }
 
        /* get rid of it from the dead wood collection in the route list manager */
 
@@ -2243,18 +2362,18 @@ Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
                return;
        }
 
-       if (route->listening()) {
+       if (route->listening_via_monitor ()) {
 
-                if (Config->get_exclusive_solo()) {
-                        /* new listen: disable all other listen */
-                        shared_ptr<RouteList> r = routes.reader ();
-                        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                                if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
-                                        continue;
-                                } 
-                                (*i)->set_listen (false, this);
-                        }
-                }
+               if (Config->get_exclusive_solo()) {
+                       /* new listen: disable all other listen */
+                       boost::shared_ptr<RouteList> r = routes.reader ();
+                       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                               if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
+                                       continue;
+                               }
+                               (*i)->set_listen (false, this);
+                       }
+               }
 
                _listen_cnt++;
 
@@ -2262,6 +2381,8 @@ Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
 
                _listen_cnt--;
        }
+
+       update_route_solo_state ();
 }
 void
 Session::route_solo_isolated_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
@@ -2273,48 +2394,46 @@ Session::route_solo_isolated_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
                error << string_compose (_("programming error: %1"), X_("invalid route weak ptr passed to route_solo_changed")) << endmsg;
                return;
        }
-        
-        bool send_changed = false;
 
-        if (route->solo_isolated()) {
-                if (_solo_isolated_cnt == 0) {
-                        send_changed = true;
-                }
-                _solo_isolated_cnt++;
-        } else if (_solo_isolated_cnt > 0) {
-                _solo_isolated_cnt--;
-                if (_solo_isolated_cnt == 0) {
-                        send_changed = true;
-                }
-        }
+       bool send_changed = false;
 
-        if (send_changed) {
-                IsolatedChanged (); /* EMIT SIGNAL */
-        }
+       if (route->solo_isolated()) {
+               if (_solo_isolated_cnt == 0) {
+                       send_changed = true;
+               }
+               _solo_isolated_cnt++;
+       } else if (_solo_isolated_cnt > 0) {
+               _solo_isolated_cnt--;
+               if (_solo_isolated_cnt == 0) {
+                       send_changed = true;
+               }
+       }
+
+       if (send_changed) {
+               IsolatedChanged (); /* EMIT SIGNAL */
+       }
 }
-            
+
 void
 Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_ptr<Route> wpr)
 {
-        if (!self_solo_change) {
-                // session doesn't care about changes to soloed-by-others
-                return;
-        }
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("route solo change, self = %1\n", self_solo_change));
+
+       if (!self_solo_change) {
+               // session doesn't care about changes to soloed-by-others
+               return;
+       }
 
        if (solo_update_disabled) {
                // We know already
+               DEBUG_TRACE (DEBUG::Solo, "solo update disabled - changed ignored\n");
                return;
        }
 
        boost::shared_ptr<Route> route = wpr.lock ();
+       assert (route);
 
-       if (!route) {
-               /* should not happen */
-               error << string_compose (_("programming error: %1"), X_("invalid route weak ptr passed to route_solo_changed")) << endmsg;
-               return;
-       }
-        
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
        int32_t delta;
 
        if (route->self_soloed()) {
@@ -2322,60 +2441,98 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
        } else {
                delta = -1;
        }
-        if (delta == 1 && Config->get_exclusive_solo()) {
-                /* new solo: disable all other solos */
-                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                        if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
-                                continue;
-                        } 
-                        (*i)->set_solo (false, this);
-                }
-        }
+
+       RouteGroup* rg = route->route_group ();
+       bool leave_group_alone = (rg && rg->is_active() && rg->is_solo());
+
+       if (delta == 1 && Config->get_exclusive_solo()) {
+               
+               /* new solo: disable all other solos, but not the group if its solo-enabled */
+
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden() ||
+                           (leave_group_alone && ((*i)->route_group() == rg))) {
+                               continue;
+                       }
+                       (*i)->set_solo (false, this);
+               }
+       }
+
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("propagate solo change, delta = %1\n", delta));
 
        solo_update_disabled = true;
-        
-        RouteList uninvolved;
-        
+
+       RouteList uninvolved;
+
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("%1\n", route->name()));
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                bool via_sends_only;
-                bool in_signal_flow;
+               bool in_signal_flow;
 
-               if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
+               if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden() ||
+                   (leave_group_alone && ((*i)->route_group() == rg))) {
                        continue;
-               } 
+               }
 
-                in_signal_flow = false;
+               in_signal_flow = false;
 
-                if ((*i)->feeds (route, &via_sends_only)) {
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed from %1\n", (*i)->name()));
+               
+               if ((*i)->feeds (route, &via_sends_only)) {
                        if (!via_sends_only) {
-                                if (!route->soloed_by_others_upstream()) {
-                                        (*i)->mod_solo_by_others_downstream (delta);
-                                }
-                                in_signal_flow = true;
+                               if (!route->soloed_by_others_upstream()) {
+                                       (*i)->mod_solo_by_others_downstream (delta);
+                               }
                        }
-               } 
-                
-                if (route->feeds (*i, &via_sends_only)) {
-                        (*i)->mod_solo_by_others_upstream (delta);
-                        in_signal_flow = true;
-                }
+                       in_signal_flow = true;
+               } else {
+                       DEBUG_TRACE (DEBUG::Solo, "\tno feed from\n");
+               }
+               
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed to %1\n", (*i)->name()));
 
-                if (!in_signal_flow) {
-                        uninvolved.push_back (*i);
-                }
+               if (route->feeds (*i, &via_sends_only)) {
+                       /* propagate solo upstream only if routing other than
+                          sends is involved, but do consider the other route
+                          (*i) to be part of the signal flow even if only
+                          sends are involved.
+                       */
+                       DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 feeds %2 via sends only %3 sboD %4 sboU %5\n",
+                                                                 route->name(),
+                                                                 (*i)->name(),
+                                                                 via_sends_only,
+                                                                 route->soloed_by_others_downstream(),
+                                                                 route->soloed_by_others_upstream()));
+                       if (!via_sends_only) {
+                               if (!route->soloed_by_others_downstream()) {
+                                       DEBUG_TRACE (DEBUG::Solo, string_compose ("\tmod %1 by %2\n", (*i)->name(), delta));
+                                       (*i)->mod_solo_by_others_upstream (delta);
+                               }
+                       }
+                       in_signal_flow = true;
+               } else {
+                       DEBUG_TRACE (DEBUG::Solo, "\tno feed to\n");
+               }
+
+               if (!in_signal_flow) {
+                       uninvolved.push_back (*i);
+               }
        }
 
        solo_update_disabled = false;
+       DEBUG_TRACE (DEBUG::Solo, "propagation complete\n");
+
        update_route_solo_state (r);
 
-        /* now notify that the mute state of the routes not involved in the signal
-           pathway of the just-solo-changed route may have altered.
-        */
+       /* now notify that the mute state of the routes not involved in the signal
+          pathway of the just-solo-changed route may have altered.
+       */
 
-        for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) {
-                (*i)->mute_changed (this);
-        }
+       for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) {
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1\n", (*i)->name()));
+               (*i)->mute_changed (this);
+       }
 
        SoloChanged (); /* EMIT SIGNAL */
        set_dirty();
@@ -2387,8 +2544,8 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
        /* now figure out if anything that matters is soloed (or is "listening")*/
 
        bool something_soloed = false;
-        uint32_t listeners = 0;
-        uint32_t isolated = 0;
+       uint32_t listeners = 0;
+       uint32_t isolated = 0;
 
        if (!r) {
                r = routes.reader();
@@ -2399,36 +2556,36 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
                        something_soloed = true;
                }
 
-                if (!(*i)->is_hidden() && (*i)->listening()) {
-                        if (Config->get_solo_control_is_listen_control()) {
-                                listeners++;
-                        } else {
-                                (*i)->set_listen (false, this);
-                        }
-                }
+               if (!(*i)->is_hidden() && (*i)->listening_via_monitor()) {
+                       if (Config->get_solo_control_is_listen_control()) {
+                               listeners++;
+                       } else {
+                               (*i)->set_listen (false, this);
+                       }
+               }
 
-                if ((*i)->solo_isolated()) {
-                        isolated++;
-                }
+               if ((*i)->solo_isolated()) {
+                       isolated++;
+               }
        }
 
-        if (something_soloed != _non_soloed_outs_muted) {
-                _non_soloed_outs_muted = something_soloed;
-                SoloActive (_non_soloed_outs_muted); /* EMIT SIGNAL */
-        }
+       if (something_soloed != _non_soloed_outs_muted) {
+               _non_soloed_outs_muted = something_soloed;
+               SoloActive (_non_soloed_outs_muted); /* EMIT SIGNAL */
+       }
 
-        _listen_cnt = listeners;
+       _listen_cnt = listeners;
 
-        if (isolated != _solo_isolated_cnt) {
-                _solo_isolated_cnt = isolated;
-                IsolatedChanged (); /* EMIT SIGNAL */
-        }
+       if (isolated != _solo_isolated_cnt) {
+               _solo_isolated_cnt = isolated;
+               IsolatedChanged (); /* EMIT SIGNAL */
+       }
 }
 
-boost::shared_ptr<RouteList> 
+boost::shared_ptr<RouteList>
 Session::get_routes_with_internal_returns() const
 {
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
        boost::shared_ptr<RouteList> rl (new RouteList);
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
@@ -2442,25 +2599,81 @@ Session::get_routes_with_internal_returns() const
 bool
 Session::io_name_is_legal (const std::string& name)
 {
-        shared_ptr<RouteList> r = routes.reader ();
-        
-        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                if ((*i)->name() == name) {
-                        return false;
-                }
-                
-                if ((*i)->has_io_processor_named (name)) {
-                        return false;
-                }
-        }
-        
-        return true;
-}
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
-shared_ptr<Route>
-Session::route_by_name (string name)
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if ((*i)->name() == name) {
+                       return false;
+               }
+
+               if ((*i)->has_io_processor_named (name)) {
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+void
+Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_on*/)
 {
-       shared_ptr<RouteList> r = routes.reader ();
+       RouteList rl;
+       vector<string> connections;
+
+       PortSet& ps (rt->input()->ports());
+
+       for (PortSet::iterator p = ps.begin(); p != ps.end(); ++p) {
+               p->get_connections (connections);
+       }
+
+       for (vector<string>::iterator s = connections.begin(); s != connections.end(); ++s) {
+               routes_using_input_from (*s, rl);
+       }
+
+       /* scan all relevant routes to see if others are on or off */
+
+       bool others_are_already_on = false;
+
+       for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
+               if ((*r) != rt) {
+                       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*r);
+                       if (mt) {
+                               if (mt->input_active()) {
+                                       others_are_already_on = true;
+                                       break;
+                               }
+                       }
+               }
+       }
+
+       /* globally reverse other routes */
+
+       for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
+               if ((*r) != rt) {
+                       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*r);
+                       if (mt) {
+                               mt->set_input_active (!others_are_already_on);
+                       }
+               }
+       }
+}
+
+void
+Session::routes_using_input_from (const string& str, RouteList& rl)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if ((*i)->input()->connected_to (str)) {
+                       rl.push_back (*i);
+               }
+       }
+}
+
+boost::shared_ptr<Route>
+Session::route_by_name (string name)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if ((*i)->name() == name) {
@@ -2468,13 +2681,13 @@ Session::route_by_name (string name)
                }
        }
 
-       return shared_ptr<Route> ((Route*) 0);
+       return boost::shared_ptr<Route> ((Route*) 0);
 }
 
-shared_ptr<Route>
+boost::shared_ptr<Route>
 Session::route_by_id (PBD::ID id)
 {
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if ((*i)->id() == id) {
@@ -2482,13 +2695,28 @@ Session::route_by_id (PBD::ID id)
                }
        }
 
-       return shared_ptr<Route> ((Route*) 0);
+       return boost::shared_ptr<Route> ((Route*) 0);
+}
+
+boost::shared_ptr<Track>
+Session::track_by_diskstream_id (PBD::ID id)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*i);
+               if (t && t->using_diskstream_id (id)) {
+                       return t;
+               }
+       }
+
+       return boost::shared_ptr<Track> ();
 }
 
-shared_ptr<Route>
+boost::shared_ptr<Route>
 Session::route_by_remote_id (uint32_t id)
 {
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if ((*i)->remote_control_id() == id) {
@@ -2496,67 +2724,90 @@ Session::route_by_remote_id (uint32_t id)
                }
        }
 
-       return shared_ptr<Route> ((Route*) 0);
+       return boost::shared_ptr<Route> ((Route*) 0);
 }
 
-/** If either end of the session range location marker lies inside the current
- *  session extent, move it to the corresponding session extent.
+void
+Session::playlist_region_added (boost::weak_ptr<Region> w)
+{
+       boost::shared_ptr<Region> r = w.lock ();
+       if (!r) {
+               return;
+       }
+
+       /* These are the operations that are currently in progress... */
+       list<GQuark> curr = _current_trans_quarks;
+       curr.sort ();
+
+       /* ...and these are the operations during which we want to update
+          the session range location markers.
+       */
+       list<GQuark> ops;
+       ops.push_back (Operations::capture);
+       ops.push_back (Operations::paste);
+       ops.push_back (Operations::duplicate_region);
+       ops.push_back (Operations::insert_file);
+       ops.push_back (Operations::insert_region);
+       ops.push_back (Operations::drag_region_brush);
+       ops.push_back (Operations::region_drag);
+       ops.push_back (Operations::selection_grab);
+       ops.push_back (Operations::region_fill);
+       ops.push_back (Operations::fill_selection);
+       ops.push_back (Operations::create_region);
+       ops.push_back (Operations::region_copy);
+       ops.push_back (Operations::fixed_time_region_copy);
+       ops.sort ();
+
+       /* See if any of the current operations match the ones that we want */
+       list<GQuark> in;
+       set_intersection (_current_trans_quarks.begin(), _current_trans_quarks.end(), ops.begin(), ops.end(), back_inserter (in));
+
+       /* If so, update the session range markers */
+       if (!in.empty ()) {
+               maybe_update_session_range (r->position (), r->last_frame ());
+       }
+}
+
+/** Update the session range markers if a is before the current start or
+ *  b is after the current end.
  */
 void
-Session::update_session_range_location_marker ()
+Session::maybe_update_session_range (framepos_t a, framepos_t b)
 {
        if (_state_of_the_state & Loading) {
                return;
        }
 
-       pair<framepos_t, framepos_t> const ext = get_extent ();
-
        if (_session_range_location == 0) {
-               /* we don't have a session range yet; use this one (provided it is valid) */
-               if (ext.first != max_framepos) {
-                       add_session_range_location (ext.first, ext.second);
-               }
+
+               add_session_range_location (a, b);
+
        } else {
-               /* update the existing session range */
-               if (ext.first < _session_range_location->start()) {
-                       _session_range_location->set_start (ext.first);
-                       set_dirty ();
+
+               if (a < _session_range_location->start()) {
+                       _session_range_location->set_start (a);
                }
-               
-               if (ext.second > _session_range_location->end()) {
-                       _session_range_location->set_end (ext.second);
-                       set_dirty ();
+
+               if (b > _session_range_location->end()) {
+                       _session_range_location->set_end (b);
                }
-               
        }
 }
 
-/** @return Extent of the session's contents; if the session is empty, the first value of
- *  the pair will equal max_framepos.
- */
-pair<framepos_t, framepos_t>
-Session::get_extent () const
+void
+Session::playlist_ranges_moved (list<Evoral::RangeMove<framepos_t> > const & ranges)
 {
-       pair<framepos_t, framepos_t> ext (max_framepos, 0);
-       
-       boost::shared_ptr<RouteList> rl = routes.reader ();
-       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-               if (!tr || tr->destructive()) {
-                       // ignore tape tracks when getting extents
-                       continue;
-               }
-
-               pair<framepos_t, framepos_t> e = tr->playlist()->get_extent ();
-               if (e.first < ext.first) {
-                       ext.first = e.first;
-               }
-               if (e.second > ext.second) {
-                       ext.second = e.second;
-               }
+       for (list<Evoral::RangeMove<framepos_t> >::const_iterator i = ranges.begin(); i != ranges.end(); ++i) {
+               maybe_update_session_range (i->to, i->to + i->length);
        }
+}
 
-       return ext;
+void
+Session::playlist_regions_extended (list<Evoral::Range<framepos_t> > const & ranges)
+{
+       for (list<Evoral::Range<framepos_t> >::const_iterator i = ranges.begin(); i != ranges.end(); ++i) {
+               maybe_update_session_range (i->from, i->to);
+       }
 }
 
 /* Region management */
@@ -2564,7 +2815,7 @@ Session::get_extent () const
 boost::shared_ptr<Region>
 Session::find_whole_file_parent (boost::shared_ptr<Region const> child) const
 {
-        const RegionFactory::RegionMap& regions (RegionFactory::regions());
+       const RegionFactory::RegionMap& regions (RegionFactory::regions());
        RegionFactory::RegionMap::const_iterator i;
        boost::shared_ptr<Region> region;
 
@@ -2588,48 +2839,42 @@ Session::find_whole_file_parent (boost::shared_ptr<Region const> child) const
 int
 Session::destroy_sources (list<boost::shared_ptr<Source> > srcs)
 {
-        set<boost::shared_ptr<Region> > relevant_regions;
+       set<boost::shared_ptr<Region> > relevant_regions;
 
        for (list<boost::shared_ptr<Source> >::iterator s = srcs.begin(); s != srcs.end(); ++s) {
-                RegionFactory::get_regions_using_source (*s, relevant_regions);
+               RegionFactory::get_regions_using_source (*s, relevant_regions);
        }
 
-        cerr << "There are " << relevant_regions.size() << " using " << srcs.size() << " sources" << endl;
-
-        for (set<boost::shared_ptr<Region> >::iterator r = relevant_regions.begin(); r != relevant_regions.end(); ) {
-                set<boost::shared_ptr<Region> >::iterator tmp;
-
-                tmp = r;
-                ++tmp;
-
-                cerr << "Cleanup " << (*r)->name() << " UC = " << (*r).use_count() << endl;
+       for (set<boost::shared_ptr<Region> >::iterator r = relevant_regions.begin(); r != relevant_regions.end(); ) {
+               set<boost::shared_ptr<Region> >::iterator tmp;
 
-                playlists->destroy_region (*r);
-                RegionFactory::map_remove (*r);
+               tmp = r;
+               ++tmp;
 
-                (*r)->drop_sources ();
-                (*r)->drop_references ();
+               playlists->destroy_region (*r);
+               RegionFactory::map_remove (*r);
 
-                cerr << "\tdone UC = " << (*r).use_count() << endl;
+               (*r)->drop_sources ();
+               (*r)->drop_references ();
 
-                relevant_regions.erase (r);
+               relevant_regions.erase (r);
 
-                r = tmp;
-        }
+               r = tmp;
+       }
 
        for (list<boost::shared_ptr<Source> >::iterator s = srcs.begin(); s != srcs.end(); ) {
-                
-                {
-                        Glib::Mutex::Lock ls (source_lock);
-                        /* remove from the main source list */
-                        sources.erase ((*s)->id());
-                }
 
-                (*s)->mark_for_remove ();
-                (*s)->drop_references ();
+               {
+                       Glib::Mutex::Lock ls (source_lock);
+                       /* remove from the main source list */
+                       sources.erase ((*s)->id());
+               }
 
-                s = srcs.erase (s);
-        }
+               (*s)->mark_for_remove ();
+               (*s)->drop_references ();
+
+               s = srcs.erase (s);
+       }
 
        return 0;
 }
@@ -2645,7 +2890,7 @@ Session::remove_last_capture ()
                if (!tr) {
                        continue;
                }
-               
+
                list<boost::shared_ptr<Source> >& l = tr->last_capture_sources();
 
                if (!l.empty()) {
@@ -2679,23 +2924,29 @@ Session::add_source (boost::shared_ptr<Source> source)
 
        if (result.second) {
 
-                /* yay, new source */
+               /* yay, new source */
 
                set_dirty();
 
-                boost::shared_ptr<AudioFileSource> afs;
-                
-                if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(source)) != 0) {
-                        if (Config->get_auto_analyse_audio()) {
-                                Analyser::queue_source_for_analysis (source, false);
-                        }
-                }
-        }
+               boost::shared_ptr<AudioFileSource> afs;
+
+               if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(source)) != 0) {
+                       if (Config->get_auto_analyse_audio()) {
+                               Analyser::queue_source_for_analysis (source, false);
+                       }
+               }
+
+               source->DropReferences.connect_same_thread (*this, boost::bind (&Session::remove_source, this, boost::weak_ptr<Source> (source)));
+       }
 }
 
 void
 Session::remove_source (boost::weak_ptr<Source> src)
 {
+       if (_state_of_the_state & Deletion) {
+               return;
+       }
+
        SourceMap::iterator i;
        boost::shared_ptr<Source> source = src.lock();
 
@@ -2707,7 +2958,6 @@ Session::remove_source (boost::weak_ptr<Source> src)
                Glib::Mutex::Lock lm (source_lock);
 
                if ((i = sources.find (source->id())) != sources.end()) {
-                        cerr << "Removing source " << source->name() << endl;
                        sources.erase (i);
                }
        }
@@ -2755,16 +3005,16 @@ Session::source_by_path_and_channel (const string& path, uint16_t chn)
 uint32_t
 Session::count_sources_by_origin (const string& path)
 {
-        uint32_t cnt = 0;
+       uint32_t cnt = 0;
        Glib::Mutex::Lock lm (source_lock);
 
        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
                boost::shared_ptr<FileSource> fs
                        = boost::dynamic_pointer_cast<FileSource>(i->second);
 
-                if (fs && fs->origin() == path) {
-                        ++cnt;
-                }
+               if (fs && fs->origin() == path) {
+                       ++cnt;
+               }
        }
 
        return cnt;
@@ -2794,7 +3044,7 @@ Session::change_source_path_by_name (string path, string oldname, string newname
                string::size_type dash;
 
                dir = Glib::path_get_dirname (path);
-                path = Glib::path_get_basename (path);
+               path = Glib::path_get_basename (path);
 
                /* '-' is not a legal character for the NAME part of the path */
 
@@ -2808,8 +3058,7 @@ Session::change_source_path_by_name (string path, string oldname, string newname
                path += '-';
                path += new_legalized;
                path += native_header_format_extension (config.get_native_file_header_format(), DataType::AUDIO);
-
-                path = Glib::build_filename (dir, path);
+               path = Glib::build_filename (dir, path);
 
        } else {
 
@@ -2826,7 +3075,7 @@ Session::change_source_path_by_name (string path, string oldname, string newname
                string::size_type postfix;
 
                dir = Glib::path_get_dirname (path);
-                path = Glib::path_get_basename (path);
+               path = Glib::path_get_basename (path);
 
                /* '-' is not a legal character for the NAME part of the path */
 
@@ -2858,8 +3107,8 @@ Session::change_source_path_by_name (string path, string oldname, string newname
 
                        snprintf (buf, sizeof(buf), "%s-%u%s", newname.c_str(), cnt, suffix.c_str());
 
-                        if (!matching_unsuffixed_filename_exists_in (dir, buf)) {
-                                path = Glib::build_filename (dir, buf);
+                       if (!matching_unsuffixed_filename_exists_in (dir, buf)) {
+                               path = Glib::build_filename (dir, buf);
                                break;
                        }
 
@@ -2868,8 +3117,8 @@ Session::change_source_path_by_name (string path, string oldname, string newname
 
                if (path.empty()) {
                        fatal << string_compose (_("FATAL ERROR! Could not find a suitable version of %1 for a rename"),
-                                                 newname) << endl;
-                        /*NOTREACHED*/
+                                                newname) << endl;
+                       /*NOTREACHED*/
                }
        }
 
@@ -2881,7 +3130,7 @@ Session::change_source_path_by_name (string path, string oldname, string newname
  *         (e.g. as returned by new_*_source_name)
  */
 string
-Session::new_source_path_from_name (DataType type, const string& name, bool as_stub)
+Session::new_source_path_from_name (DataType type, const string& name)
 {
        assert(name.find("/") == string::npos);
 
@@ -2889,9 +3138,9 @@ Session::new_source_path_from_name (DataType type, const string& name, bool as_s
 
        sys::path p;
        if (type == DataType::AUDIO) {
-               p = (as_stub ? sdir.sound_stub_path() : sdir.sound_path());
+               p = sdir.sound_path();
        } else if (type == DataType::MIDI) {
-               p = (as_stub ? sdir.midi_stub_path() : sdir.midi_path());
+               p = sdir.midi_path();
        } else {
                error << "Unknown source type, unable to create file path" << endmsg;
                return "";
@@ -2917,7 +3166,7 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
        char buf[PATH_MAX+1];
        const uint32_t limit = 10000;
        string legalized;
-        string ext = native_header_format_extension (config.get_native_file_header_format(), DataType::AUDIO);
+       string ext = native_header_format_extension (config.get_native_file_header_format(), DataType::AUDIO);
 
        buf[0] = '\0';
        legalized = legalize_for_path (base);
@@ -2934,21 +3183,21 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
 
                                if (nchan < 2) {
                                        snprintf (buf, sizeof(buf), "T%04d-%s%s",
-                                                  cnt, legalized.c_str(), ext.c_str());
+                                                 cnt, legalized.c_str(), ext.c_str());
                                } else if (nchan == 2) {
                                        if (chan == 0) {
                                                snprintf (buf, sizeof(buf), "T%04d-%s%%L%s",
-                                                          cnt, legalized.c_str(), ext.c_str());
+                                                         cnt, legalized.c_str(), ext.c_str());
                                        } else {
                                                snprintf (buf, sizeof(buf), "T%04d-%s%%R%s",
-                                                          cnt, legalized.c_str(), ext.c_str());
+                                                         cnt, legalized.c_str(), ext.c_str());
                                        }
                                } else if (nchan < 26) {
                                        snprintf (buf, sizeof(buf), "T%04d-%s%%%c%s",
-                                                  cnt, legalized.c_str(), 'a' + chan, ext.c_str());
+                                                 cnt, legalized.c_str(), 'a' + chan, ext.c_str());
                                } else {
                                        snprintf (buf, sizeof(buf), "T%04d-%s%s",
-                                                  cnt, legalized.c_str(), ext.c_str());
+                                                 cnt, legalized.c_str(), ext.c_str());
                                }
 
                        } else {
@@ -2971,19 +3220,17 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
                        SessionDirectory sdir((*i).path);
 
                        string spath = sdir.sound_path().to_string();
-                       string spath_stubs = sdir.sound_stub_path().to_string();
 
-                        /* note that we search *without* the extension so that
-                           we don't end up both "Audio 1-1.wav" and "Audio 1-1.caf" 
-                           in the event that this new name is required for
-                           a file format change.
-                        */
+                       /* note that we search *without* the extension so that
+                          we don't end up both "Audio 1-1.wav" and "Audio 1-1.caf"
+                          in the event that this new name is required for
+                          a file format change.
+                       */
 
-                        if (matching_unsuffixed_filename_exists_in (spath, buf) ||
-                            matching_unsuffixed_filename_exists_in (spath_stubs, buf)) {
-                                existing++;
-                                break;
-                        }
+                       if (matching_unsuffixed_filename_exists_in (spath, buf)) {
+                               existing++;
+                               break;
+                       }
                }
 
                if (existing == 0) {
@@ -2998,16 +3245,16 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
                        throw failed_constructor();
                }
        }
-        
+
        return Glib::path_get_basename (buf);
 }
 
 /** Create a new within-session audio source */
 boost::shared_ptr<AudioFileSource>
-Session::create_audio_source_for_session (size_t n_chans, string const & n, uint32_t chan, bool destructive, bool as_stub)
+Session::create_audio_source_for_session (size_t n_chans, string const & n, uint32_t chan, bool destructive)
 {
        const string name    = new_audio_source_name (n, n_chans, chan, destructive);
-       const string path    = new_source_path_from_name(DataType::AUDIO, name, as_stub);
+       const string path    = new_source_path_from_name(DataType::AUDIO, name);
 
        return boost::dynamic_pointer_cast<AudioFileSource> (
                SourceFactory::createWritable (DataType::AUDIO, *this, path, string(), destructive, frame_rate()));
@@ -3064,30 +3311,30 @@ Session::new_midi_source_name (const string& base)
 
 /** Create a new within-session MIDI source */
 boost::shared_ptr<MidiSource>
-Session::create_midi_source_for_session (Track* track, string const & n, bool as_stub)
+Session::create_midi_source_for_session (Track* track, string const & n)
 {
-        /* try to use the existing write source for the track, to keep numbering sane 
-         */
+       /* try to use the existing write source for the track, to keep numbering sane
+        */
 
-        if (track) {
-                /*MidiTrack* mt = dynamic_cast<Track*> (track);
-                assert (mt);
-                */
+       if (track) {
+               /*MidiTrack* mt = dynamic_cast<Track*> (track);
+                 assert (mt);
+               */
 
-                list<boost::shared_ptr<Source> > l = track->steal_write_sources ();
-                
-                if (!l.empty()) {
-                        assert (boost::dynamic_pointer_cast<MidiSource> (l.front()));
-                        return boost::dynamic_pointer_cast<MidiSource> (l.front());
-                }
-        }
+               list<boost::shared_ptr<Source> > l = track->steal_write_sources ();
+
+               if (!l.empty()) {
+                       assert (boost::dynamic_pointer_cast<MidiSource> (l.front()));
+                       return boost::dynamic_pointer_cast<MidiSource> (l.front());
+               }
+       }
 
        const string name = new_midi_source_name (n);
-       const string path = new_source_path_from_name (DataType::MIDI, name, as_stub);
+       const string path = new_source_path_from_name (DataType::MIDI, name);
 
        return boost::dynamic_pointer_cast<SMFSource> (
-                       SourceFactory::createWritable (
-                                DataType::MIDI, *this, path, string(), false, frame_rate()));
+               SourceFactory::createWritable (
+                       DataType::MIDI, *this, path, string(), false, frame_rate()));
 }
 
 
@@ -3173,12 +3420,12 @@ Session::cancel_audition ()
 bool
 Session::RoutePublicOrderSorter::operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b)
 {
-        if (a->is_monitor()) { 
-                return true;
-        }
-        if (b->is_monitor()) {
-                return false;
-        }
+       if (a->is_monitor()) {
+               return true;
+       }
+       if (b->is_monitor()) {
+               return false;
+       }
        return a->order_key(N_("signal")) < b->order_key(N_("signal"));
 }
 
@@ -3256,12 +3503,12 @@ Session::available_capture_duration ()
        if (_total_free_4k_blocks * scale > (double) max_framecnt) {
                return max_framecnt;
        }
-        
+
        return (framecnt_t) floor (_total_free_4k_blocks * scale);
 }
 
 void
-Session::add_bundle (shared_ptr<Bundle> bundle)
+Session::add_bundle (boost::shared_ptr<Bundle> bundle)
 {
        {
                RCUWriter<BundleList> writer (_bundles);
@@ -3275,7 +3522,7 @@ Session::add_bundle (shared_ptr<Bundle> bundle)
 }
 
 void
-Session::remove_bundle (shared_ptr<Bundle> bundle)
+Session::remove_bundle (boost::shared_ptr<Bundle> bundle)
 {
        bool removed = false;
 
@@ -3297,7 +3544,7 @@ Session::remove_bundle (shared_ptr<Bundle> bundle)
        set_dirty();
 }
 
-shared_ptr<Bundle>
+boost::shared_ptr<Bundle>
 Session::bundle_by_name (string name) const
 {
        boost::shared_ptr<BundleList> b = _bundles.reader ();
@@ -3319,7 +3566,7 @@ Session::tempo_map_changed (const PropertyChange&)
        playlists->update_after_tempo_map_change ();
 
        _locations->apply (*this, &Session::update_locations_after_tempo_map_change);
-       
+
        set_dirty ();
 }
 
@@ -3337,7 +3584,7 @@ Session::update_locations_after_tempo_map_change (Locations::LocationList& loc)
 void
 Session::ensure_buffers (ChanCount howmany)
 {
-        BufferManager::ensure_buffers (howmany);
+       BufferManager::ensure_buffers (howmany);
 }
 
 void
@@ -3388,6 +3635,26 @@ Session::next_send_id ()
        }
 }
 
+uint32_t
+Session::next_aux_send_id ()
+{
+       /* this doesn't really loop forever. just think about it */
+
+       while (true) {
+               for (boost::dynamic_bitset<uint32_t>::size_type n = 0; n < aux_send_bitset.size(); ++n) {
+                       if (!aux_send_bitset[n]) {
+                               aux_send_bitset[n] = true;
+                               return n;
+
+                       }
+               }
+
+               /* none available, so resize and try again */
+
+               aux_send_bitset.resize (aux_send_bitset.size() + 16, false);
+       }
+}
+
 uint32_t
 Session::next_return_id ()
 {
@@ -3420,6 +3687,18 @@ Session::mark_send_id (uint32_t id)
        send_bitset[id] = true;
 }
 
+void
+Session::mark_aux_send_id (uint32_t id)
+{
+       if (id >= aux_send_bitset.size()) {
+               aux_send_bitset.resize (id+16, false);
+       }
+       if (aux_send_bitset[id]) {
+               warning << string_compose (_("aux send ID %1 appears to be in use already"), id) << endmsg;
+       }
+       aux_send_bitset[id] = true;
+}
+
 void
 Session::mark_return_id (uint32_t id)
 {
@@ -3448,24 +3727,32 @@ void
 Session::unmark_send_id (uint32_t id)
 {
        if (id < send_bitset.size()) {
-                send_bitset[id] = false;
-        }
+               send_bitset[id] = false;
+       }
+}
+
+void
+Session::unmark_aux_send_id (uint32_t id)
+{
+       if (id < aux_send_bitset.size()) {
+               aux_send_bitset[id] = false;
+       }
 }
 
 void
 Session::unmark_return_id (uint32_t id)
 {
        if (id < return_bitset.size()) {
-                return_bitset[id] = false;
-        }
+               return_bitset[id] = false;
+       }
 }
 
 void
 Session::unmark_insert_id (uint32_t id)
 {
        if (id < insert_bitset.size()) {
-                insert_bitset[id] = false;
-        }
+               insert_bitset[id] = false;
+       }
 }
 
 
@@ -3525,12 +3812,12 @@ Session::reset_native_file_format ()
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                if (tr) {
-                        /* don't save state as we do this, there's no point
-                         */
+                       /* don't save state as we do this, there's no point
+                        */
 
-                        _state_of_the_state = StateOfTheState (_state_of_the_state|InCleanup);
+                       _state_of_the_state = StateOfTheState (_state_of_the_state|InCleanup);
                        tr->reset_write_sources (false);
-                        _state_of_the_state = StateOfTheState (_state_of_the_state & ~InCleanup);
+                       _state_of_the_state = StateOfTheState (_state_of_the_state & ~InCleanup);
                }
        }
 }
@@ -3538,7 +3825,7 @@ Session::reset_native_file_format ()
 bool
 Session::route_name_unique (string n) const
 {
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
                if ((*i)->name() == n) {
@@ -3566,7 +3853,7 @@ Session::route_name_internal (string n) const
 int
 Session::freeze_all (InterThreadInfo& itt)
 {
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
@@ -3593,7 +3880,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
        boost::shared_ptr<AudioFileSource> fsource;
        uint32_t x;
        char buf[PATH_MAX+1];
-       ChanCount nchans(track.n_channels());
+       ChanCount diskstream_channels (track.n_channels());
        framepos_t position;
        framecnt_t this_chunk;
        framepos_t to_do;
@@ -3601,8 +3888,9 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
        SessionDirectory sdir(get_best_session_directory_for_new_source ());
        const string sound_dir = sdir.sound_path().to_string();
        framepos_t len = end - start;
-        bool need_block_size_reset = false;
-        string ext;
+       bool need_block_size_reset = false;
+       string ext;
+       ChanCount const max_proc = track.max_processor_streams ();
 
        if (end <= start) {
                error << string_compose (_("Cannot write a range where end <= start (e.g. %1 <= %2)"),
@@ -3628,13 +3916,13 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
                goto out;
        }
 
-        ext = native_header_format_extension (config.get_native_file_header_format(), DataType::AUDIO);
+       ext = native_header_format_extension (config.get_native_file_header_format(), DataType::AUDIO);
 
-       for (uint32_t chan_n=0; chan_n < nchans.n_audio(); ++chan_n) {
+       for (uint32_t chan_n = 0; chan_n < diskstream_channels.n_audio(); ++chan_n) {
 
                for (x = 0; x < 99999; ++x) {
                        snprintf (buf, sizeof(buf), "%s/%s-%d-bounce-%" PRIu32 "%s", sound_dir.c_str(), playlist->name().c_str(), chan_n, x+1, ext.c_str());
-                       if (access (buf, F_OK) != 0) {
+                       if (!Glib::file_test (buf, Glib::FILE_TEST_EXISTS)) {
                                break;
                        }
                }
@@ -3657,10 +3945,10 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
                srcs.push_back (fsource);
        }
 
-        /* tell redirects that care that we are about to use a much larger blocksize */
-        
-        need_block_size_reset = true;
-        track.set_block_size (chunk_size);
+       /* tell redirects that care that we are about to use a much larger blocksize */
+
+       need_block_size_reset = true;
+       track.set_block_size (chunk_size);
 
        /* XXX need to flush all redirects */
 
@@ -3668,10 +3956,10 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
        to_do = len;
 
        /* create a set of reasonably-sized buffers */
-       buffers.ensure_buffers(DataType::AUDIO, nchans.n_audio(), chunk_size);
-       buffers.set_count(nchans);
+       buffers.ensure_buffers (DataType::AUDIO, max_proc.n_audio(), chunk_size);
+       buffers.set_count (max_proc);
 
-       for (vector<boost::shared_ptr<Source> >::iterator src=srcs.begin(); src != srcs.end(); ++src) {
+       for (vector<boost::shared_ptr<Source> >::iterator src = srcs.begin(); src != srcs.end(); ++src) {
                boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(*src);
                if (afs)
                        afs->prepare_for_peakfile_writes ();
@@ -3722,13 +4010,13 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
                /* construct a region to represent the bounced material */
 
                PropertyList plist;
-               
+
                plist.add (Properties::start, 0);
                plist.add (Properties::length, srcs.front()->length(srcs.front()->timeline_position()));
                plist.add (Properties::name, region_name_from_path (srcs.front()->name(), true));
-               
+
                result = RegionFactory::create (srcs, plist);
-                          
+
        }
 
   out:
@@ -3753,10 +4041,10 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
        }
 
 
-        if (need_block_size_reset) {
-                track.set_block_size (get_block_size());
-        }
-        
+       if (need_block_size_reset) {
+               track.set_block_size (get_block_size());
+       }
+
        unblock_processing ();
 
        return result;
@@ -3765,65 +4053,38 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
 gain_t*
 Session::gain_automation_buffer() const
 {
-        return ProcessThread::gain_automation_buffer ();
+       return ProcessThread::gain_automation_buffer ();
 }
 
 pan_t**
 Session::pan_automation_buffer() const
 {
-        return ProcessThread::pan_automation_buffer ();
+       return ProcessThread::pan_automation_buffer ();
 }
 
 BufferSet&
 Session::get_silent_buffers (ChanCount count)
 {
-        return ProcessThread::get_silent_buffers (count);
-#if 0
-       assert(_silent_buffers->available() >= count);
-       _silent_buffers->set_count(count);
-
-       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-               for (size_t i= 0; i < count.get(*t); ++i) {
-                       _silent_buffers->get(*t, i).clear();
-               }
-       }
-
-       return *_silent_buffers;
-#endif
+       return ProcessThread::get_silent_buffers (count);
 }
 
 BufferSet&
 Session::get_scratch_buffers (ChanCount count)
 {
-        return ProcessThread::get_scratch_buffers (count);
-#if 0
-       if (count != ChanCount::ZERO) {
-               assert(_scratch_buffers->available() >= count);
-               _scratch_buffers->set_count(count);
-       } else {
-               _scratch_buffers->set_count (_scratch_buffers->available());
-       }
-
-       return *_scratch_buffers;
-#endif
+       return ProcessThread::get_scratch_buffers (count);
 }
 
 BufferSet&
 Session::get_mix_buffers (ChanCount count)
 {
-        return ProcessThread::get_mix_buffers (count);
-#if 0
-       assert(_mix_buffers->available() >= count);
-       _mix_buffers->set_count(count);
-       return *_mix_buffers;
-#endif
+       return ProcessThread::get_mix_buffers (count);
 }
 
 uint32_t
 Session::ntracks () const
 {
        uint32_t n = 0;
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
                if (boost::dynamic_pointer_cast<Track> (*i)) {
@@ -3838,7 +4099,7 @@ uint32_t
 Session::nbusses () const
 {
        uint32_t n = 0;
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
                if (boost::dynamic_pointer_cast<Track>(*i) == 0) {
@@ -3899,7 +4160,7 @@ Session::update_have_rec_enabled_track ()
                if (tr && tr->record_enabled ()) {
                        break;
                }
-               
+
                ++i;
        }
 
@@ -3915,22 +4176,10 @@ Session::update_have_rec_enabled_track ()
 void
 Session::listen_position_changed ()
 {
-       Placement p;
-
-       switch (Config->get_listen_position()) {
-       case AfterFaderListen:
-               p = PostFader;
-               break;
-
-       case PreFaderListen:
-               p = PreFader;
-               break;
-       }
-
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               (*i)->put_monitor_send_at (p);
+               (*i)->listen_position_changed ();
        }
 }
 
@@ -3939,25 +4188,39 @@ Session::solo_control_mode_changed ()
 {
        /* cancel all solo or all listen when solo control mode changes */
 
-        if (soloing()) {
-                set_solo (get_routes(), false);
-        } else if (listening()) {
-                set_listen (get_routes(), false);
-        }
+       if (soloing()) {
+               set_solo (get_routes(), false);
+       } else if (listening()) {
+               set_listen (get_routes(), false);
+       }
+}
+
+/** Called when a property of one of our route groups changes */
+void
+Session::route_group_property_changed (RouteGroup* rg)
+{
+       RouteGroupPropertyChanged (rg); /* EMIT SIGNAL */
 }
 
-/** Called when anything about any of our route groups changes (membership, state etc.) */
+/** Called when a route is added to one of our route groups */
 void
-Session::route_group_changed ()
+Session::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
 {
-       RouteGroupChanged (); /* EMIT SIGNAL */
+       RouteAddedToRouteGroup (rg, r);
+}
+
+/** Called when a route is removed from one of our route groups */
+void
+Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
+{
+       RouteRemovedFromRouteGroup (rg, r);
 }
 
 vector<SyncSource>
 Session::get_available_sync_options () const
 {
        vector<SyncSource> ret;
-       
+
        ret.push_back (JACK);
        ret.push_back (MTC);
        ret.push_back (MIDIClock);
@@ -3968,20 +4231,20 @@ Session::get_available_sync_options () const
 boost::shared_ptr<RouteList>
 Session::get_routes_with_regions_at (framepos_t const p) const
 {
-       shared_ptr<RouteList> r = routes.reader ();
-       shared_ptr<RouteList> rl (new RouteList);
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> rl (new RouteList);
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
                if (!tr) {
                        continue;
                }
-               
+
                boost::shared_ptr<Playlist> pl = tr->playlist ();
                if (!pl) {
                        continue;
                }
-               
+
                if (pl->has_region_at (p)) {
                        rl->push_back (*i);
                }
@@ -4023,7 +4286,7 @@ Session::current_end_frame () const
 }
 
 void
-Session::add_session_range_location (nframes_t start, nframes_t end)
+Session::add_session_range_location (framepos_t start, framepos_t end)
 {
        _session_range_location = new Location (*this, start, end, _("session"), Location::IsSessionRange);
        _locations->add (_session_range_location);
@@ -4039,37 +4302,41 @@ Session::route_order_key_changed ()
 void
 Session::step_edit_status_change (bool yn)
 {
-        bool send = false;
+       bool send = false;
 
-        bool val = false;
-        if (yn) {
-                send = (_step_editors == 0);
-                val = true;
+       bool val = false;
+       if (yn) {
+               send = (_step_editors == 0);
+               val = true;
 
-                _step_editors++;
-        } else {
-                send = (_step_editors == 1);
-                val = false;
+               _step_editors++;
+       } else {
+               send = (_step_editors == 1);
+               val = false;
 
-                if (_step_editors > 0) {
-                        _step_editors--;
-                }
-        }
+               if (_step_editors > 0) {
+                       _step_editors--;
+               }
+       }
 
-        if (send) {
-                StepEditStatusChange (val);
-        }
+       if (send) {
+               StepEditStatusChange (val);
+       }
 }
 
-        
+
 void
 Session::start_time_changed (framepos_t old)
 {
        /* Update the auto loop range to match the session range
           (unless the auto loop range has been changed by the user)
        */
-       
+
        Location* s = _locations->session_range_location ();
+       if (s == 0) {
+               return;
+       }
+
        Location* l = _locations->auto_loop_location ();
 
        if (l->start() == old) {
@@ -4085,9 +4352,13 @@ Session::end_time_changed (framepos_t old)
        */
 
        Location* s = _locations->session_range_location ();
+       if (s == 0) {
+               return;
+       }
+
        Location* l = _locations->auto_loop_location ();
 
-       if (l->end() == old) {
+       if (l && l->end() == old) {
                l->set_end (s->end(), true);
        }
 }
@@ -4095,105 +4366,349 @@ Session::end_time_changed (framepos_t old)
 string
 Session::source_search_path (DataType type) const
 {
-        string search_path;
+       vector<string> s;
 
        if (session_dirs.size() == 1) {
-                switch (type) {
-                case DataType::AUDIO:
-                        search_path = _session_dir->sound_path().to_string();
-                        break;
-                case DataType::MIDI:
-                        search_path = _session_dir->midi_path().to_string();
-                        break;
-                }
+               switch (type) {
+               case DataType::AUDIO:
+                       s.push_back ( _session_dir->sound_path().to_string());
+                       break;
+               case DataType::MIDI:
+                       s.push_back (_session_dir->midi_path().to_string());
+                       break;
+               }
        } else {
-                for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
-                        SessionDirectory sdir (i->path);
-                        if (!search_path.empty()) {
-                                search_path += ':';
-                        } 
-                        switch (type) {
-                        case DataType::AUDIO:
-                                search_path += sdir.sound_path().to_string();
-                                break;
-                        case DataType::MIDI:
-                                search_path += sdir.midi_path().to_string();
-                                break;
-                        }
-                }
-        }
-                
-        /* now add user-specified locations
-         */
-
-        vector<string> dirs;
-
-        switch (type) {
-        case DataType::AUDIO:
-                split (config.get_audio_search_path (), dirs, ':');
-                break;
-        case DataType::MIDI:
-                split (config.get_midi_search_path (), dirs, ':');
-                break;
-        }
+               for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
+                       SessionDirectory sdir (i->path);
+                       switch (type) {
+                       case DataType::AUDIO:
+                               s.push_back (sdir.sound_path().to_string());
+                               break;
+                       case DataType::MIDI:
+                               s.push_back (sdir.midi_path().to_string());
+                               break;
+                       }
+               }
+       }
 
-        for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-                        search_path += ':';
-                        search_path += *i;
-                        
-        }
-        
-        return search_path;
+       /* now check the explicit (possibly user-specified) search path
+        */
+
+       vector<string> dirs;
+
+       switch (type) {
+       case DataType::AUDIO:
+               split (config.get_audio_search_path (), dirs, ':');
+               break;
+       case DataType::MIDI:
+               split (config.get_midi_search_path (), dirs, ':');
+               break;
+       }
+
+       for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
+
+               vector<string>::iterator si;
+
+               for (si = s.begin(); si != s.end(); ++si) {
+                       if ((*si) == *i) {
+                               break;
+                       }
+               }
+
+               if (si == s.end()) {
+                       s.push_back (*i);
+               }
+       }
+       
+       string search_path;
+
+       for (vector<string>::iterator si = s.begin(); si != s.end(); ++si) {
+               if (!search_path.empty()) {
+                       search_path += ':';
+               }
+               search_path += *si;
+       }
+
+       return search_path;
 }
 
 void
 Session::ensure_search_path_includes (const string& path, DataType type)
 {
-        string search_path;
-        vector<string> dirs;
+       string search_path;
+       vector<string> dirs;
 
-        if (path == ".") {
-                return;
-        }
+       if (path == ".") {
+               return;
+       }
 
-        switch (type) {
-        case DataType::AUDIO:
-                search_path = config.get_audio_search_path ();
-                break;
-        case DataType::MIDI:
-                search_path = config.get_midi_search_path ();
-                break;
-        }
+       switch (type) {
+       case DataType::AUDIO:
+               search_path = config.get_audio_search_path ();
+               break;
+       case DataType::MIDI:
+               search_path = config.get_midi_search_path ();
+               break;
+       }
+       
+       split (search_path, dirs, ':');
 
-        split (search_path, dirs, ':');
+       for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
+               if (*i == path) {
+                       return;
+               }
+       }
 
-        for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-                if (*i == path) {
-                        return;
-                }
-        }
+       if (!search_path.empty()) {
+               search_path += ':';
+       }
 
-        if (!search_path.empty()) {
-                search_path += ':';
-        }
+       search_path += path;
+
+       switch (type) {
+       case DataType::AUDIO:
+               config.set_audio_search_path (search_path);
+               break;
+       case DataType::MIDI:
+               config.set_midi_search_path (search_path);
+               break;
+       }
+}
+
+boost::shared_ptr<Speakers>
+Session::get_speakers()
+{
+       return _speakers;
+}
+
+list<string>
+Session::unknown_processors () const
+{
+       list<string> p;
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               list<string> t = (*i)->unknown_processors ();
+               copy (t.begin(), t.end(), back_inserter (p));
+       }
+
+       p.sort ();
+       p.unique ();
+
+       return p;
+}
+
+void
+Session::update_latency (bool playback)
+{
+       DEBUG_TRACE (DEBUG::Latency, string_compose ("JACK latency callback: %1\n", (playback ? "PLAYBACK" : "CAPTURE")));
 
-        search_path += path;
-        
-        switch (type) {
-        case DataType::AUDIO:
-                config.set_audio_search_path (search_path);
-                break;
-        case DataType::MIDI:
-                config.set_midi_search_path (search_path);
-                break;
+       if (_state_of_the_state & (InitialConnecting|Deletion)) {
+               return;
+       }
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+       framecnt_t max_latency = 0;
+
+       if (playback) {
+               /* reverse the list so that we work backwards from the last route to run to the first */
+                RouteList* rl = routes.reader().get();
+                r.reset (new RouteList (*rl));
+               reverse (r->begin(), r->end());
+       }
+
+       /* compute actual latency values for the given direction and store them all in per-port
+          structures. this will also publish the same values (to JACK) so that computation of latency
+          for routes can consistently use public latency values.
+       */
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               max_latency = max (max_latency, (*i)->set_private_port_latencies (playback));
+       }
+
+        /* because we latency compensate playback, our published playback latencies should
+           be the same for all output ports - all material played back by ardour has
+           the same latency, whether its caused by plugins or by latency compensation. since
+           these may differ from the values computed above, reset all playback port latencies
+           to the same value.
+        */
+
+        DEBUG_TRACE (DEBUG::Latency, string_compose ("Set public port latencies to %1\n", max_latency));
+
+        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                (*i)->set_public_port_latencies (max_latency, playback);
         }
+
+       if (playback) {
+
+               post_playback_latency ();
+
+       } else {
+
+               post_capture_latency ();
+       }
+
+       DEBUG_TRACE (DEBUG::Latency, "JACK latency callback: DONE\n");
 }
 
-VBAPSpeakers&
-Session::get_speakers() 
+void
+Session::post_playback_latency ()
 {
-        if (!_speakers) {
-                _speakers = new VBAPSpeakers;
+       set_worst_playback_latency ();
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (!(*i)->is_hidden() && ((*i)->active())) {
+                       _worst_track_latency = max (_worst_track_latency, (*i)->update_signal_latency ());
+               }
+       }
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               (*i)->set_latency_compensation (_worst_track_latency);
+       }
+}
+
+void
+Session::post_capture_latency ()
+{
+       set_worst_capture_latency ();
+
+       /* reflect any changes in capture latencies into capture offsets
+        */
+
+       boost::shared_ptr<RouteList> rl = routes.reader();
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (tr) {
+                       tr->set_capture_offset ();
+               }
+       }
+}
+
+void
+Session::initialize_latencies ()
+{
+        {
+                Glib::Mutex::Lock lm (_engine.process_lock());
+                update_latency (false);
+                update_latency (true);
         }
-        return *_speakers;
+
+        set_worst_io_latencies ();
+}
+
+void
+Session::set_worst_io_latencies ()
+{
+       set_worst_playback_latency ();
+       set_worst_capture_latency ();
+}
+
+void
+Session::set_worst_playback_latency ()
+{
+       if (_state_of_the_state & (InitialConnecting|Deletion)) {
+               return;
+       }
+
+       _worst_output_latency = 0;
+
+       if (!_engine.connected()) {
+               return;
+       }
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               _worst_output_latency = max (_worst_output_latency, (*i)->output()->latency());
+       }
+
+       DEBUG_TRACE (DEBUG::Latency, string_compose ("Worst output latency: %1\n", _worst_output_latency));
+}
+
+void
+Session::set_worst_capture_latency ()
+{
+       if (_state_of_the_state & (InitialConnecting|Deletion)) {
+               return;
+       }
+
+       _worst_input_latency = 0;
+
+       if (!_engine.connected()) {
+               return;
+       }
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               _worst_input_latency = max (_worst_input_latency, (*i)->input()->latency());
+       }
+
+        DEBUG_TRACE (DEBUG::Latency, string_compose ("Worst input latency: %1\n", _worst_input_latency));
+}
+
+void
+Session::update_latency_compensation (bool force_whole_graph)
+{
+       bool some_track_latency_changed = false;
+
+       if (_state_of_the_state & (InitialConnecting|Deletion)) {
+               return;
+       }
+
+       DEBUG_TRACE(DEBUG::Latency, "---------------------------- update latency compensation\n\n");
+
+       _worst_track_latency = 0;
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if (!(*i)->is_hidden() && ((*i)->active())) {
+                       framecnt_t tl;
+                       if ((*i)->signal_latency () != (tl = (*i)->update_signal_latency ())) {
+                               some_track_latency_changed = true;
+                       }
+                       _worst_track_latency = max (tl, _worst_track_latency);
+               }
+       }
+
+       DEBUG_TRACE (DEBUG::Latency, string_compose ("worst signal processing latency: %1 (changed ? %2)\n", _worst_track_latency,
+                                                    (some_track_latency_changed ? "yes" : "no")));
+
+       DEBUG_TRACE(DEBUG::Latency, "---------------------------- DONE update latency compensation\n\n");
+       
+       if (some_track_latency_changed || force_whole_graph)  {
+               _engine.update_latencies ();
+       }
+
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (!tr) {
+                       continue;
+               }
+               tr->set_capture_offset ();
+       }
+}
+
+char
+Session::session_name_is_legal (const string& path)
+{
+       char illegal_chars[] = { '/', '\\', ':', ';', '\0' };
+
+       for (int i = 0; illegal_chars[i]; ++i) {
+               if (path.find (illegal_chars[i]) != string::npos) {
+                       return illegal_chars[i];
+               }
+       }
+
+       return 0;
+}
+
+uint32_t 
+Session::next_control_id () const
+{
+       return ntracks() + nbusses() + 1;
 }