lots of stuff related to capture alignment. things appear to be working now, but...
[ardour.git] / libs / ardour / session.cc
index cda93d050f46c4e48d8d485993433ccf9e1baf56..759495351a8fbc9cf40743b574b5ee29f86b3584 100644 (file)
@@ -44,6 +44,7 @@
 #include "pbd/stacktrace.h"
 #include "pbd/file_utils.h"
 #include "pbd/convert.h"
+#include "pbd/strsplit.h"
 
 #include "ardour/amp.h"
 #include "ardour/analyser.h"
@@ -98,6 +99,8 @@
 #include "ardour/tempo.h"
 #include "ardour/utils.h"
 #include "ardour/graph.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::Signal0<void> Session::StartTimeChanged;
-PBD::Signal0<void> Session::EndTimeChanged;
+PBD::Signal1<void, framepos_t> Session::StartTimeChanged;
+PBD::Signal1<void, framepos_t> Session::EndTimeChanged;
 PBD::Signal0<void> Session::AutoBindingOn;
 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;
 
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
 const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event);
@@ -134,35 +136,35 @@ Session::Session (AudioEngine &eng,
                  const string& snapshot_name,
                   BusProfile* bus_profile,
                  string mix_template)
-
-       : _engine (eng)
-        , _target_transport_speed (0.0)
-        , _requested_return_frame (-1)
-        , _session_dir (new SessionDirectory(fullpath))
-        , state_tree (0)
+        : _engine (eng)
+       , _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"))
+       , route_graph (new Graph(*this))
+       , 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);
                
        playlists.reset (new SessionPlaylists);
 
-        _all_route_group->set_active (true, this);
+       _all_route_group->set_active (true, this);
 
        interpolation.add_channel_to (0, 0);
 
@@ -175,14 +177,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 ();
@@ -202,6 +204,9 @@ Session::Session (AudioEngine &eng,
                DirtyChanged (); /* EMIT SIGNAL */
        }
 
+       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;
 }
 
@@ -233,10 +238,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;
@@ -296,8 +297,6 @@ 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()));
@@ -317,16 +316,22 @@ Session::destroy ()
        /* not strictly necessary, but doing it here allows the shared_ptr debugging to work */
        playlists.reset ();
 
-       boost_debug_list_ptrs ();
-
        delete _locations;
 
        DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
+
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+       boost_debug_list_ptrs ();
+#endif
 }
 
 void
 Session::set_worst_io_latencies ()
 {
+        if (_state_of_the_state & InitialConnecting) {
+                return;
+        }
+
        _worst_output_latency = 0;
        _worst_input_latency = 0;
 
@@ -340,6 +345,9 @@ Session::set_worst_io_latencies ()
                _worst_output_latency = max (_worst_output_latency, (*i)->output()->latency());
                _worst_input_latency = max (_worst_input_latency, (*i)->input()->latency());
        }
+        
+        DEBUG_TRACE (DEBUG::Latency, string_compose ("Worst output latency: %1 Worst input latency: %2\n",
+                                                     _worst_output_latency, _worst_input_latency));
 }
 
 void
@@ -428,8 +436,6 @@ Session::when_engine_running ()
 
        BootMessage (_("Compute I/O Latencies"));
 
-       set_worst_io_latencies ();
-
        if (_clicking) {
                // XXX HOW TO ALERT UI TO THIS ? DO WE NEED TO?
        }
@@ -457,7 +463,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]);
 
@@ -470,7 +476,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);
@@ -486,7 +492,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]);
 
@@ -500,7 +506,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);
@@ -516,7 +522,7 @@ Session::when_engine_running ()
                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);
@@ -528,7 +534,7 @@ Session::when_engine_running ()
                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);
@@ -540,6 +546,8 @@ Session::when_engine_running ()
 
        if (_is_new && !no_auto_connect()) {
 
+                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
+                
                 /* don't connect the master bus outputs if there is a monitor bus */
 
                if (_master_out && Config->get_auto_connect_standard_busses() && !_monitor_out) {
@@ -641,7 +649,7 @@ Session::when_engine_running ()
                }
        }
 
-       /* catch up on send+insert cnts */
+       set_worst_io_latencies ();
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
@@ -650,6 +658,7 @@ Session::when_engine_running ()
        BootMessage (_("Connect to engine"));
 
        _engine.set_session (this);
