Clarify ensure vs. request for JACK monitoring, naming-wise.
[ardour.git] / libs / ardour / session.cc
index c0ae7e876c8d3e8c9ad1f105b59b3e2c8d9a0e56..9a4b4f65ed722f7d591425d3da7401eb2bcb4d46 100644 (file)
@@ -86,6 +86,7 @@
 #include "ardour/recent_sessions.h"
 #include "ardour/region_factory.h"
 #include "ardour/return.h"
+#include "ardour/route_graph.h"
 #include "ardour/route_group.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
@@ -128,10 +129,13 @@ PBD::Signal0<void> Session::AutoBindingOff;
 PBD::Signal2<void,std::string, std::string> Session::Exported;
 PBD::Signal1<int,boost::shared_ptr<Playlist> > Session::AskAboutPlaylistDeletion;
 PBD::Signal0<void> Session::Quit;
+PBD::Signal0<void> Session::FeedbackDetected;
+PBD::Signal0<void> Session::SuccessfulGraphSort;
 
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
 const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event);
 
+/** @param snapshot_name Snapshot name, without .ardour prefix */
 Session::Session (AudioEngine &eng,
                   const string& fullpath,
                   const string& snapshot_name,
@@ -147,7 +151,7 @@ Session::Session (AudioEngine &eng,
        , _post_transport_work (0)
        , _send_timecode_update (false)
        , _all_route_group (new RouteGroup (*this, "all"))
-       , route_graph (new Graph(*this))
+       , _process_graph (new Graph (*this))
        , routes (new RouteList)
        , _total_free_4k_blocks (0)
        , _bundles (new BundleList)
@@ -162,7 +166,7 @@ Session::Session (AudioEngine &eng,
        , _suspend_timecode_transmission (0)
 {
        _locations = new Locations (*this);
-               
+
        playlists.reset (new SessionPlaylists);
 
        _all_route_group->set_active (true, this);
@@ -262,7 +266,7 @@ Session::destroy ()
 
        routes.flush ();
        _bundles.flush ();
-       
+
        AudioDiskstream::free_working_buffers();
 
        /* tell everyone who is still standing that we're about to die */
@@ -300,7 +304,7 @@ Session::destroy ()
 
        DEBUG_TRACE (DEBUG::Destruction, "delete sources\n");
        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
-               DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for source %1 ; pre-ref = %2\n", i->second->path(), i->second.use_count()));
+               DEBUG_TRACE(DEBUG::Destruction, string_compose ("Dropping for source %1 ; pre-ref = %2\n", i->second->name(), i->second.use_count()));
                i->second->drop_references ();
        }
 
@@ -308,7 +312,7 @@ Session::destroy ()
 
        DEBUG_TRACE (DEBUG::Destruction, "delete route groups\n");
        for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
-               
+
                delete *i;
        }
 
@@ -346,7 +350,7 @@ Session::when_engine_running ()
 
        /* every time we reconnect, recompute worst case output latencies */
 
-       _engine.Running.connect_same_thread (*this, boost::bind (&Session::set_worst_io_latencies, this));
+       _engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this));
 
        if (synced_to_jack()) {
                _engine.transport_stop ();
@@ -373,13 +377,13 @@ Session::when_engine_running ()
                        } else {
                                c = _click_io->set_state (*child->children().front(), Stateful::loading_state_version);
                        }
-                                       
+
 
                        if (c == 0) {
                                _clicking = Config->get_clicking ();
-                               
+
                        } else {
-                               
+
                                error << _("could not setup Click I/O") << endmsg;
                                _clicking = false;
                        }
@@ -399,13 +403,13 @@ Session::when_engine_running ()
                                        }
                                }
                        }
-                       
+
                        if (_click_io->n_ports () > ChanCount::ZERO) {
                                _clicking = Config->get_clicking ();
                        }
                }
        }
-       
+
        catch (failed_constructor& err) {
                error << _("cannot setup Click I/O") << endmsg;
        }
@@ -497,13 +501,13 @@ Session::when_engine_running ()
        for (uint32_t np = 0; np < inputs[DataType::MIDI].size(); ++np) {
                string n = inputs[DataType::MIDI][np];
                boost::erase_first (n, X_("alsa_pcm:"));
-               
+
                boost::shared_ptr<Bundle> c (new Bundle (n, false));
                c->add_channel ("", DataType::MIDI);
                c->set_port (0, inputs[DataType::MIDI][np]);
                add_bundle (c);
        }
