fix region fade/env XML save - fixes #5353
[ardour.git] / libs / ardour / session.cc
index bcba42f01d6df9d5e563b773d6479dbb865439d3..3281ff2f98e515ccdd66a24ba66377ffc55ab81d 100644 (file)
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 
@@ -68,7 +68,6 @@
 #include "ardour/graph.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
-#include "ardour/named_selection.h"
 #include "ardour/operations.h"
 #include "ardour/playlist.h"
 #include "ardour/plugin.h"
@@ -146,7 +145,6 @@ Session::Session (AudioEngine &eng,
        , _bundles (new BundleList)
        , _bundle_xml_node (0)
        , _current_trans (0)
-       , _click_io ((IO*) 0)
        , click_data (0)
        , click_emphasis_data (0)
        , main_outs (0)
@@ -154,6 +152,7 @@ Session::Session (AudioEngine &eng,
        , _suspend_timecode_transmission (0)
 {
        _locations = new Locations (*this);
+       ltc_encoder = NULL;
 
        if (how_many_dsp_threads () > 1) {
                /* For now, only create the graph if we are using >1 DSP threads, as
@@ -231,6 +230,10 @@ Session::destroy ()
 
        _state_of_the_state = StateOfTheState (CannotSave|Deletion);
 
+       /* disconnect from any and all signals that we are connected to */
+
+       drop_connections ();
+
        _engine.remove_session ();
 
        /* deregister all ports - there will be no process or any other
@@ -239,6 +242,8 @@ Session::destroy ()
 
        Port::PortDrop (); /* EMIT SIGNAL */
 
+       ltc_tx_cleanup();
+
        /* clear history so that no references to objects are held any more */
 
        _history.clear ();
@@ -280,9 +285,6 @@ Session::destroy ()
 
        /* tell everyone to drop references and delete objects as we go */
 
-       DEBUG_TRACE (DEBUG::Destruction, "delete named selections\n");
-       named_selections.clear ();
-
        DEBUG_TRACE (DEBUG::Destruction, "delete regions\n");
        RegionFactory::delete_all_regions ();
 
@@ -368,6 +370,36 @@ Session::when_engine_running ()
 
        try {
                XMLNode* child = 0;
+               
+               _ltc_input.reset (new IO (*this, _("LTC In"), IO::Input));
+               _ltc_output.reset (new IO (*this, _("LTC Out"), IO::Output));
+
+               if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-In")) != 0) {
+                       _ltc_input->set_state (*(child->children().front()), Stateful::loading_state_version);
+               } else {
+                       {
+                               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               _ltc_input->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
+                       }
+                       reconnect_ltc_input ();
+               }
+
+               if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-Out")) != 0) {
+                       _ltc_output->set_state (*(child->children().front()), Stateful::loading_state_version);
+               } else {
+                       {
+                               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               _ltc_output->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
+                       }
+                       reconnect_ltc_output ();
+               }
+                                               
+               /* fix up names of LTC ports because we don't want the normal
+                * IO style of NAME/TYPE-{in,out}N
+                */
+               
+               _ltc_input->nth (0)->set_name (_("LTC-in"));
+               _ltc_output->nth (0)->set_name (_("LTC-out"));
 
                _click_io.reset (new ClickIO (*this, "click"));
                _click_gain.reset (new Amp (*this));
@@ -564,7 +596,7 @@ Session::when_engine_running ()
        ControlProtocolManager::instance().midi_connectivity_established ();
 
        if (_is_new && !no_auto_connect()) {
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
                auto_connect_master_bus ();
        }
 
@@ -578,6 +610,7 @@ Session::when_engine_running ()
 
        BootMessage (_("Connect to engine"));
        _engine.set_session (this);
+       _engine.reset_timebase ();
 }
 
 void
@@ -629,7 +662,7 @@ Session::remove_monitor_section ()
                 * pieces of audio as we work on each route.
                 */
                
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                
                /* Connect tracks to monitor section. Note that in an
                   existing session, the internal sends will already exist, but we want the
@@ -675,7 +708,7 @@ Session::add_monitor_section ()
        // boost_debug_shared_ptr_mark_interesting (r.get(), "Route");
 #endif
        {
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                r->input()->ensure_io (_master_out->output()->n_ports(), false, this);
                r->output()->ensure_io (_master_out->output()->n_ports(), false, this);
        }
@@ -728,7 +761,7 @@ Session::add_monitor_section ()
                        boost::shared_ptr<Bundle> b = bundle_by_name (Config->get_monitor_bus_preferred_bundle());
                        
                        if (b) {
-                               _monitor_out->output()->connect_ports_to_bundle (b, this);
+                               _monitor_out->output()->connect_ports_to_bundle (b, true, this);
                        } else {
                                warning << string_compose (_("The preferred I/O for the monitor bus (%1) cannot be found"),
                                                           Config->get_monitor_bus_preferred_bundle())
@@ -776,7 +809,7 @@ Session::add_monitor_section ()
         * pieces of audio as we work on each route.
         */
         
-       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
        /* Connect tracks to monitor section. Note that in an
           existing session, the internal sends will already exist, but we want the
@@ -1044,7 +1077,7 @@ Session::set_auto_loop_location (Location* location)
        }
 
        if (location->end() <= location->start()) {
-               error << _("Session: you can't use a mark for auto loop") << endmsg;
+               error << _("You cannot use this location for auto-loop because it has zero or negative length") << endmsg;
                return;
        }
 
@@ -1308,8 +1341,6 @@ Session::set_frame_rate (framecnt_t frames_per_second)
 
        sync_time_vars();
 
-       Automatable::set_automation_interval (ceil ((double) frames_per_second * (0.001 * Config->get_automation_interval())));
-
        clear_clicks ();
 
        // XXX we need some equivalent to this, somehow
@@ -1603,8 +1634,6 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost:
        RouteList new_routes;
        list<boost::shared_ptr<MidiTrack> > ret;
 
-       cerr << "Adding MIDI track with in = " << input << " out = " << output << endl;
-
        bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("MIDI");
 
        while (how_many) {
@@ -1628,7 +1657,7 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost:
                        // boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
 #endif
                        {
-                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                                if (track->input()->ensure_io (input, false, this)) {
                                        error << "cannot configure " << input << " out configuration for new midi track" << endmsg;     
                                        goto failed;
@@ -1663,7 +1692,7 @@ Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost:
 
                catch (AudioEngine::PortRegistrationFailure& pfe) {
 
-                       error << string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with ports if you need this many tracks."), PROGRAM_NAME) << endmsg;
+                       error << string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with more ports if you need this many tracks."), PROGRAM_NAME) << endmsg;
                        goto failed;
                }
 
@@ -1728,7 +1757,7 @@ Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing
                return;
        }
 
-       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock (), Glib::NOT_LOCK);
+       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock (), Glib::Threads::NOT_LOCK);
 
        if (with_lock) {
                lm.acquire ();
@@ -1863,7 +1892,7 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
                        // boost_debug_shared_ptr_mark_interesting (track.get(), "Track");
 #endif
                        {
-                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                                if (track->input()->ensure_io (ChanCount(DataType::AUDIO, input_channels), false, this)) {
                                        error << string_compose (
@@ -1949,7 +1978,7 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
                        // boost_debug_shared_ptr_mark_interesting (bus.get(), "Route");
 #endif
                        {
-                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               Glib::Threads::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"),
@@ -1977,6 +2006,8 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
                        bus->add_internal_return ();
 
                        ret.push_back (bus);
+                       
+                       ARDOUR::GUIIdle ();
                }
 
 
@@ -2065,7 +2096,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                                   loading this normally happens in a different way.
                                */
 
-                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                                IOChange change (IOChange::Type (IOChange::ConfigurationChanged | IOChange::ConnectionsChanged));
                                change.after = route->input()->n_ports();
@@ -2104,9 +2135,35 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
 
 void
 Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output_auto_connect, bool save)
+{
+       try {
+               PBD::Unwinder<bool> aip (_adding_routes_in_progress, true);
+               add_routes_inner (new_routes, input_auto_connect, output_auto_connect);
+
+       } catch (...) {
+               error << _("Adding new tracks/busses failed") << endmsg;
+       }
+
+       graph_reordered ();
+
+       update_latency (true);
+       update_latency (false);
+               
+       set_dirty();
+       
+       if (save) {
+               save_state (_current_snapshot_name);
+       }
+       
+       RouteAdded (new_routes); /* EMIT SIGNAL */
+}
+
+void
+Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool output_auto_connect)
 {
         ChanCount existing_inputs;
         ChanCount existing_outputs;
+       uint32_t order = next_control_id();
 
         count_existing_track_channels (existing_inputs, existing_outputs);
 
@@ -2137,7 +2194,6 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
                r->mute_changed.connect_same_thread (*this, boost::bind (&Session::route_mute_changed, this, _1));
                r->output()->changed.connect_same_thread (*this, boost::bind (&Session::set_worst_io_latencies_x, this, _1, _2));
                r->processors_changed.connect_same_thread (*this, boost::bind (&Session::route_processors_changed, this, _1));
-               r->order_key_changed.connect_same_thread (*this, boost::bind (&Session::route_order_key_changed, this));
 
                if (r->is_master()) {
                        _master_out = r;
@@ -2160,38 +2216,45 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
                        }
                }
 