+        _engine.update_total_latencies ();
 }
 
 void
@@ -661,7 +670,6 @@ Session::hookup_io ()
 
        _state_of_the_state = StateOfTheState (_state_of_the_state | InitialConnecting);
 
-
        if (!auditioner) {
 
                /* we delay creating the auditioner till now because
@@ -669,13 +677,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) {
@@ -704,26 +711,24 @@ Session::hookup_io ()
            they connect to the control out specifically.
          */
 
-        if (_monitor_out) {
+       if (_monitor_out) {
                boost::shared_ptr<RouteList> r = routes.reader ();
-                for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
+               for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
                         
-                        if ((*x)->is_monitor()) {
-                                
-                                /* relax */
+                       if ((*x)->is_monitor()) {
                                 
-                        } else if ((*x)->is_master()) {
+                               /* relax */
                                 
-                                /* relax */
+                       } else if ((*x)->is_master()) {
                                 
-                        } else {
+                               /* relax */
                                 
-                                (*x)->listen_via (_monitor_out,
-                                                  (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
-                                                  false, false);
-                        }
-                }
-        }
+                       } else {
+
+                               (*x)->listen_via_monitor ();
+                       }
+               }
+       }
 
        /* Anyone who cares about input state, wake up and do something */
 
@@ -746,12 +751,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)
 {
@@ -763,10 +762,10 @@ Session::track_playlist_changed (boost::weak_ptr<Track> wp)
        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
@@ -783,30 +782,26 @@ Session::record_enabling_legal () const
        return true;
 }
 
+void
+Session::set_track_monitor_input_status (bool yn)
+{
+        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->monitor_input (yn);
+                }
+        }
+}
+
 void
 Session::reset_input_monitor_state ()
 {
        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());
-                       }
-               }
-               
+                set_track_monitor_input_status (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);
-                       }
-               }
+                set_track_monitor_input_status (Config->get_monitoring_model() == HardwareMonitoring);
        }
 }
 
@@ -824,7 +819,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);
 }
@@ -832,7 +827,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;
@@ -1004,33 +999,26 @@ Session::handle_locations_changed (Locations::LocationList& locations)
 void
 Session::enable_record ()
 {
-        while (1) {
-                RecordState rs = (RecordState) g_atomic_int_get (&_record_status);
+       while (1) {
+               RecordState rs = (RecordState) g_atomic_int_get (&_record_status);
                 
-                if (rs == Recording) {
-                        break;
-                }
+               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);
-                                        }
-                                }
-                        }
+                       if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
+                                set_track_monitor_input_status (true);
+                       }
                         
-                        RecordStateChanged ();
-                        break;
-                }
-        }
+                       RecordStateChanged ();
+                       break;
+               }
+       }
 }
 
 void
@@ -1050,14 +1038,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 */
@@ -1074,14 +1055,7 @@ 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);
                }
        }
 }
@@ -1089,18 +1063,20 @@ Session::step_back_from_record ()
 void
 Session::maybe_enable_record ()
 {
-        if (_step_editors > 0) {
-                return;
-        }
+       if (_step_editors > 0) {
+               return;
+       }
 
        g_atomic_int_set (&_record_status, Enabled);
 
-       /* this function is currently called from somewhere other than an RT thread.
-          this save_state() call therefore doesn't impact anything.
+       /* This function is currently called from somewhere other than an RT thread.
+          This save_state() call therefore doesn't impact anything.  Doing it here
+          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 ();
@@ -1118,7 +1094,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
@@ -1193,9 +1169,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
@@ -1206,7 +1182,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 ();
 
@@ -1219,7 +1195,7 @@ 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
@@ -1250,48 +1226,14 @@ 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 ()) {
@@ -1303,16 +1245,22 @@ struct RouteSorter {
                                    return true;
                            }
                    } else {
-                           return r1->order_key(N_("signal")) < r2->order_key(N_("signal"));
+                           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;
@@ -1321,7 +1269,7 @@ 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.
@@ -1372,7 +1320,7 @@ Session::resort_routes ()
 
        {
                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 */
        }
@@ -1380,24 +1328,24 @@ Session::resort_routes ()
        //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()));