-               
+
        /* MIDI output bundles */
 
        for (uint32_t np = 0; np < outputs[DataType::MIDI].size(); ++np) {
@@ -534,7 +538,7 @@ 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) {
@@ -545,7 +549,7 @@ Session::when_engine_running ()
                        uint32_t limit = _master_out->n_outputs().n_total();
 
                        for (uint32_t n = 0; n < limit; ++n) {
-                               Port* p = _master_out->output()->nth (n);
+                               boost::shared_ptr<Port> p = _master_out->output()->nth (n);
                                string connect_to;
                                if (outputs[p->type()].size() > n) {
                                        connect_to = outputs[p->type()][n];
@@ -575,8 +579,8 @@ Session::when_engine_running ()
 
                        if (_master_out) {
                                for (uint32_t n = 0; n < limit; ++n) {
-                                       AudioPort* p = _monitor_out->input()->ports().nth_audio_port (n);
-                                       AudioPort* o = _master_out->output()->ports().nth_audio_port (n);
+                                       boost::shared_ptr<AudioPort> p = _monitor_out->input()->ports().nth_audio_port (n);
+                                       boost::shared_ptr<AudioPort> o = _master_out->output()->ports().nth_audio_port (n);
 
                                        if (o) {
                                                string connect_to = o->name();
@@ -613,15 +617,15 @@ Session::when_engine_running ()
                                        uint32_t limit = _monitor_out->n_outputs().get (DataType::AUDIO);
 
                                        if (mod != 0) {
-                                               
+
                                                for (uint32_t n = 0; n < limit; ++n) {
 
-                                                       Port* p = _monitor_out->output()->ports().port(DataType::AUDIO, n);
+                                                       boost::shared_ptr<Port> p = _monitor_out->output()->ports().port(DataType::AUDIO, n);
                                                        string connect_to;
                                                        if (outputs[DataType::AUDIO].size() > (n % mod)) {
                                                                connect_to = outputs[DataType::AUDIO][n % mod];
                                                        }
-                                                       
+
                                                        if (!connect_to.empty()) {
                                                                if (_monitor_out->output()->connect (p, connect_to, this)) {
                                                                        error << string_compose (
@@ -640,12 +644,14 @@ Session::when_engine_running ()
 
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
+        /* update latencies */
+
+        initialize_latencies ();
+
        /* hook us up to the engine */
 
        BootMessage (_("Connect to engine"));
        _engine.set_session (this);
-
-       update_latency_compensation (true);
 }
 
 void
@@ -700,15 +706,15 @@ Session::hookup_io ()
        if (_monitor_out) {
                boost::shared_ptr<RouteList> r = routes.reader ();
                for (RouteList::iterator x = r->begin(); x != r->end(); ++x) {
-                        
+
                        if ((*x)->is_monitor()) {
-                                
+
                                /* relax */
-                                
+
                        } else if ((*x)->is_master()) {
-                                
+
                                /* relax */
-                                
+
                        } else {
 
                                (*x)->listen_via_monitor ();
@@ -744,7 +750,7 @@ Session::track_playlist_changed (boost::weak_ptr<Track> wp)
        if (!track) {
                return;
        }
-       
+
        boost::shared_ptr<Playlist> playlist;
 
        if ((playlist = track->playlist()) != 0) {
@@ -776,7 +782,7 @@ Session::set_track_monitor_input_status (bool yn)
                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);
+                       tr->request_jack_monitors_input (yn);
                }
        }
 }
@@ -985,22 +991,27 @@ Session::handle_locations_changed (Locations::LocationList& locations)
 void
 Session::enable_record ()
 {
+       if (_transport_speed != 0.0 && _transport_speed != 1.0) {
+               /* no recording at anything except normal speed */
+               return;
+       }
+
        while (1) {
                RecordState rs = (RecordState) g_atomic_int_get (&_record_status);
-                
+
                if (rs == Recording) {
                        break;
                }
-
+               
                if (g_atomic_int_compare_and_exchange (&_record_status, rs, Recording)) {
-                        
+
                        _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()) {
                                set_track_monitor_input_status (true);
                        }
-                        
+
                        RecordStateChanged ();
                        break;
                }
@@ -1043,6 +1054,8 @@ Session::step_back_from_record ()
                if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
                        set_track_monitor_input_status (false);
                }
+
+               RecordStateChanged (); /* emit signal */
        }
 }
 
@@ -1060,9 +1073,9 @@ Session::maybe_enable_record ()
           means that we save pending state of which sources the next record will use,
           which gives us some chance of recovering from a crash during the record.
        */
-       
+
        save_state ("", true);
-       
+
        if (_transport_speed) {
                if (!config.get_punch_in()) {
                        enable_record ();
@@ -1188,7 +1201,7 @@ Session::set_block_size (pframes_t nframes)
           ::process(). It is therefore fine to do things that block
           here.
        */
-
+       
        {
                current_block_size = nframes;
 
@@ -1212,56 +1225,6 @@ Session::set_block_size (pframes_t nframes)
        }
 }
 
-struct RouteSorter {
-    /** @return true to run r1 before r2, otherwise false */
-    bool sort_by_rec_enabled (const boost::shared_ptr<Route>& r1, const boost::shared_ptr<Route>& r2) {
-            if (r1->record_enabled()) {
-                    if (r2->record_enabled()) {
-                            /* both rec-enabled, just use signal order */
-                            return r1->order_key(N_("signal")) < r2->order_key(N_("signal"));
-                    } else {
-                            /* r1 rec-enabled, r2 not rec-enabled, run r2 early */
-                            return false;
-                    }
-            } else {
-                    if (r2->record_enabled()) {
-                            /* r2 rec-enabled, r1 not rec-enabled, run r1 early */
-                            return true;
-                    } else {
-                            /* neither rec-enabled, use signal order */
-                            return r1->order_key(N_("signal")) < r2->order_key(N_("signal"));
-                    }
-            }
-    }
-            
-    bool operator() (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> r2) {
-           if (r2->feeds (r1)) {
-                   /* r1 fed by r2; run r2 early */
-                   return false;
-           } else if (r1->feeds (r2)) {
-                   /* r2 fed by r1; run r1 early */
-                   return true;
-           } else {
-                   if (r1->not_fed ()) {
-                           if (r2->not_fed ()) {
-                                   /* no ardour-based connections inbound to either route. */ 
-                                    return sort_by_rec_enabled (r1, r2);
-                           } else {
-                                   /* r2 has connections, r1 does not; run r1 early */
-                                   return true;
-                           }
-                   } else {
-                           if (r2->not_fed()) {
-                                   /* r1 has connections, r2 does not; run r2 early */
-                                   return false;
-                           } else {
-                                   /* both r1 and r2 have connections, but not to each other. just use signal order */
-                                   return r1->order_key(N_("signal")) < r2->order_key(N_("signal"));
-                           }
-                   }
-           }
-    }
-};
 
 static void
 trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)
@@ -1276,7 +1239,7 @@ trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)
        /* make a copy of the existing list of routes that feed r1 */
 
        Route::FedBy existing (r1->fed_by());
-                        
+
        /* for each route that feeds r1, recurse, marking it as feeding
           rbase as well.
        */
@@ -1286,7 +1249,7 @@ trace_terminal (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> rbase)
                        /* (*i) went away, ignore it */
                        continue;
                }
-               
+
                /* r2 is a route that feeds r1 which somehow feeds base. mark
                   base as being fed by r2
                */
@@ -1317,10 +1280,11 @@ void
 Session::resort_routes ()
 {
        /* don't do anything here with signals emitted
-          by Routes while we are being destroyed.
+          by Routes during initial setup or while we
+          are being destroyed.
        */
 
-       if (_state_of_the_state & Deletion) {
+       if (_state_of_the_state & (InitialConnecting | Deletion)) {
                return;
        }
 
@@ -1331,13 +1295,13 @@ Session::resort_routes ()
                /* writer goes out of scope and forces update */
        }
 
-       //route_graph->dump(1);
+       //_process_graph->dump(1);
 
 #ifndef NDEBUG
        boost::shared_ptr<RouteList> rl = routes.reader ();
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                DEBUG_TRACE (DEBUG::Graph, string_compose ("%1 fed by ...\n", (*i)->name()));
-                
+
                const Route::FedBy& fb ((*i)->fed_by());
 
                for (Route::FedBy::const_iterator f = fb.begin(); f != fb.end(); ++f) {
@@ -1350,52 +1314,98 @@ Session::resort_routes ()
 #endif
 
 }
+
+/** This is called whenever we need to rebuild the graph of how we will process
+ *  routes.
+ *  @param r List of routes, in any order.
+ */
+
 void
 Session::resort_routes_using (boost::shared_ptr<RouteList> r)
 {
-       RouteList::iterator i, j;
-
-       for (i = r->begin(); i != r->end(); ++i) {
+       /* We are going to build a directed graph of our routes;
+          this is where the edges of that graph are put.
+       */
+       
+       GraphEdges edges;
+
+       /* Go through all routes doing two things:
+        *
+        * 1. Collect the edges of the route graph.  Each of these edges
+        *    is a pair of routes, one of which directly feeds the other
+        *    either by a JACK connection or by an internal send.
+        *
+        * 2. Begin the process of making routes aware of which other
+        *    routes directly or indirectly feed them.  This information
+        *    is used by the solo code.
+        */
+          
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 
+               /* Clear out the route's list of direct or indirect feeds */
                (*i)->clear_fed_by ();
 
-               for (j = r->begin(); j != r->end(); ++j) {
-
-                       /* although routes can feed themselves, it will
-                          cause an endless recursive descent if we
-                          detect it. so don't bother checking for
-                          self-feeding.
-                       */
-
-                       if (*j == *i) {
-                               continue;
-                       }
+               for (RouteList::iterator j = r->begin(); j != r->end(); ++j) {
 
                        bool via_sends_only;
 
-                       if ((*j)->direct_feeds (*i, &via_sends_only)) {
+                       /* See if this *j feeds *i according to the current state of the JACK
+                          connections and internal sends.
+                       */
+                       if ((*j)->direct_feeds_according_to_reality (*i, &via_sends_only)) {
+                               /* add the edge to the graph (part #1) */
+                               edges.add (*j, *i, via_sends_only);
+                               /* tell the route (for part #2) */
                                (*i)->add_fed_by (*j, via_sends_only);
                        }
                }
        }
 
-       for (i = r->begin(); i != r->end(); ++i) {
-               trace_terminal (*i, *i);
-       }
+       /* Attempt a topological sort of the route graph */
+       boost::shared_ptr<RouteList> sorted_routes = topological_sort (r, edges);
+       
+       if (sorted_routes) {
+               /* We got a satisfactory topological sort, so there is no feedback;
+                  use this new graph.
 
-       RouteSorter cmp;
-       r->sort (cmp);
+                  Note: the process graph rechain does not require a
+                  topologically-sorted list, but hey ho.
+               */
+               _process_graph->rechain (sorted_routes, edges);
+               _current_route_graph = edges;
 
-       route_graph->rechain (r);
+               /* Complete the building of the routes' lists of what directly
+                  or indirectly feeds them.
+               */
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       trace_terminal (*i, *i);
+               }
+
+               r = sorted_routes;
 
 #ifndef NDEBUG
-       DEBUG_TRACE (DEBUG::Graph, "Routes resorted, order follows:\n");
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 signal order %2\n", 
-                                                          (*i)->name(), (*i)->order_key ("signal")));
-       }
+               DEBUG_TRACE (DEBUG::Graph, "Routes resorted, order follows:\n");
+               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+                       DEBUG_TRACE (DEBUG::Graph, string_compose ("\t%1 signal order %2\n",
+                                                                  (*i)->name(), (*i)->order_key ("signal")));
+               }
 #endif
 
+               SuccessfulGraphSort (); /* EMIT SIGNAL */
+
+       } else {
+               /* The topological sort failed, so we have a problem.  Tell everyone
+                  and stick to the old graph; this will continue to be processed, so
+                  until the feedback is fixed, what is played back will not quite
+                  reflect what is actually connected.  Note also that we do not
+                  do trace_terminal here, as it would fail due to an endless recursion,
+                  so the solo code will think that everything is still connected
+                  as it was before.
+               */
+               
+               FeedbackDetected (); /* EMIT SIGNAL */
+       }
+
 }
 
 /** Find a route name starting with \a base, maybe followed by the
@@ -1418,7 +1428,7 @@ Session::find_route_name (string const & base, uint32_t& id, char* name, size_t
                snprintf (name, name_len, "%s", base.c_str());
                return true;
        }
-               
+
        do {
                snprintf (name, name_len, "%s %" PRIu32, base.c_str(), id);
 
@@ -1452,7 +1462,7 @@ Session::count_existing_track_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".
+ *  @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, string name_template)
@@ -1466,16 +1476,16 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
 
        control_id = ntracks() + nbusses();
 
-       bool const use_number = (how_many != 1);
-       
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("MIDI");
+
        while (how_many) {
-               if (!find_route_name (name_template.empty() ? _("Midi") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
+               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;
                }
 
                boost::shared_ptr<MidiTrack> track;
-                
+
                try {
                        track.reset (new MidiTrack (*this, track_name, Route::Flag (0), mode));
 
@@ -1486,7 +1496,7 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
                        track->use_new_diskstream();
 
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-                       boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+                       // boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
 #endif
                        {
                                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
@@ -1551,16 +1561,16 @@ Session::midi_output_change_handler (IOChange change, void * /*src*/, boost::wea
                         return;
                 }
 
-                /* new audio ports: make sure the audio goes somewhere useful, 
+                /* new audio ports: make sure the audio goes somewhere useful,
                    unless the user has no-auto-connect selected.
-                
+
                    The existing ChanCounts don't matter for this call as they are only
                    to do with matching input and output indices, and we are only changing
                    outputs here.
                 */
 
                 ChanCount dummy;
-                
+
                 auto_connect_route (midi_track, dummy, dummy, false, false, ChanCount(), change.before);
         }
 }
@@ -1570,7 +1580,7 @@ Session::midi_output_change_handler (IOChange change, void * /*src*/, boost::wea
  *  @param output_start As \a input_start, but for outputs.
  */
 void
-Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing_inputs, ChanCount& existing_outputs, 
+Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing_inputs, ChanCount& existing_outputs,
                              bool with_lock, bool connect_inputs, ChanCount input_start, ChanCount output_start)
 {
        if (!IO::connecting_legal) {
@@ -1624,7 +1634,7 @@ Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing
 
                        for (uint32_t i = input_start.get(*t); i < route->n_inputs().get(*t) && i < nphysical_in; ++i) {
                                string port;
-                                
+
                                if (Config->get_input_auto_connect() & AutoConnectPhysical) {
                                        DEBUG_TRACE (DEBUG::Graph,
                                                     string_compose("Get index %1 + %2 % %3 = %4\n",
@@ -1693,8 +1703,8 @@ Session::new_audio_track (
 
        control_id = ntracks() + nbusses() + 1;
 
-       bool const use_number = (how_many != 1);
-       
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Audio");
+
        while (how_many) {
                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;
@@ -1702,7 +1712,7 @@ Session::new_audio_track (
                }
 
                boost::shared_ptr<AudioTrack> track;
-                
+
                try {
                        track.reset (new AudioTrack (*this, track_name, Route::Flag (0), mode));
 
@@ -1713,7 +1723,7 @@ Session::new_audio_track (
                        track->use_new_diskstream();
 
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-                       boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
+                       // boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
 #endif
                        {
                                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
@@ -1725,7 +1735,7 @@ Session::new_audio_track (
                                              << 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"),
@@ -1812,7 +1822,8 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
 
        control_id = ntracks() + nbusses() + 1;
 
-       bool const use_number = (how_many != 1);
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Bus");
+       
        while (how_many) {
                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;
@@ -1827,7 +1838,7 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
                        }
 
 #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
-                       boost_debug_shared_ptr_mark_interesting (bus.get(), "Route");
+                       // boost_debug_shared_ptr_mark_interesting (bus.get(), "Route");
 #endif
                        {
                                Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
@@ -1838,8 +1849,8 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
                                              << 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)
@@ -1876,7 +1887,7 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
 
   failure:
        if (!ret.empty()) {
-               add_routes (ret, true, true);
+               add_routes (ret, false, true);
        }
 
        return ret;
@@ -1886,7 +1897,6 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
 RouteList
 Session::new_route_from_template (uint32_t how_many, const std::string& template_path)
 {
-       char name[32];
        RouteList ret;
        uint32_t control_id;
        XMLTree tree;
@@ -1902,27 +1912,35 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
 
        while (how_many) {
 
-               XMLNode node_copy (*node); // make a copy so we can change the name if we need to
-
-               std::string node_name = IO::name_from_state (*node_copy.children().front());
+               XMLNode node_copy (*node);
 
-               /* generate a new name by adding a number to the end of the template name */
-               if (!find_route_name (node_name.c_str(), ++number, name, sizeof(name), true)) {
-                       fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
-                       /*NOTREACHED*/
-               }
+               /* Remove IDs of everything so that new ones are used */
+               node_copy.remove_property_recursively (X_("id"));
 
-               /* set IO children to use the new name */
-               XMLNodeList const & children = node_copy.children ();
-               for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
-                       if ((*i)->name() == IO::state_node_name) {
-                               IO::set_name_in_state (**i, name);
+               try {
+                       string const route_name = node_copy.property(X_("name"))->value ();
+                       
+                       /* generate a new name by adding a number to the end of the template name */
+                       char name[32];
+                       if (!find_route_name (route_name.c_str(), ++number, name, sizeof(name), true)) {
+                               fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
+                               /*NOTREACHED*/
                        }
-               }
 
-               Track::zero_diskstream_id_in_xml (node_copy);
+                       /* set this name in the XML description that we are about to use */
+                       Route::set_name_in_state (node_copy, name);
 
-               try {
+                       /* trim bitslots from listen sends so that new ones are used */
+                       XMLNodeList children = node_copy.children ();
+                       for (XMLNodeList::iterator i = children.begin(); i != children.end(); ++i) {
+                               if ((*i)->name() == X_("Processor")) {
+                                       XMLProperty* role = (*i)->property (X_("role"));
+                                       if (role && role->value() == X_("Listen")) {
+                                               (*i)->remove_property (X_("bitslot"));
+                                       }
+                               }
+                       }
+                       
                        boost::shared_ptr<Route> route (XMLRouteFactory (node_copy, 3000));
 
                        if (route == 0) {
@@ -1935,9 +1953,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);
@@ -1977,7 +1995,7 @@ Session::add_routes (RouteList& new_routes, bool auto_connect, bool save)
 {
         ChanCount existing_inputs;
         ChanCount existing_outputs;
-        
+
         count_existing_track_channels (existing_inputs, existing_outputs);
 
        {
@@ -1985,7 +2003,6 @@ Session::add_routes (RouteList& new_routes, bool auto_connect, bool save)
                boost::shared_ptr<RouteList> r = writer.get_copy ();
                r->insert (r->end(), new_routes.begin(), new_routes.end());
 
-
                /* if there is no control out and we're not in the middle of loading,
                   resort the graph here. if there is a control out, we will resort
                   toward the end of this method. if we are in the middle of loading,
@@ -2030,7 +2047,7 @@ Session::add_routes (RouteList& new_routes, bool auto_connect, bool save)
                                 mt->output()->changed.connect_same_thread (*this, boost::bind (&Session::midi_output_change_handler, this, _1, _2, boost::weak_ptr<Route>(mt)));
                        }
                }
-        
+
                if (auto_connect) {
                        auto_connect_route (r, existing_inputs, existing_outputs, true);
                }
@@ -2108,7 +2125,8 @@ Session::globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p
        boost::shared_ptr<RouteList> t (new RouteList);
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (include_buses || boost::dynamic_pointer_cast<Track>(*i)) {
+               /* no MIDI sends because there are no MIDI busses yet */
+               if (include_buses || boost::dynamic_pointer_cast<AudioTrack>(*i)) {
                        t->push_back (*i);
                }
        }
@@ -2194,7 +2212,7 @@ Session::remove_route (boost::shared_ptr<Route> route)
                                (*i)->remove_processor (s);
                        }
                }
-       }       
+       }
 
        boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route);
        if (mt && mt->step_editing()) {
@@ -2211,7 +2229,7 @@ Session::remove_route (boost::shared_ptr<Route> route)
         */
 
        resort_routes ();
-       route_graph->clear_other_chain ();
+       _process_graph->clear_other_chain ();
 
        /* get rid of it from the dead wood collection in the route list manager */
 
@@ -2257,7 +2275,7 @@ Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
                        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);
                        }
                }
@@ -2281,7 +2299,7 @@ Session::route_solo_isolated_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
                error << string_compose (_("programming error: %1"), X_("invalid route weak ptr passed to route_solo_changed")) << endmsg;
                return;
        }
-        
+
        bool send_changed = false;
 
        if (route->solo_isolated()) {
@@ -2300,10 +2318,12 @@ Session::route_solo_isolated_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
                IsolatedChanged (); /* EMIT SIGNAL */
        }
 }
-            
+
 void
 Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_ptr<Route> wpr)
 {
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("route solo change, self = %1\n", self_solo_change));
+
        if (!self_solo_change) {
                // session doesn't care about changes to soloed-by-others
                return;
@@ -2311,17 +2331,13 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
 
        if (solo_update_disabled) {
                // We know already
+               DEBUG_TRACE (DEBUG::Solo, "solo update disabled - changed ignored\n");
                return;
        }
 
        boost::shared_ptr<Route> route = wpr.lock ();
+       assert (route);
 
-       if (!route) {
-               /* should not happen */
-               error << string_compose (_("programming error: %1"), X_("invalid route weak ptr passed to route_solo_changed")) << endmsg;
-               return;
-       }
-        
        boost::shared_ptr<RouteList> r = routes.reader ();
        int32_t delta;
 
@@ -2330,43 +2346,78 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
        } else {
                delta = -1;
        }
+
+       RouteGroup* rg = route->route_group ();
+       bool leave_group_alone = (rg && rg->is_active() && rg->is_solo());
+
        if (delta == 1 && Config->get_exclusive_solo()) {
-               /* new solo: disable all other solos */
+               
+               /* new solo: disable all other solos, but not the group if its solo-enabled */
+
                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
+                       if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden() ||
+                           (leave_group_alone && ((*i)->route_group() == rg))) {
                                continue;
-                       } 
+                       }
                        (*i)->set_solo (false, this);
                }
        }
 
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("propagate solo change, delta = %1\n", delta));
+
        solo_update_disabled = true;
-        
+
        RouteList uninvolved;
-        
+
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("%1\n", route->name()));
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                bool via_sends_only;
                bool in_signal_flow;
 
-               if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
+               if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden() ||
+                   (leave_group_alone && ((*i)->route_group() == rg))) {
                        continue;
-               } 
+               }
 
                in_signal_flow = false;
 
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed from %1\n", (*i)->name()));
+               
                if ((*i)->feeds (route, &via_sends_only)) {
                        if (!via_sends_only) {
                                if (!route->soloed_by_others_upstream()) {
                                        (*i)->mod_solo_by_others_downstream (delta);
                                }
-                               in_signal_flow = true;
                        }
-               } 
-                
+                       in_signal_flow = true;
+               } else {
+                       DEBUG_TRACE (DEBUG::Solo, "\tno feed from\n");
+               }
+               
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed to %1\n", (*i)->name()));
+
                if (route->feeds (*i, &via_sends_only)) {
-                       (*i)->mod_solo_by_others_upstream (delta);
+                       /* propagate solo upstream only if routing other than
+                          sends is involved, but do consider the other route
+                          (*i) to be part of the signal flow even if only
+                          sends are involved.
+                       */
+                       DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 feeds %2 via sends only %3 sboD %4 sboU %5\n",
+                                                                 route->name(),
+                                                                 (*i)->name(),
+                                                                 via_sends_only,
+                                                                 route->soloed_by_others_downstream(),
+                                                                 route->soloed_by_others_upstream()));
+                       if (!via_sends_only) {
+                               if (!route->soloed_by_others_downstream()) {
+                                       DEBUG_TRACE (DEBUG::Solo, string_compose ("\tmod %1 by %2\n", (*i)->name(), delta));
+                                       (*i)->mod_solo_by_others_upstream (delta);
+                               }
+                       }
                        in_signal_flow = true;