+
                if (input_auto_connect || output_auto_connect) {
                        auto_connect_route (r, existing_inputs, existing_outputs, true, input_auto_connect);
                }
-       }
 
-       if (_monitor_out && IO::connecting_legal) {
+               /* order keys are a GUI responsibility but we need to set up
+                  reasonable defaults because they also affect the remote control
+                  ID in most situations.
+               */
 
-               {
-                       Glib::Mutex::Lock lm (_engine.process_lock());          
-                       
-                       for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
-                               if ((*x)->is_monitor()) {
-                                       /* relax */
-                               } else if ((*x)->is_master()) {
-                                       /* relax */
-                               } else {
-                                       (*x)->enable_monitor_send ();
-                               }
+               if (!r->has_order_key (EditorSort)) {
+                       if (r->is_hidden()) {
+                               /* use an arbitrarily high value */
+                               r->set_order_key (EditorSort, UINT_MAX);
+                               r->set_order_key (MixerSort, UINT_MAX);
+                       } else {
+                               DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("while adding, set %1 to order key %2\n", r->name(), order));
+                               r->set_order_key (EditorSort, order);
+                               r->set_order_key (MixerSort, order);
+                               order++;
                        }
                }
 
-               resort_routes ();
+               ARDOUR::GUIIdle ();
        }
 