+       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());
+               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));
-                        }
-                }
-        }
+               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
 
 }
 void
-Session::resort_routes_using (shared_ptr<RouteList> r)
+Session::resort_routes_using (boost::shared_ptr<RouteList> r)
 {
        RouteList::iterator i, j;
 
@@ -1417,7 +1365,7 @@ Session::resort_routes_using (shared_ptr<RouteList> r)
                                continue;
                        }
 
-                        bool via_sends_only;
+                       bool via_sends_only;
 
                        if ((*j)->direct_feeds (*i, &via_sends_only)) {
                                (*i)->add_fed_by (*j, via_sends_only);
@@ -1435,29 +1383,38 @@ Session::resort_routes_using (shared_ptr<RouteList> r)
        route_graph->rechain (r);
 
 #ifndef NDEBUG
-        DEBUG_TRACE (DEBUG::Graph, "Routes resorted, order follows:\n");
+       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")));
+                                                          (*i)->name(), (*i)->order_key ("signal")));
        }
 #endif
 
 }
 
-/** 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;
@@ -1476,7 +1433,7 @@ Session::count_existing_route_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();
@@ -1485,8 +1442,11 @@ Session::count_existing_route_channels (ChanCount& in, ChanCount& out)
        }
 }
 
+/** 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;
@@ -1501,36 +1461,39 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
 
        control_id = ntracks() + nbusses();
 
+       bool const use_number = (how_many != 1);
+       
        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;
+                boost::shared_ptr<MidiTrack> track;
                 
                try {
-                       MidiTrack* mt = new MidiTrack (*this, track_name, Route::Flag (0), mode);
-
-                        if (mt->init ()) {
-                                delete mt;
-                                goto failed;
-                        }
+                       track.reset (new MidiTrack (*this, track_name, Route::Flag (0), mode));
 
-                        mt->use_new_diskstream();
-
-                       boost_debug_shared_ptr_mark_interesting (mt, "Track");
-                       track = boost::shared_ptr<MidiTrack>(mt);
-
-                       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;
+                               }
+
+                               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;
+                               }
                        }
 
                        auto_connect_route (track.get(), existing_inputs, existing_outputs);
@@ -1571,7 +1534,8 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
        return ret;
 }
 
-/** @param connect_inputs true to connect inputs as well as outputs, false to connect just outputs.
+/** Caller must hold process lock.
+ *  @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.
  */
@@ -1650,8 +1614,13 @@ Session::auto_connect_route (
        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;
@@ -1666,44 +1635,49 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
 
        control_id = ntracks() + nbusses() + 1;
 
+       bool const use_number = (how_many != 1);
+       
        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;
-                        }
+                       track.reset (new AudioTrack (*this, track_name, Route::Flag (0), mode));
 
-                        at->use_new_diskstream();
-
-                       boost_debug_shared_ptr_mark_interesting (at, "Track");
-                       track = boost::shared_ptr<AudioTrack>(at);
-
-                       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;
+                               }
+
+                               auto_connect_route (track.get(), existing_inputs, existing_outputs);
+                       }
 
                        if (route_group) {
                                route_group->add (track);
@@ -1747,7 +1721,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) {
@@ -1768,9 +1742,11 @@ 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;
@@ -1784,49 +1760,51 @@ Session::new_audio_route (bool aux, int input_channels, int output_channels, Rou
 
        control_id = ntracks() + nbusses() + 1;
 
+       bool const use_number = (how_many != 1);
        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::shared_ptr<Route> bus (new Route (*this, bus_name, Route::Flag(0), DataType::AUDIO));
 
-                       boost_debug_shared_ptr_mark_interesting (rt, "Route");
-                       shared_ptr<Route> bus (rt);
-
-                       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;
+                               }
 
-                       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);
                        }
 
-                       auto_connect_route (bus.get(), existing_inputs, existing_outputs, false);
-
                        if (route_group) {
                                route_group->add (bus);
                        }
                        bus->set_remote_control_id (control_id);
                        ++control_id;
 
-                       if (aux) {
-                               bus->add_internal_return ();
-                       }
+                       bus->add_internal_return ();
 
                        ret.push_back (bus);
                }