+               } else {
+                       DEBUG_TRACE (DEBUG::Solo, "\tno feed to\n");
                }
 
                if (!in_signal_flow) {
@@ -2375,6 +2426,8 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
        }
 
        solo_update_disabled = false;
+       DEBUG_TRACE (DEBUG::Solo, "propagation complete\n");
+
        update_route_solo_state (r);
 
        /* now notify that the mute state of the routes not involved in the signal
@@ -2382,6 +2435,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
        */
 
        for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) {
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1\n", (*i)->name()));
                (*i)->mute_changed (this);
        }
 
@@ -2433,7 +2487,7 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
        }
 }
 
-boost::shared_ptr<RouteList> 
+boost::shared_ptr<RouteList>
 Session::get_routes_with_internal_returns() const
 {
        boost::shared_ptr<RouteList> r = routes.reader ();
@@ -2451,20 +2505,76 @@ bool
 Session::io_name_is_legal (const std::string& name)
 {
        boost::shared_ptr<RouteList> r = routes.reader ();
-        
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if ((*i)->name() == name) {
                        return false;
                }
-                
+
                if ((*i)->has_io_processor_named (name)) {
                        return false;
                }
        }
-        
+
        return true;
 }
 
+void
+Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_on*/)
+{
+       RouteList rl;
+       vector<string> connections;
+
+       PortSet& ps (rt->input()->ports());
+
+       for (PortSet::iterator p = ps.begin(); p != ps.end(); ++p) {
+               p->get_connections (connections);
+       }
+
+       for (vector<string>::iterator s = connections.begin(); s != connections.end(); ++s) {
+               routes_using_input_from (*s, rl);
+       }
+
+       /* scan all relevant routes to see if others are on or off */
+
+       bool others_are_already_on = false;
+
+       for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
+               if ((*r) != rt) {
+                       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*r);
+                       if (mt) {
+                               if (mt->input_active()) {
+                                       others_are_already_on = true;
+                                       break;
+                               }
+                       }
+               }
+       }
+
+       /* globally reverse other routes */
+
+       for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
+               if ((*r) != rt) {
+                       boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*r);
+                       if (mt) {
+                               mt->set_input_active (!others_are_already_on);
+                       }
+               }
+       }
+}
+
+void
+Session::routes_using_input_from (const string& str, RouteList& rl)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               if ((*i)->input()->connected_to (str)) {
+                       rl.push_back (*i);
+               }
+       }
+}
+
 boost::shared_ptr<Route>
 Session::route_by_name (string name)
 {
@@ -2493,6 +2603,21 @@ Session::route_by_id (PBD::ID id)
        return boost::shared_ptr<Route> ((Route*) 0);
 }
 