-       set_dirty();
-
-       if (save) {
-               save_state (_current_snapshot_name);
+       if (_monitor_out && IO::connecting_legal) {
+               Glib::Threads::Mutex::Lock lm (_engine.process_lock());         
+               
+               for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
+                       if ((*x)->is_monitor()) {
+                               /* relax */
+                       } else if ((*x)->is_master()) {
+                                       /* relax */
+                       } else {
+                               (*x)->enable_monitor_send ();
+                       }
+               }
        }
-
-       RouteAdded (new_routes); /* EMIT SIGNAL */
-       Route::RemoteControlIDChange (); /* EMIT SIGNAL */
 }
 
 void
@@ -2359,8 +2422,6 @@ Session::remove_route (boost::shared_ptr<Route> route)
 
        route->drop_references ();
 
-       sync_order_keys (UndefinedSort);
-
        Route::RemoteControlIDChange(); /* EMIT SIGNAL */
 
        /* save the new state of the world */
@@ -2503,14 +2564,17 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
                DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed from %1\n", (*i)->name()));
                
                if ((*i)->feeds (route, &via_sends_only)) {
+                       DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a feed from %1\n", (*i)->name()));
                        if (!via_sends_only) {
                                if (!route->soloed_by_others_upstream()) {
                                        (*i)->mod_solo_by_others_downstream (delta);
                                }
+                       } else {
+                               DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a send-only feed from %1\n", (*i)->name()));
                        }
                        in_signal_flow = true;
                } else {
-                       DEBUG_TRACE (DEBUG::Solo, "\tno feed from\n");
+                       DEBUG_TRACE (DEBUG::Solo, string_compose ("\tno feed from %1\n", (*i)->name()));
                }
                
                DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed to %1\n", (*i)->name()));