@@ -1879,7 +1857,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                std::string node_name = IO::name_from_state (*node_copy.children().front());
 
                /* 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))) {
+               if (!find_route_name (node_name.c_str(), ++number, name, sizeof(name), true)) {
                        fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
                        /*NOTREACHED*/
                }
@@ -1895,7 +1873,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                Track::zero_diskstream_id_in_xml (node_copy);
 
                try {
-                       shared_ptr<Route> route (XMLRouteFactory (node_copy, 3000));
+                        boost::shared_ptr<Route> route (XMLRouteFactory (node_copy, 3000));
 
                        if (route == 0) {
                                error << _("Session: cannot create track/bus from template description") << endmsg;
@@ -1907,6 +1885,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);
@@ -1946,7 +1927,7 @@ Session::add_routes (RouteList& new_routes, bool save)
 {
        {
                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());
 
 
@@ -1988,10 +1969,10 @@ 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));
+                       }
                }
        }
 
@@ -1999,14 +1980,12 @@ Session::add_routes (RouteList& new_routes, bool save)
 
                for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
                        if ((*x)->is_monitor()) {
-                                /* relax */
-                        } else if ((*x)->is_master()) {
-                                /* relax */
+                               /* relax */
+                       } else if ((*x)->is_master()) {
+                               /* relax */
                        } else {
-                                (*x)->listen_via (_monitor_out,
-                                                  (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader),
-                                                  false, false);
-                        }
+                               (*x)->listen_via_monitor ();
+                       }
                }
 
                resort_routes ();
@@ -2028,13 +2007,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);
                }
        }
 }
@@ -2045,13 +2020,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);
                }
        }
 }
@@ -2062,27 +2033,22 @@ 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)) {
+               if (include_buses || boost::dynamic_pointer_cast<Track>(*i)) {
                        t->push_back (*i);
                }
        }
@@ -2107,24 +2073,24 @@ Session::add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::
                        continue;
                }
 
-               (*i)->listen_via (dest, p, true, true);
+               (*i)->listen_via (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) || (route == _monitor_out)) && !Config->get_allow_special_bus_removal()) {
+               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);
 
@@ -2134,7 +2100,7 @@ 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) {
@@ -2151,8 +2117,7 @@ Session::remove_route (shared_ptr<Route> route)
                /* 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
 
@@ -2171,22 +2136,22 @@ Session::remove_route (shared_ptr<Route> route)
                }
        }       
 
-        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);
        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 ();
+       route_graph->clear_other_chain ();
 
        /* get rid of it from the dead wood collection in the route list manager */
 
@@ -2224,18 +2189,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++;
 
@@ -2243,6 +2208,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)
@@ -2258,29 +2225,29 @@ Session::route_solo_isolated_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
         bool send_changed = false;
 
         if (route->solo_isolated()) {
-                if (_solo_isolated_cnt == 0) {
-                        send_changed = true;
-                }
-                _solo_isolated_cnt++;
+               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;
-                }
+               _solo_isolated_cnt--;
+               if (_solo_isolated_cnt == 0) {
+                       send_changed = true;
+               }
         }
 
         if (send_changed) {
-                IsolatedChanged (); /* EMIT SIGNAL */
+               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;
-        }
+       if (!self_solo_change) {
+               // session doesn't care about changes to soloed-by-others
+               return;
+       }
 
        if (solo_update_disabled) {
                // We know already
@@ -2295,7 +2262,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
                return;
        }
         
-       shared_ptr<RouteList> r = routes.reader ();
+       boost::shared_ptr<RouteList> r = routes.reader ();
        int32_t delta;
 
        if (route->self_soloed()) {
@@ -2304,59 +2271,59 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
                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);
-                }
-        }
+       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);
+               }
+       }
 
        solo_update_disabled = true;
         
-        RouteList uninvolved;
+       RouteList uninvolved;
         
        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()) {
                        continue;
                } 
 
-                in_signal_flow = false;
+               in_signal_flow = false;
 
-                if ((*i)->feeds (route, &via_sends_only)) {
+               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);
+                               }
+                               in_signal_flow = true;
                        }
                } 
                 
-                if (route->feeds (*i, &via_sends_only)) {
-                        (*i)->mod_solo_by_others_upstream (delta);
-                        in_signal_flow = true;
-                }
+               if (route->feeds (*i, &via_sends_only)) {
+                       (*i)->mod_solo_by_others_upstream (delta);
+                       in_signal_flow = true;
+               }
 