+boost::shared_ptr<Track>
+Session::track_by_diskstream_id (PBD::ID id)
+{
+       boost::shared_ptr<RouteList> r = routes.reader ();
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*i);
+               if (t && t->using_diskstream_id (id)) {
+                       return t;
+               }
+       }
+
+       return boost::shared_ptr<Track> ();
+}
+
 boost::shared_ptr<Route>
 Session::route_by_remote_id (uint32_t id)
 {
@@ -2559,15 +2684,15 @@ Session::maybe_update_session_range (framepos_t a, framepos_t b)
        }
 
        if (_session_range_location == 0) {
-               
+
                add_session_range_location (a, b);
-               
+
        } else {
-               
+
                if (a < _session_range_location->start()) {
                        _session_range_location->set_start (a);
                }
-               
+
                if (b > _session_range_location->end()) {
                        _session_range_location->set_end (b);
                }
@@ -2643,7 +2768,7 @@ Session::destroy_sources (list<boost::shared_ptr<Source> > srcs)
        }
 
        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 */
@@ -2670,7 +2795,7 @@ Session::remove_last_capture ()
                if (!tr) {
                        continue;
                }
-               
+
                list<boost::shared_ptr<Source> >& l = tr->last_capture_sources();
 
                if (!l.empty()) {
@@ -2709,7 +2834,7 @@ Session::add_source (boost::shared_ptr<Source> source)
                set_dirty();
 
                boost::shared_ptr<AudioFileSource> afs;
-                
+
                if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(source)) != 0) {
                        if (Config->get_auto_analyse_audio()) {
                                Analyser::queue_source_for_analysis (source, false);
@@ -2726,7 +2851,7 @@ 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();
 
@@ -3002,7 +3127,7 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
                        string spath = sdir.sound_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" 
+                          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.
                        */
@@ -3025,7 +3150,7 @@ Session::new_audio_source_name (const string& base, uint32_t nchan, uint32_t cha
                        throw failed_constructor();
                }
        }
-        
+
        return Glib::path_get_basename (buf);
 }
 