@@ -2531,7 +2595,11 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
                                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);
+                               } else {
+                                       DEBUG_TRACE (DEBUG::Solo, "\talready soloed by others downstream\n");
                                }
+                       } else {
+                               DEBUG_TRACE (DEBUG::Solo, string_compose ("\tfeed to %1 ignored, sends-only\n", (*i)->name()));
                        }
                        in_signal_flow = true;
                } else {
@@ -2553,7 +2621,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()));
+               DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1, which neither feeds or is fed by %2\n", (*i)->name(), route->name()));
                (*i)->mute_changed (this);
        }
 
@@ -2603,6 +2671,9 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
                _solo_isolated_cnt = isolated;
                IsolatedChanged (); /* EMIT SIGNAL */
        }
+
+       DEBUG_TRACE (DEBUG::Solo, string_compose ("solo state updated by session, soloed? %1 listeners %2 isolated %3\n",
+                                                 something_soloed, listeners, isolated));
 }
 
 boost::shared_ptr<RouteList>
@@ -2638,44 +2709,68 @@ Session::io_name_is_legal (const std::string& name)
 }
 
 void
-Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_on*/)
+Session::set_exclusive_input_active (boost::shared_ptr<RouteList> rl, bool onoff, bool flip_others)
 {
-       RouteList rl;
+       RouteList rl2;
        vector<string> connections;
 
-       PortSet& ps (rt->input()->ports());
-
-       for (PortSet::iterator p = ps.begin(); p != ps.end(); ++p) {
-               p->get_connections (connections);
-       }
+       /* if we are passed only a single route and we're not told to turn
+        * others off, then just do the simple thing.
+        */
 
-       for (vector<string>::iterator s = connections.begin(); s != connections.end(); ++s) {
-               routes_using_input_from (*s, rl);
+       if (flip_others == false && rl->size() == 1) {
+               boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (rl->front());
+               if (mt) {
+                       mt->set_input_active (onoff);
+                       return;
+               }
        }
 
-       /* scan all relevant routes to see if others are on or off */
+       for (RouteList::iterator rt = rl->begin(); rt != rl->end(); ++rt) {
 
-       bool others_are_already_on = false;
+               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, rl2);
+               }
+               
+               /* scan all relevant routes to see if others are on or off */
+               
+               bool others_are_already_on = false;
+               
+               for (RouteList::iterator r = rl2.begin(); r != rl2.end(); ++r) {
 
-       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) {
+                               continue;
+                       }
+
+                       if ((*r) != (*rt)) {
                                if (mt->input_active()) {
                                        others_are_already_on = true;
-                                       break;
                                }
+                       } else {
+                               /* this one needs changing */
+                               mt->set_input_active (onoff);
                        }
                }
-       }
-
-       /* globally reverse other routes */
+               
+               if (flip_others) {
 
-       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);
+                       /* globally reverse other routes */
+                       
+                       for (RouteList::iterator r = rl2.begin(); r != rl2.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);
+                                       }
+                               }
                        }
                }
        }