-                if (!in_signal_flow) {
-                        uninvolved.push_back (*i);
-                }
+               if (!in_signal_flow) {
+                       uninvolved.push_back (*i);
+               }
        }
 
        solo_update_disabled = false;
        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) {
+               (*i)->mute_changed (this);
+       }
 
        SoloChanged (); /* EMIT SIGNAL */
        set_dirty();
@@ -2368,8 +2335,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();
@@ -2380,36 +2347,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> 
 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) {
@@ -2423,25 +2390,25 @@ Session::get_routes_with_internal_returns() const
 bool
 Session::io_name_is_legal (const std::string& name)
 {
-        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)->name() == name) {
-                        return false;
-                }
+       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;
-                }
-        }
+               if ((*i)->has_io_processor_named (name)) {
+                       return false;
+               }
+       }
         
-        return true;
+       return true;
 }
 
-shared_ptr<Route>
+boost::shared_ptr<Route>
 Session::route_by_name (string name)
 {
-       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)->name() == name) {
@@ -2449,13 +2416,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) {
@@ -2463,13 +2430,13 @@ Session::route_by_id (PBD::ID id)
                }
        }
 
-       return shared_ptr<Route> ((Route*) 0);
+       return boost::shared_ptr<Route> ((Route*) 0);
 }
 
-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) {
@@ -2477,67 +2444,88 @@ 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.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 (ext.second > _session_range_location->end()) {
-                       _session_range_location->set_end (ext.second);
-                       set_dirty ();
+               if (a < _session_range_location->start()) {
+                       _session_range_location->set_start (a);
                }
                
+               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<nframes_t, nframes_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 */
@@ -2545,7 +2533,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;
 
@@ -2569,48 +2557,48 @@ 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;
+       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;
+       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;
+               tmp = r;
+               ++tmp;
 
-                cerr << "Cleanup " << (*r)->name() << " UC = " << (*r).use_count() << endl;
+               cerr << "Cleanup " << (*r)->name() << " UC = " << (*r).use_count() << endl;
 
-                playlists->destroy_region (*r);
-                RegionFactory::map_remove (*r);
+               playlists->destroy_region (*r);
+               RegionFactory::map_remove (*r);
 
-                (*r)->drop_sources ();
-                (*r)->drop_references ();
+               (*r)->drop_sources ();
+               (*r)->drop_references ();
 
-                cerr << "\tdone UC = " << (*r).use_count() << endl;
+               cerr << "\tdone UC = " << (*r).use_count() << endl;
 
-                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());
-                }
+               {
+                       Glib::Mutex::Lock ls (source_lock);
+                       /* remove from the main source list */
+                       sources.erase ((*s)->id());
+               }
 
-                (*s)->mark_for_remove ();
-                (*s)->drop_references ();
+               (*s)->mark_for_remove ();
+               (*s)->drop_references ();
 
-                s = srcs.erase (s);
-        }
+               s = srcs.erase (s);
+       }
 
        return 0;
 }
@@ -2660,23 +2648,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;
+               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);
-                        }
-                }
+               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();
 
@@ -2688,7 +2682,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);
                }
        }
@@ -2733,6 +2726,24 @@ Session::source_by_path_and_channel (const string& path, uint16_t chn)
        return boost::shared_ptr<Source>();
 }
 
+uint32_t
+Session::count_sources_by_origin (const string& path)
+{
+       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;
+               }
+       }
+
+       return cnt;
+}
+
 
 string
 Session::change_source_path_by_name (string path, string oldname, string newname, bool destructive)
@@ -2757,7 +2768,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 */
 
@@ -2771,8 +2782,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 {
 
@@ -2789,7 +2799,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 */
 
@@ -2821,8 +2831,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;
                        }
 
@@ -2831,8 +2841,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*/
                }
        }
 
@@ -2844,7 +2854,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);
 
@@ -2852,9 +2862,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 "";
@@ -2868,7 +2878,7 @@ string
 Session::peak_path (string base) const
 {
        sys::path peakfile_path(_session_dir->peak_path());
-       peakfile_path /= basename_nosuffix (base) + peakfile_suffix;
+       peakfile_path /= base + peakfile_suffix;
        return peakfile_path.to_string();
 }
 