@@ -3093,7 +3218,7 @@ Session::new_midi_source_name (const string& base)
 boost::shared_ptr<MidiSource>
 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) {
@@ -3102,7 +3227,7 @@ Session::create_midi_source_for_session (Track* track, string const & n)
                */
 
                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());
@@ -3200,7 +3325,7 @@ Session::cancel_audition ()
 bool
 Session::RoutePublicOrderSorter::operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b)
 {
-       if (a->is_monitor()) { 
+       if (a->is_monitor()) {
                return true;
        }
        if (b->is_monitor()) {
@@ -3283,7 +3408,7 @@ Session::available_capture_duration ()
        if (_total_free_4k_blocks * scale > (double) max_framecnt) {
                return max_framecnt;
        }
-        
+
        return (framecnt_t) floor (_total_free_4k_blocks * scale);
 }
 
@@ -3346,7 +3471,7 @@ Session::tempo_map_changed (const PropertyChange&)
        playlists->update_after_tempo_map_change ();
 
        _locations->apply (*this, &Session::update_locations_after_tempo_map_change);
-       
+
        set_dirty ();
 }
 
@@ -3686,7 +3811,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
        }
 
        /* 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);
 
@@ -3750,13 +3875,13 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
                /* construct a region to represent the bounced material */
 
                PropertyList plist;