@@ -2684,7 +2779,7 @@ Session::set_exclusive_input_active (boost::shared_ptr<Route> rt, bool /*others_
 void
 Session::routes_using_input_from (const string& str, RouteList& rl)
 {
-       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)->input()->connected_to (str)) {
@@ -2842,7 +2937,7 @@ Session::find_whole_file_parent (boost::shared_ptr<Region const> child) const
        RegionFactory::RegionMap::const_iterator i;
        boost::shared_ptr<Region> region;
 
-       Glib::Mutex::Lock lm (region_lock);
+       Glib::Threads::Mutex::Lock lm (region_lock);
 
        for (i = regions.begin(); i != regions.end(); ++i) {
 
@@ -2888,7 +2983,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);
+                       Glib::Threads::Mutex::Lock ls (source_lock);
                        /* remove from the main source list */
                        sources.erase ((*s)->id());
                }
@@ -2941,7 +3036,7 @@ Session::add_source (boost::shared_ptr<Source> source)
        entry.second = source;
 
        {
-               Glib::Mutex::Lock lm (source_lock);
+               Glib::Threads::Mutex::Lock lm (source_lock);
                result = sources.insert (entry);
        }
 
@@ -2986,7 +3081,7 @@ Session::remove_source (boost::weak_ptr<Source> src)
        }
 
        {
-               Glib::Mutex::Lock lm (source_lock);
+               Glib::Threads::Mutex::Lock lm (source_lock);
 
                if ((i = sources.find (source->id())) != sources.end()) {
                        sources.erase (i);
@@ -3006,7 +3101,7 @@ Session::remove_source (boost::weak_ptr<Source> src)
 boost::shared_ptr<Source>
 Session::source_by_id (const PBD::ID& id)
 {
-       Glib::Mutex::Lock lm (source_lock);
+       Glib::Threads::Mutex::Lock lm (source_lock);
        SourceMap::iterator i;
        boost::shared_ptr<Source> source;
 
@@ -3020,7 +3115,7 @@ Session::source_by_id (const PBD::ID& id)
 boost::shared_ptr<Source>
 Session::source_by_path_and_channel (const string& path, uint16_t chn)
 {
-       Glib::Mutex::Lock lm (source_lock);
+       Glib::Threads::Mutex::Lock lm (source_lock);
 
        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
                boost::shared_ptr<AudioFileSource> afs
@@ -3037,7 +3132,7 @@ uint32_t
 Session::count_sources_by_origin (const string& path)
 {
        uint32_t cnt = 0;
-       Glib::Mutex::Lock lm (source_lock);
+       Glib::Threads::Mutex::Lock lm (source_lock);
 
        for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
                boost::shared_ptr<FileSource> fs
@@ -3471,7 +3566,7 @@ Session::graph_reordered ()
           from a set_state() call or creating new tracks. Ditto for deletion.
        */
 
-       if (_state_of_the_state & (InitialConnecting|Deletion)) {
+       if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress) {
                return;
        }
 
@@ -3502,6 +3597,8 @@ Session::graph_reordered ()
 boost::optional<framecnt_t>
 Session::available_capture_duration ()
 {
+       Glib::Threads::Mutex::Lock lm (space_lock);
+
        if (_total_free_4k_blocks_uncertain) {
                return boost::optional<framecnt_t> ();
        }
@@ -3786,56 +3883,6 @@ Session::unmark_insert_id (uint32_t id)
        }
 }
 
-
-/* Named Selection management */
-
-boost::shared_ptr<NamedSelection>
-Session::named_selection_by_name (string name)
-{
-       Glib::Mutex::Lock lm (named_selection_lock);
-       for (NamedSelectionList::iterator i = named_selections.begin(); i != named_selections.end(); ++i) {
-               if ((*i)->name == name) {
-                       return *i;
-               }
-       }
-       return boost::shared_ptr<NamedSelection>();
-}
-
-void
-Session::add_named_selection (boost::shared_ptr<NamedSelection> named_selection)
-{
-       {
-               Glib::Mutex::Lock lm (named_selection_lock);
-               named_selections.insert (named_selections.begin(), named_selection);
-       }
-
-       set_dirty();
-
-       NamedSelectionAdded (); /* EMIT SIGNAL */
-}
-
-void
-Session::remove_named_selection (boost::shared_ptr<NamedSelection> named_selection)
-{
-       bool removed = false;
-
-       {
-               Glib::Mutex::Lock lm (named_selection_lock);
-
-               NamedSelectionList::iterator i = find (named_selections.begin(), named_selections.end(), named_selection);
-
-               if (i != named_selections.end()) {
-                       named_selections.erase (i);
-                       set_dirty();
-                       removed = true;
-               }
-       }
-
-       if (removed) {
-                NamedSelectionRemoved (); /* EMIT SIGNAL */
-       }
-}
-
 void
 Session::reset_native_file_format ()
 {
@@ -4150,32 +4197,11 @@ Session::add_automation_list(AutomationList *al)
        automation_lists[al->id()] = al;
 }
 
-void
-Session::sync_order_keys (RouteSortOrderKey base)
-{
-       if (deletion_in_progress()) {
-               return;
-       }
-
-       if (!Config->get_sync_all_route_ordering()) {
-               /* leave order keys as they are */
-               return;
-       }
-
-       boost::shared_ptr<RouteList> r = routes.reader ();
-
-       for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               (*i)->sync_order_keys (base);
-       }
-
-       Route::SyncOrderKeys (base); // EMIT SIGNAL
-}
-
 /** @return true if there is at least one record-enabled track, otherwise false */
 bool
 Session::have_rec_enabled_track () const
 {
-       return g_atomic_int_get (&_have_rec_enabled_track) == 1;
+       return g_atomic_int_get (const_cast<gint*>(&_have_rec_enabled_track)) == 1;
 }
 
 /** Update the state of our rec-enabled tracks flag */
@@ -4246,18 +4272,6 @@ Session::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route>
        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);
-
-       return ret;
-}
-
 boost::shared_ptr<RouteList>
 Session::get_routes_with_regions_at (framepos_t const p) const
 {
@@ -4322,13 +4336,6 @@ Session::add_session_range_location (framepos_t start, framepos_t end)
        _locations->add (_session_range_location);
 }
 
-/** Called when one of our routes' order keys has changed */
-void
-Session::route_order_key_changed ()
-{
-       RouteOrderKeyChanged (); /* EMIT SIGNAL */
-}
-
 void
 Session::step_edit_status_change (bool yn)
 {
@@ -4401,7 +4408,7 @@ Session::source_search_path (DataType type) const
        if (session_dirs.size() == 1) {
                switch (type) {
                case DataType::AUDIO:
-                       s.push_back ( _session_dir->sound_path());
+                       s.push_back (_session_dir->sound_path());
                        break;
                case DataType::MIDI:
                        s.push_back (_session_dir->midi_path());
@@ -4421,6 +4428,15 @@ Session::source_search_path (DataType type) const
                }
        }
 
+       if (type == DataType::AUDIO) {
+               const string sound_path_2X = _session_dir->sound_path_2X();
+               if (Glib::file_test (sound_path_2X, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
+                       if (find (s.begin(), s.end(), sound_path_2X) == s.end()) {
+                               s.push_back (sound_path_2X);
+                       }
+               }
+       }
+
        /* now check the explicit (possibly user-specified) search path
         */
 
@@ -4436,16 +4452,7 @@ Session::source_search_path (DataType type) const
        }
 
        for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-
-               vector<string>::iterator si;
-
-               for (si = s.begin(); si != s.end(); ++si) {
-                       if ((*si) == *i) {
-                               break;
-                       }
-               }
-
-               if (si == s.end()) {
+               if (find (s.begin(), s.end(), *i) == s.end()) {
                        s.push_back (*i);
                }
        }
@@ -4539,7 +4546,7 @@ Session::update_latency (bool playback)
 {
        DEBUG_TRACE (DEBUG::Latency, string_compose ("JACK latency callback: %1\n", (playback ? "PLAYBACK" : "CAPTURE")));
 
-       if (_state_of_the_state & (InitialConnecting|Deletion)) {
+       if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress) {
                return;
        }
 
@@ -4626,7 +4633,7 @@ void
 Session::initialize_latencies ()
 {
         {
-                Glib::Mutex::Lock lm (_engine.process_lock());
+                Glib::Threads::Mutex::Lock lm (_engine.process_lock());
                 update_latency (false);
                 update_latency (true);
         }
@@ -4748,30 +4755,53 @@ Session::next_control_id () const
 {
        int subtract = 0;
 
-       /* the master and monitor bus remote ID's occupy a different
-        * "namespace" than regular routes. their existence doesn't
+       /* the monitor bus remote ID is in a different
+        * "namespace" than regular routes. its existence doesn't
         * affect normal (low) numbered routes.
         */
 
-       if (_master_out) {
+       if (_monitor_out) {
                subtract++;
        }
 
-       if (_monitor_out) {
-               subtract++;
+       return nroutes() - subtract;
+}
+
+void
+Session::notify_remote_id_change ()
+{
+       if (deletion_in_progress()) {
+               return;
        }
 
-       /* remote control IDs are based either on this
-          value, or signal order, which is zero-based. so we have
-          to ensure consistency of zero-based-ness for both
-          sources of the number.
-          
-          we actually add 1 to the value to form an actual
-          remote control ID, which is 1-based.
+       switch (Config->get_remote_model()) {
+       case MixerSort:
+       case EditorSort:
+               Route::RemoteControlIDChange (); /* EMIT SIGNAL */
+               break;
+       default:
+               break;
+       }
+}
+
+void
+Session::sync_order_keys (RouteSortOrderKey sort_key_changed)
+{
+       if (deletion_in_progress()) {
+               return;
+       }
+
+       /* tell everyone that something has happened to the sort keys
+          and let them sync up with the change(s)
+          this will give objects that manage the sort order keys the
+          opportunity to keep them in sync if they wish to.
        */
 
-       cerr << "Next control ID will be " << ntracks() + (nbusses() - subtract) << endl;
-       return ntracks() + (nbusses() - subtract);
+       DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("Sync Order Keys, based on %1\n", enum_2_string (sort_key_changed)));
+
+       Route::SyncOrderKeys (sort_key_changed); /* EMIT SIGNAL */
+
+       DEBUG_TRACE (DEBUG::OrderKeys, "\tsync done\n");
 }
 
 bool
@@ -4779,3 +4809,47 @@ Session::operation_in_progress (GQuark op) const
 {
        return (find (_current_trans_quarks.begin(), _current_trans_quarks.end(), op) != _current_trans_quarks.end());
 }
+
+boost::shared_ptr<Port>
+Session::ltc_input_port () const
+{
+       return _ltc_input->nth (0);
+}
+
+boost::shared_ptr<Port>
+Session::ltc_output_port () const
+{
+       return _ltc_output->nth (0);
+}
+
+void
+Session::reconnect_ltc_input ()
+{
+       if (_ltc_input) {
+
+               string src = Config->get_ltc_source_port();
+
+               _ltc_input->disconnect (this);
+
+               if (src != _("None") && !src.empty())  {
+                       _ltc_input->nth (0)->connect (src);
+               }
+       }
+}
+
+void
+Session::reconnect_ltc_output ()
+{
+       if (_ltc_output) {
+
+#if 0
+               string src = Config->get_ltc_sink_port();
+
+               _ltc_output->disconnect (this);
+
+               if (src != _("None") && !src.empty())  {
+                       _ltc_output->nth (0)->connect (src);
+               }
+#endif
+       }
+}