@@ -2880,7 +2890,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);
@@ -2897,21 +2907,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 {
@@ -2934,19 +2944,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) {
@@ -2967,13 +2975,13 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
 
 /** 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, destructive, frame_rate()));
+               SourceFactory::createWritable (DataType::AUDIO, *this, path, string(), destructive, frame_rate()));
 }
 
 /** Return a unique name based on \a base for a new internal MIDI source */
@@ -3027,30 +3035,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 ();
+               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());
-                }
-        }
+               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, false, frame_rate()));
+               SourceFactory::createWritable (
+                       DataType::MIDI, *this, path, string(), false, frame_rate()));
 }
 
 
@@ -3136,12 +3144,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"));
 }
 
@@ -3224,7 +3232,7 @@ Session::available_capture_duration ()
 }
 
 void
-Session::add_bundle (shared_ptr<Bundle> bundle)
+Session::add_bundle (boost::shared_ptr<Bundle> bundle)
 {
        {
                RCUWriter<BundleList> writer (_bundles);
@@ -3238,7 +3246,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;
 
@@ -3260,7 +3268,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 ();
@@ -3300,7 +3308,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
@@ -3411,24 +3419,24 @@ void
 Session::unmark_send_id (uint32_t id)
 {
        if (id < send_bitset.size()) {
-                send_bitset[id] = false;
-        }
+               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;
+       }
 }
 
 
@@ -3488,12 +3496,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);
                }
        }
 }
@@ -3501,7 +3509,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) {
@@ -3529,7 +3537,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) {
 
@@ -3556,7 +3564,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;
@@ -3564,8 +3572,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)"),
@@ -3591,9 +3600,9 @@ 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());
@@ -3609,7 +3618,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
 
                try {
                        fsource = boost::dynamic_pointer_cast<AudioFileSource> (
-                               SourceFactory::createWritable (DataType::AUDIO, *this, buf, false, frame_rate()));
+                               SourceFactory::createWritable (DataType::AUDIO, *this, buf, string(), false, frame_rate()));
                }
 
                catch (failed_constructor& err) {
@@ -3620,10 +3629,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 */
+       /* 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);
+       need_block_size_reset = true;
+       track.set_block_size (chunk_size);
 
        /* XXX need to flush all redirects */
 
@@ -3631,10 +3640,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 ();
@@ -3716,9 +3725,9 @@ 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 ();
 
@@ -3728,65 +3737,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)) {
@@ -3801,7 +3783,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) {
@@ -3878,22 +3860,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 ();
        }
 }
 
@@ -3902,11 +3872,11 @@ 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 anything about any of our route groups changes (membership, state etc.) */
@@ -3931,8 +3901,8 @@ 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);
@@ -3986,7 +3956,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);
@@ -4002,26 +3972,204 @@ 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) {
+               l->set_start (s->start(), true);
+       }
+}
+
+void
+Session::end_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->end() == old) {
+               l->set_end (s->end(), true);
+       }
+}
+
+string
+Session::source_search_path (DataType type) const
+{
+       string search_path;
+
+       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;
+               }
+       } 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<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
+               search_path += ':';
+               search_path += *i;
+                        
+       }
+        
+       return search_path;
 }
 
+void
+Session::ensure_search_path_includes (const string& path, DataType type)
+{
+       string search_path;
+       vector<string> dirs;
+
+       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;
+       }
+
+       split (search_path, dirs, ':');
+
+       for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
+               if (*i == path) {
+                       return;
+               }
+       }
+
+       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;
+}
+
+#ifdef HAVE_JACK_NEW_LATENCY
+void
+Session::update_latency (bool playback)
+{
+        DEBUG_TRACE (DEBUG::Latency, "JACK latency callback\n");
+
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+        if (playback) {
+                /* reverse the list so that we work backwards from the last route to run to the first */
+                reverse (r->begin(), r->end());
+        }
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                DEBUG_TRACE (DEBUG::Latency, string_compose ("------------- Working on latency for %1\n", (*i)->name()));
+                (*i)->set_latency_ranges (playback);
+                DEBUG_TRACE (DEBUG::Latency, string_compose ("------------- Done working on latency for %1\n\n", (*i)->name()));
+        }
+}
+#endif