-               
+
                plist.add (Properties::start, 0);
                plist.add (Properties::length, srcs.front()->length(srcs.front()->timeline_position()));
                plist.add (Properties::name, region_name_from_path (srcs.front()->name(), true));
-               
+
                result = RegionFactory::create (srcs, plist);
-                          
+
        }
 
   out:
@@ -3784,7 +3909,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
        if (need_block_size_reset) {
                track.set_block_size (get_block_size());
        }
-        
+
        unblock_processing ();
 
        return result;
@@ -3900,7 +4025,7 @@ Session::update_have_rec_enabled_track ()
                if (tr && tr->record_enabled ()) {
                        break;
                }
-               
+
                ++i;
        }
 
@@ -3935,18 +4060,32 @@ Session::solo_control_mode_changed ()
        }
 }
 
-/** Called when anything about any of our route groups changes (membership, state etc.) */
+/** Called when a property of one of our route groups changes */
 void
-Session::route_group_changed ()
+Session::route_group_property_changed (RouteGroup* rg)
 {
-       RouteGroupChanged (); /* EMIT SIGNAL */
+       RouteGroupPropertyChanged (rg); /* EMIT SIGNAL */
+}
+
+/** Called when a route is added to one of our route groups */
+void
+Session::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
+{
+       RouteAddedToRouteGroup (rg, r);
+}
+
+/** Called when a route is removed from one of our route groups */
+void
+Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route> r)
+{
+       RouteRemovedFromRouteGroup (rg, r);
 }
 
 vector<SyncSource>
 Session::get_available_sync_options () const
 {
        vector<SyncSource> ret;
-       
+
        ret.push_back (JACK);
        ret.push_back (MTC);
        ret.push_back (MIDIClock);
@@ -3965,12 +4104,12 @@ Session::get_routes_with_regions_at (framepos_t const p) const
                if (!tr) {
                        continue;
                }
-               
+
                boost::shared_ptr<Playlist> pl = tr->playlist ();
                if (!pl) {
                        continue;
                }
-               
+
                if (pl->has_region_at (p)) {
                        rl->push_back (*i);
                }
@@ -4050,7 +4189,7 @@ Session::step_edit_status_change (bool yn)
        }
 }
 
-        
+
 void
 Session::start_time_changed (framepos_t old)
 {
@@ -4062,7 +4201,7 @@ Session::start_time_changed (framepos_t old)
        if (s == 0) {
                return;
        }
-       
+
        Location* l = _locations->auto_loop_location ();
 
        if (l->start() == old) {
@@ -4081,10 +4220,10 @@ Session::end_time_changed (framepos_t old)
        if (s == 0) {
                return;
        }
-       
+
        Location* l = _locations->auto_loop_location ();
 
-       if (l->end() == old) {
+       if (l && l->end() == old) {
                l->set_end (s->end(), true);
        }
 }
@@ -4092,35 +4231,32 @@ Session::end_time_changed (framepos_t old)
 string
 Session::source_search_path (DataType type) const
 {
-       string search_path;
+       vector<string> s;
 
        if (session_dirs.size() == 1) {
                switch (type) {
                case DataType::AUDIO:
-                       search_path = _session_dir->sound_path().to_string();
+                       s.push_back ( _session_dir->sound_path().to_string());
                        break;
                case DataType::MIDI:
-                       search_path = _session_dir->midi_path().to_string();
+                       s.push_back (_session_dir->midi_path().to_string());
                        break;
                }
        } else {
                for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
                        SessionDirectory sdir (i->path);
-                       if (!search_path.empty()) {
-                               search_path += ':';
-                       } 
                        switch (type) {
                        case DataType::AUDIO:
-                               search_path += sdir.sound_path().to_string();
+                               s.push_back (sdir.sound_path().to_string());
                                break;
                        case DataType::MIDI:
-                               search_path += sdir.midi_path().to_string();
+                               s.push_back (sdir.midi_path().to_string());
                                break;
                        }
                }
        }
-                
-       /* now add user-specified locations
+
+       /* now check the explicit (possibly user-specified) search path
         */
 
        vector<string> dirs;
@@ -4135,11 +4271,29 @@ Session::source_search_path (DataType type) const
        }
 
        for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-               search_path += ':';
-               search_path += *i;
-                        
+
+               vector<string>::iterator si;
+
+               for (si = s.begin(); si != s.end(); ++si) {
+                       if ((*si) == *i) {
+                               break;
+                       }
+               }
+
+               if (si == s.end()) {
+                       s.push_back (*i);
+               }
        }
-        
+       
+       string search_path;
+
+       for (vector<string>::iterator si = s.begin(); si != s.end(); ++si) {
+               if (!search_path.empty()) {
+                       search_path += ':';
+               }
+               search_path += *si;
+       }
+
        return search_path;
 }
 
@@ -4161,7 +4315,7 @@ Session::ensure_search_path_includes (const string& path, DataType type)
                search_path = config.get_midi_search_path ();
                break;
        }
-
+       
        split (search_path, dirs, ':');
 
        for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
@@ -4175,7 +4329,7 @@ Session::ensure_search_path_includes (const string& path, DataType type)
        }
 
        search_path += path;
-        
+
        switch (type) {
        case DataType::AUDIO:
                config.set_audio_search_path (search_path);
@@ -4187,7 +4341,7 @@ Session::ensure_search_path_includes (const string& path, DataType type)
 }
 
 boost::shared_ptr<Speakers>
-Session::get_speakers() 
+Session::get_speakers()
 {
        return _speakers;
 }
@@ -4223,6 +4377,8 @@ Session::update_latency (bool playback)
 
        if (playback) {
                /* reverse the list so that we work backwards from the last route to run to the first */
+                RouteList* rl = routes.reader().get();
+                r.reset (new RouteList (*rl));
                reverse (r->begin(), r->end());
        }
 
@@ -4243,15 +4399,15 @@ Session::update_latency (bool playback)
         */
 
         DEBUG_TRACE (DEBUG::Latency, string_compose ("Set public port latencies to %1\n", max_latency));
-        
+
         for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                 (*i)->set_public_port_latencies (max_latency, playback);
         }
-                
+
        if (playback) {
 
                post_playback_latency ();
+
        } else {
 
                post_capture_latency ();
@@ -4265,15 +4421,16 @@ Session::post_playback_latency ()
 {
        set_worst_playback_latency ();
 
-       boost::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() && ((*i)->active())) {
                        _worst_track_latency = max (_worst_track_latency, (*i)->update_signal_latency ());
                }
-                
-               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       (*i)->set_latency_compensation (_worst_track_latency);
-               }
+       }
+
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               (*i)->set_latency_compensation (_worst_track_latency);
        }
 }
 
@@ -4281,10 +4438,10 @@ void
 Session::post_capture_latency ()
 {
        set_worst_capture_latency ();
-        
+
        /* reflect any changes in capture latencies into capture offsets
         */
-        
+
        boost::shared_ptr<RouteList> rl = routes.reader();
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
@@ -4294,6 +4451,18 @@ Session::post_capture_latency ()
        }
 }
 
+void
+Session::initialize_latencies ()
+{
+        {
+                Glib::Mutex::Lock lm (_engine.process_lock());
+                update_latency (false);
+                update_latency (true);
+        }
+
+        set_worst_io_latencies ();
+}
+
 void
 Session::set_worst_io_latencies ()
 {
@@ -4359,29 +4528,46 @@ Session::update_latency_compensation (bool force_whole_graph)
        _worst_track_latency = 0;
 
        boost::shared_ptr<RouteList> r = routes.reader ();
-        
+
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if (!(*i)->is_hidden() && ((*i)->active())) {
                        framecnt_t tl;
                        if ((*i)->signal_latency () != (tl = (*i)->update_signal_latency ())) {
                                some_track_latency_changed = true;
                        }
-                       _worst_track_latency = max (tl, _worst_track_latency); 
+                       _worst_track_latency = max (tl, _worst_track_latency);
                }
        }
 
        DEBUG_TRACE (DEBUG::Latency, string_compose ("worst signal processing latency: %1 (changed ? %2)\n", _worst_track_latency,
                                                     (some_track_latency_changed ? "yes" : "no")));
 
-       if (force_whole_graph || some_track_latency_changed) {
-               /* trigger a full recompute of latency numbers for the graph.
-                  everything else that we need to do will be done in the latency
-                  callback.
-               */
-               _engine.update_total_latencies ();
-               return; // everything else will be done in the latency callback
-       } 
+       DEBUG_TRACE(DEBUG::Latency, "---------------------------- DONE update latency compensation\n\n");
+       
+       if (some_track_latency_changed || force_whole_graph)  {
+               _engine.update_latencies ();
+       }
+
 
-       DEBUG_TRACE(DEBUG::Latency, "---------------------------- DONE update latency compensation\n\n")
+       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+               if (!tr) {
+                       continue;
+               }
+               tr->set_capture_offset ();
+       }
 }
 
+char
+Session::session_name_is_legal (const string& path)
+{
+       char illegal_chars[] = { '/', '\\', ':', ';', '\0' };
+
+       for (int i = 0; illegal_chars[i]; ++i) {
+               if (path.find (illegal_chars[i]) != string::npos) {
+                       return illegal_chars[i];
+               }
+       }
+
+       return 0;
+}