mantis 0005805
[ardour.git] / libs / ardour / session.cc
index 3a18b1f7f7978ee594970847bbaef5889fc75f18..af52163ae9684bd9cf86afc3d595a09d7ce3fca7 100644 (file)
@@ -49,6 +49,7 @@
 
 #include "ardour/amp.h"
 #include "ardour/analyser.h"
+#include "ardour/async_midi_port.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_port.h"
@@ -66,6 +67,7 @@
 #include "ardour/debug.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/graph.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
 #include "ardour/operations.h"
 #include "ardour/session_playlists.h"
 #include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
+#include "ardour/speakers.h"
 #include "ardour/utils.h"
 
 #include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
 #include "midi++/mmc.h"
-#include "midi++/manager.h"
 
 #include "i18n.h"
 
@@ -106,6 +107,7 @@ using namespace PBD;
 
 bool Session::_disable_all_loaded_plugins = false;
 
+PBD::Signal1<int,uint32_t> Session::AudioEngineSetupRequired;
 PBD::Signal1<void,std::string> Session::Dialog;
 PBD::Signal0<int> Session::AskAboutPendingState;
 PBD::Signal2<int, framecnt_t, framecnt_t> Session::AskAboutSampleRateMismatch;
@@ -119,6 +121,7 @@ PBD::Signal1<int,boost::shared_ptr<Playlist> > Session::AskAboutPlaylistDeletion
 PBD::Signal0<void> Session::Quit;
 PBD::Signal0<void> Session::FeedbackDetected;
 PBD::Signal0<void> Session::SuccessfulGraphSort;
+PBD::Signal2<void,std::string,std::string> Session::VersionMismatch;
 
 static void clean_up_session_event (SessionEvent* ev) { delete ev; }
 const SessionEvent::RTeventCallback Session::rt_cleanup (clean_up_session_event);
@@ -129,68 +132,196 @@ Session::Session (AudioEngine &eng,
                   const string& snapshot_name,
                   BusProfile* bus_profile,
                   string mix_template)
-       : _engine (eng)
+       : playlists (new SessionPlaylists)
+       , _engine (eng)
+       , process_function (&Session::process_with_events)
+       , waiting_for_sync_offset (false)
+       , _base_frame_rate (0)
+       , _current_frame_rate (0)
+       , _nominal_frame_rate (0)
+       , transport_sub_state (0)
+       , _record_status (Disabled)
+       , _transport_frame (0)
+       , _session_range_location (0)
+       , _slave (0)
+       , _silent (false)
+       , _transport_speed (0)
+       , _default_transport_speed (1.0)
+       , _last_transport_speed (0)
        , _target_transport_speed (0.0)
+       , auto_play_legal (false)
+       , _last_slave_transport_frame (0)
+       , maximum_output_latency (0)
        , _requested_return_frame (-1)
-       , _session_dir (new SessionDirectory(fullpath))
+       , current_block_size (0)
+       , _worst_output_latency (0)
+       , _worst_input_latency (0)
+       , _worst_track_latency (0)
+       , _have_captured (false)
+       , _meter_hold (0)
+       , _meter_falloff (0)
+       , _non_soloed_outs_muted (false)
+       , _listen_cnt (0)
+       , _solo_isolated_cnt (0)
+       , _writable (false)
+       , _was_seamless (Config->get_seamless_loop ())
+       , _under_nsm_control (false)
+       , delta_accumulator_cnt (0)
+       , average_slave_delta (1800) // !!! why 1800 ???
+       , average_dir (0)
+       , have_first_delta_accumulator (false)
+       , _slave_state (Stopped)
+       , post_export_sync (false)
+       , post_export_position (0)
+       , _exporting (false)
+       , _export_started (false)
+       , _export_rolling (false)
+       , _pre_export_mmc_enabled (false)
+       , _name (snapshot_name)
+       , _is_new (true)
+       , _send_qf_mtc (false)
+       , _pframes_since_last_mtc (0)
+       , session_midi_feedback (0)
+       , play_loop (false)
+       , loop_changing (false)
+       , last_loopend (0)
+       , _session_dir (new SessionDirectory (fullpath))
+       , _current_snapshot_name (snapshot_name)          
        , state_tree (0)
-       , _state_of_the_state (Clean)
+       , state_was_pending (false)
+       , _state_of_the_state (StateOfTheState(CannotSave|InitialConnecting|Loading))
+       , _last_roll_location (0)
+       , _last_roll_or_reversal_location (0)
+       , _last_record_location (0)
+       , pending_locate_roll (false)
+       , pending_locate_frame (0)
+       , pending_locate_flush (false)
+       , pending_abort (false)
+       , pending_auto_loop (false)
        , _butler (new Butler (*this))
        , _post_transport_work (0)
+       ,  cumulative_rf_motion (0)
+       , rf_scale (1.0)
+       , _locations (new Locations (*this))
+       , step_speed (0)
+       , outbound_mtc_timecode_frame (0)
+       , next_quarter_frame_to_send (-1)
+       , _frames_per_timecode_frame (0)
+       , _frames_per_hour (0)
+       , _timecode_frames_per_hour (0)
+       , last_timecode_valid (false)
+       , last_timecode_when (0)
        , _send_timecode_update (false)
+       , ltc_encoder (0)
+       , ltc_enc_buf(0)
+       , ltc_buf_off (0)
+       , ltc_buf_len (0)
+       , ltc_speed (0)
+       , ltc_enc_byte (0)
+       , ltc_enc_pos (0)
+       , ltc_enc_cnt (0)
+       , ltc_enc_off (0)
+       , restarting (false)
+       , ltc_prev_cycle (0)
+       , ltc_timecode_offset (0)
+       , ltc_timecode_negative_offset (false)
+       , midi_control_ui (0)
+       , _tempo_map (0)
        , _all_route_group (new RouteGroup (*this, "all"))
        , routes (new RouteList)
+       , _adding_routes_in_progress (false)
+       , destructive_index (0)
+       , solo_update_disabled (false)
+       , default_fade_steepness (0)
+       , default_fade_msecs (0)
        , _total_free_4k_blocks (0)
        , _total_free_4k_blocks_uncertain (false)
+       , no_questions_about_missing_files (false)
+       , _playback_load (0)
+       , _capture_load (0)
        , _bundles (new BundleList)
        , _bundle_xml_node (0)
        , _current_trans (0)
-       , _click_io ((IO*) 0)
+       , _clicking (false)
        , click_data (0)
        , click_emphasis_data (0)
+       , click_length (0)
+       , click_emphasis_length (0)
+       , _clicks_cleared (0)
+       , _play_range (false)
        , main_outs (0)
+       , first_file_data_format_reset (true)
+       , first_file_header_format_reset (true)
+       , have_looped (false)
        , _have_rec_enabled_track (false)
+       , _step_editors (0)
        , _suspend_timecode_transmission (0)
+       ,  _speakers (new Speakers)
+       , _order_hint (0)
+       , ignore_route_processor_changes (false)
+       , _midi_ports (0)
+       , _mmc (0)
 {
-       _locations = new Locations (*this);
+       uint32_t sr = 0;
 
-       if (how_many_dsp_threads () > 1) {
-               /* For now, only create the graph if we are using >1 DSP threads, as
-                  it is a bit slower than the old code with 1 thread.
-               */
-               _process_graph.reset (new Graph (*this));
-       }
-
-       playlists.reset (new SessionPlaylists);
+       pre_engine_init (fullpath);
+       
+       if (_is_new) {
+               if (ensure_engine (sr)) {
+                       destroy ();
+                       throw failed_constructor ();
+               }
 
-       _all_route_group->set_active (true, this);
+               if (create (mix_template, bus_profile)) {
+                       destroy ();
+                       throw failed_constructor ();
+               }
 
-       interpolation.add_channel_to (0, 0);
+               /* if a mix template was provided, then ::create() will
+                * have copied it into the session and we need to load it
+                * so that we have the state ready for ::set_state()
+                * after the engine is started.
+                *
+                * Note that we do NOT try to get the sample rate from
+                * the template at this time, though doing so would
+                * be easy if we decided this was an appropriate part
+                * of a template.
+                */
 
-       if (!eng.connected()) {
-               throw failed_constructor();
-       }
+               if (!mix_template.empty() && load_state (_current_snapshot_name)) {
+                       throw failed_constructor ();
+               }
 
-       n_physical_outputs = _engine.n_physical_outputs ();
-       n_physical_inputs =  _engine.n_physical_inputs ();
+       } else {
 
-       first_stage_init (fullpath, snapshot_name);
+               if (load_state (_current_snapshot_name)) {
+                       throw failed_constructor ();
+               }
+       
+               /* try to get sample rate from XML state so that we
+                * can influence the SR if we set up the audio
+                * engine.
+                */
 
-       _is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
+               if (state_tree) {
+                       const XMLProperty* prop;
+                       if ((prop = state_tree->root()->property (X_("sample-rate"))) != 0) {           
+                               sr = atoi (prop->value());
+                       }
+               }
 
-       if (_is_new) {
-               if (create (mix_template, bus_profile)) {
+               if (ensure_engine (sr)) {
                        destroy ();
                        throw failed_constructor ();
                }
        }
 
-       if (second_stage_init ()) {
+       if (post_engine_init ()) {
                destroy ();
                throw failed_constructor ();
        }
 
-       store_recent_sessions(_name, _path);
+       store_recent_sessions (_name, _path);
 
        bool was_dirty = dirty();
 
@@ -207,6 +338,16 @@ Session::Session (AudioEngine &eng,
        EndTimeChanged.connect_same_thread (*this, boost::bind (&Session::end_time_changed, this, _1));
 
        _is_new = false;
+
+       /* hook us up to the engine since we are now completely constructed */
+
+       BootMessage (_("Connect to engine"));
+
+       _engine.set_session (this);
+       _engine.reset_timebase ();
+
+       BootMessage (_("Session loading complete"));
+
 }
 
 Session::~Session ()
@@ -217,6 +358,81 @@ Session::~Session ()
        destroy ();
 }
 
+int
+Session::ensure_engine (uint32_t desired_sample_rate)
+{
+       if (_engine.current_backend() == 0) {
+               /* backend is unknown ... */
+               boost::optional<int> r = AudioEngineSetupRequired (desired_sample_rate);
+               if (r.get_value_or (-1) != 0) {
+                       return -1;
+               }
+       } else if (_engine.setup_required()) {
+               /* backend is known, but setup is needed */
+               boost::optional<int> r = AudioEngineSetupRequired (desired_sample_rate);
+               if (r.get_value_or (-1) != 0) {
+                       return -1;
+               }
+       } else if (!_engine.running()) {
+               if (_engine.start()) {
+                       return -1;
+               }
+       }
+
+       /* at this point the engine should be running
+       */
+
+       if (!_engine.running()) {
+               return -1;
+       }
+
+       return immediately_post_engine ();
+
+}
+
+int
+Session::immediately_post_engine ()
+{
+       /* Do various initializations that should take place directly after we
+        * know that the engine is running, but before we either create a
+        * session or set state for an existing one.
+        */
+        
+       if (how_many_dsp_threads () > 1) {
+               /* For now, only create the graph if we are using >1 DSP threads, as
+                  it is a bit slower than the old code with 1 thread.
+               */
+               _process_graph.reset (new Graph (*this));
+       }
+
+       /* every time we reconnect, recompute worst case output latencies */
+
+       _engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this));
+
+       if (synced_to_engine()) {
+               _engine.transport_stop ();
+       }
+
+       if (config.get_jack_time_master()) {
+               _engine.transport_locate (_transport_frame);
+       }
+
+       try {
+               BootMessage (_("Set up LTC"));
+               setup_ltc ();
+               BootMessage (_("Set up Click"));
+               setup_click ();
+               BootMessage (_("Set up standard connections"));
+               setup_bundles ();
+       }
+
+       catch (failed_constructor& err) {
+               return -1;
+       }
+
+       return 0;
+}
+
 void
 Session::destroy ()
 {
@@ -230,6 +446,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
@@ -238,6 +458,8 @@ Session::destroy ()
 
        Port::PortDrop (); /* EMIT SIGNAL */
 
+       ltc_tx_cleanup();
+
        /* clear history so that no references to objects are held any more */
 
        _history.clear ();
@@ -321,7 +543,9 @@ Session::destroy ()
        /* not strictly necessary, but doing it here allows the shared_ptr debugging to work */
        playlists.reset ();
 
-       delete _locations;
+       delete _mmc; _mmc = 0;
+       delete _midi_ports; _midi_ports = 0;
+       delete _locations; _locations = 0;
 
        DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
 
@@ -331,105 +555,112 @@ Session::destroy ()
 }
 
 void
-Session::when_engine_running ()
+Session::setup_ltc ()
 {
-       string first_physical_output;
-
-       BootMessage (_("Set block size and sample rate"));
-
-       set_block_size (_engine.frames_per_cycle());
-       set_frame_rate (_engine.frame_rate());
-
-       BootMessage (_("Using configuration"));
-
-       boost::function<void (std::string)> ff (boost::bind (&Session::config_changed, this, _1, false));
-       boost::function<void (std::string)> ft (boost::bind (&Session::config_changed, this, _1, true));
-
-       Config->map_parameters (ff);
-       config.map_parameters (ft);
-
-       /* every time we reconnect, recompute worst case output latencies */
-
-       _engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this));
-
-       if (synced_to_jack()) {
-               _engine.transport_stop ();
+       XMLNode* child = 0;
+       
+       _ltc_input.reset (new IO (*this, X_("LTC In"), IO::Input));
+       _ltc_output.reset (new IO (*this, X_("LTC Out"), IO::Output));
+       
+       if (state_tree && (child = find_named_node (*state_tree->root(), X_("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 (config.get_jack_time_master()) {
-               _engine.transport_locate (_transport_frame);
+       
+       if (state_tree && (child = find_named_node (*state_tree->root(), X_("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 (X_("LTC-in"));
+       _ltc_output->nth (0)->set_name (X_("LTC-out"));
+}
 
+void
+Session::setup_click ()
+{
        _clicking = false;
+       _click_io.reset (new ClickIO (*this, X_("Click")));
+       _click_gain.reset (new Amp (*this));
+       _click_gain->activate ();
+       if (state_tree) {
+               setup_click_state (state_tree->root());
+       } else {
+               setup_click_state (0);
+       }
+}
 
-       try {
-               XMLNode* child = 0;
-
-               _click_io.reset (new ClickIO (*this, "click"));
-               _click_gain.reset (new Amp (*this));
-               _click_gain->activate ();
-
-               if (state_tree && (child = find_named_node (*state_tree->root(), "Click")) != 0) {
-
-                       /* existing state for Click */
-                       int c = 0;
+void
+Session::setup_click_state (const XMLNode* node)
+{      
+       const XMLNode* child = 0;
+       
+       if (node && (child = find_named_node (*node, "Click")) != 0) {
+               
+               /* existing state for Click */
+               int c = 0;
 
-                       if (Stateful::loading_state_version < 3000) {
-                               c = _click_io->set_state_2X (*child->children().front(), Stateful::loading_state_version, false);
-                       } else {
-                               const XMLNodeList& children (child->children());
-                               XMLNodeList::const_iterator i = children.begin();
-                               if ((c = _click_io->set_state (**i, Stateful::loading_state_version)) == 0) {
-                                       ++i;
-                                       if (i != children.end()) {
-                                               c = _click_gain->set_state (**i, Stateful::loading_state_version);
-                                       }
+               if (Stateful::loading_state_version < 3000) {
+                       c = _click_io->set_state_2X (*child->children().front(), Stateful::loading_state_version, false);
+               } else {
+                       const XMLNodeList& children (child->children());
+                       XMLNodeList::const_iterator i = children.begin();
+                       if ((c = _click_io->set_state (**i, Stateful::loading_state_version)) == 0) {
+                               ++i;
+                               if (i != children.end()) {
+                                       c = _click_gain->set_state (**i, Stateful::loading_state_version);
                                }
                        }
+               }
                        
-                       if (c == 0) {
-                               _clicking = Config->get_clicking ();
+               if (c == 0) {
+                       _clicking = Config->get_clicking ();
 
-                       } else {
+               } else {
 
-                               error << _("could not setup Click I/O") << endmsg;
-                               _clicking = false;
-                       }
+                       error << _("could not setup Click I/O") << endmsg;
+                       _clicking = false;
+               }
 
 
-               } else {
+       } else {
 
-                       /* default state for Click: dual-mono to first 2 physical outputs */
+               /* default state for Click: dual-mono to first 2 physical outputs */
 
-                       vector<string> outs;
-                       _engine.get_physical_outputs (DataType::AUDIO, outs);
+               vector<string> outs;
+               _engine.get_physical_outputs (DataType::AUDIO, outs);
 
-                       for (uint32_t physport = 0; physport < 2; ++physport) {
-                               if (outs.size() > physport) {
-                                       if (_click_io->add_port (outs[physport], this)) {
-                                               // relax, even though its an error
-                                       }
+               for (uint32_t physport = 0; physport < 2; ++physport) {
+                       if (outs.size() > physport) {
+                               if (_click_io->add_port (outs[physport], this)) {
+                                       // relax, even though its an error
                                }
                        }
-
-                       if (_click_io->n_ports () > ChanCount::ZERO) {
-                               _clicking = Config->get_clicking ();
-                       }
                }
-       }
 
-       catch (failed_constructor& err) {
-               error << _("cannot setup Click I/O") << endmsg;
-       }
-
-       BootMessage (_("Compute I/O Latencies"));
-
-       if (_clicking) {
-               // XXX HOW TO ALERT UI TO THIS ? DO WE NEED TO?
+               if (_click_io->n_ports () > ChanCount::ZERO) {
+                       _clicking = Config->get_clicking ();
+               }
        }
+}
 
-       BootMessage (_("Set up standard connections"));
-
+void
+Session::setup_bundles ()
+{
        vector<string> inputs[DataType::num_types];
        vector<string> outputs[DataType::num_types];
        for (uint32_t i = 0; i < DataType::num_types; ++i) {
@@ -528,53 +759,6 @@ Session::when_engine_running ()
                add_bundle (c);
        }
 
-       BootMessage (_("Setup signal flow and plugins"));
-
-       /* Reset all panners */
-
-       Delivery::reset_panners ();
-
-       /* this will cause the CPM to instantiate any protocols that are in use
-        * (or mandatory), which will pass it this Session, and then call
-        * set_state() on each instantiated protocol to match stored state.
-        */
-
-       ControlProtocolManager::instance().set_session (this);
-
-       /* This must be done after the ControlProtocolManager set_session above,
-          as it will set states for ports which the ControlProtocolManager creates.
-       */
-
-       MIDI::Manager::instance()->set_port_states (Config->midi_port_states ());
-
-       /* And this must be done after the MIDI::Manager::set_port_states as
-        * it will try to make connections whose details are loaded by set_port_states.
-        */
-
-       hookup_io ();
-
-       /* Let control protocols know that we are now all connected, so they
-        * could start talking to surfaces if they want to.
-        */
-
-       ControlProtocolManager::instance().midi_connectivity_established ();
-
-       if (_is_new && !no_auto_connect()) {
-               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock());
-               auto_connect_master_bus ();
-       }
-
-       _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);
-       _engine.reset_timebase ();
 }
 
 void
@@ -736,14 +920,14 @@ Session::add_monitor_section ()
                        
                        /* Monitor bus is audio only */
 
-                       uint32_t mod = n_physical_outputs.get (DataType::AUDIO);
-                       uint32_t limit = _monitor_out->n_outputs().get (DataType::AUDIO);
                        vector<string> outputs[DataType::num_types];
 
                        for (uint32_t i = 0; i < DataType::num_types; ++i) {
                                _engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]);
                        }
-                       
+
+                       uint32_t mod = outputs[DataType::AUDIO].size();
+                       uint32_t limit = _monitor_out->n_outputs().get (DataType::AUDIO);
                        
                        if (mod != 0) {
                                
@@ -835,7 +1019,12 @@ Session::hookup_io ()
        /* Tell all IO objects to connect themselves together */
 
        IO::enable_connecting ();
-       MIDI::JackMIDIPort::MakeConnections ();
+
+       /* Now tell all "floating" ports to connect to whatever
+          they should be connected to.
+       */
+
+       AudioEngine::instance()->reconnect_ports ();
 
        /* Anyone who cares about input state, wake up and do something */
 
@@ -897,7 +1086,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->request_jack_monitors_input (yn);
+                       tr->request_input_monitoring (yn);
                }
        }
 }
@@ -1041,7 +1230,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;
        }
 
@@ -1130,7 +1319,7 @@ Session::enable_record ()
                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));
+                       _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordStrobe));
 
                        if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
                                set_track_monitor_input_status (true);
@@ -1151,7 +1340,7 @@ Session::disable_record (bool rt_context, bool force)
 
                if ((!Config->get_latched_record_enable () && !play_loop) || force) {
                        g_atomic_int_set (&_record_status, Disabled);
-                       MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordExit));
+                       _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordExit));
                } else {
                        if (rs == Recording) {
                                g_atomic_int_set (&_record_status, Enabled);
@@ -1205,7 +1394,7 @@ Session::maybe_enable_record ()
                        enable_record ();
                }
        } else {
-               MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordPause));
+               _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordPause));
                RecordStateChanged (); /* EMIT SIGNAL */
        }
 
@@ -1242,7 +1431,7 @@ Session::audible_frame () const
                offset = current_block_size;
        }
 
-       if (synced_to_jack()) {
+       if (synced_to_engine()) {
                tf = _engine.transport_frame();
        } else {
                tf = _transport_frame;
@@ -1302,11 +1491,10 @@ Session::set_frame_rate (framecnt_t frames_per_second)
        */
 
        _base_frame_rate = frames_per_second;
+       _nominal_frame_rate = 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
@@ -1512,7 +1700,7 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r)
                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 (MixerSort)));
+                                                                  (*i)->name(), (*i)->order_key ()));
                }
 #endif
 
@@ -1562,7 +1750,7 @@ Session::find_route_name (string const & base, uint32_t& id, char* name, size_t
                }
 
                ++id;
-
+               
        } while (id < (UINT_MAX-1));
 
        return false;
@@ -1579,7 +1767,7 @@ Session::count_existing_track_channels (ChanCount& in, ChanCount& out)
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                 boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
-               if (tr && !tr->is_hidden()) {
+               if (tr && !tr->is_auditioner()) {
                        in  += tr->n_inputs();
                        out += tr->n_outputs();
                }
@@ -1600,8 +1788,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) {
@@ -1660,7 +1846,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;
                }
 
@@ -1799,7 +1985,7 @@ Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing
                        for (uint32_t i = output_start.get(*t); i < route->n_outputs().get(*t); ++i) {
                                string port;
 
-                               if ((*t) == DataType::MIDI || Config->get_output_auto_connect() & AutoConnectPhysical) {
+                               if ((*t) == DataType::MIDI && Config->get_output_auto_connect() & AutoConnectPhysical) {
                                        port = physoutputs[(out_offset.get(*t) + i) % nphysical_out];
                                } else if ((*t) == DataType::AUDIO && Config->get_output_auto_connect() & AutoConnectMaster) {
                                         /* master bus is audio only */
@@ -1974,6 +2160,8 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
                        bus->add_internal_return ();
 
                        ret.push_back (bus);
+                       
+                       ARDOUR::GUIIdle ();
                }
 
 
@@ -2001,12 +2189,13 @@ 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)
+Session::new_route_from_template (uint32_t how_many, const std::string& template_path, const std::string& name_base)
 {
        RouteList ret;
        uint32_t control_id;
        XMLTree tree;
        uint32_t number = 0;
+       const uint32_t being_added = how_many;
 
        if (!tree.read (template_path.c_str())) {
                return ret;
@@ -2026,13 +2215,29 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template
                node_copy.remove_property_recursively (X_("id"));
 
                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*/
+
+                       if (!name_base.empty()) {
+
+                               /* if we're adding more than one routes, force
+                                * all the names of the new routes to be
+                                * numbered, via the final parameter.
+                                */
+
+                               if (!find_route_name (name_base.c_str(), ++number, name, sizeof(name), (being_added > 1))) {
+                                       fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
+                                       /*NOTREACHDE*/
+                               }
+
+                       } else {
+
+                               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 */
+                               if (!find_route_name (route_name.c_str(), ++number, name, sizeof(name), true)) {
+                                       fatal << _("Session: UINT_MAX routes? impossible!") << endmsg;
+                                       /*NOTREACHED*/
+                               }
                        }
 
                        /* set this name in the XML description that we are about to use */
@@ -2101,11 +2306,41 @@ 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();
 
+       if (_order_hint != 0) {
+               order = _order_hint;
+               _order_hint = 0;
+       }
+
         count_existing_track_channels (existing_inputs, existing_outputs);
 
        {
@@ -2157,6 +2392,7 @@ 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);
                }
@@ -2165,47 +2401,34 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output
                   reasonable defaults because they also affect the remote control
                   ID in most situations.
                */
-               
-               if (!r->has_order_key (EditorSort)) {
-                       if (r->is_hidden()) {
+
+               if (!r->has_order_key ()) {
+                       if (r->is_auditioner()) {
                                /* use an arbitrarily high value */
-                               r->set_order_key (EditorSort, UINT_MAX);
-                               r->set_order_key (MixerSort, UINT_MAX);
+                               r->set_order_key (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);
+                               r->set_order_key (order);
                                order++;
                        }
                }
+
+               ARDOUR::GUIIdle ();
        }
 
        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()) {
+               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 ();
-                               }
+                       } else {
+                               (*x)->enable_monitor_send ();
                        }
                }
-
-               resort_routes ();
-       }
-
-       set_dirty();
-
-       if (save) {
-               save_state (_current_snapshot_name);
        }
-
-       RouteAdded (new_routes); /* EMIT SIGNAL */
 }
 
 void
@@ -2403,7 +2626,7 @@ Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
                        /* new listen: disable all other listen */
                        boost::shared_ptr<RouteList> r = routes.reader ();
                        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                               if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
+                               if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) {
                                        continue;
                                }
                                (*i)->set_listen (false, this);
@@ -2485,7 +2708,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
                /* 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_auditioner() ||
                            (leave_group_alone && ((*i)->route_group() == rg))) {
                                continue;
                        }
@@ -2505,7 +2728,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
                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_auditioner() ||
                    (leave_group_alone && ((*i)->route_group() == rg))) {
                        continue;
                }
@@ -2515,14 +2738,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()));
@@ -2543,7 +2769,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 {
@@ -2565,7 +2795,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);
        }
 
@@ -2587,11 +2817,11 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
        }
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_hidden() && (*i)->self_soloed()) {
+               if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_auditioner() && (*i)->self_soloed()) {
                        something_soloed = true;
                }
 
-               if (!(*i)->is_hidden() && (*i)->listening_via_monitor()) {
+               if (!(*i)->is_auditioner() && (*i)->listening_via_monitor()) {
                        if (Config->get_solo_control_is_listen_control()) {
                                listeners++;
                        } else {
@@ -2615,6 +2845,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>
@@ -2650,44 +2883,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);
+                                       }
+                               }
                        }
                }
        }
@@ -2696,7 +2953,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)) {
@@ -3297,7 +3554,7 @@ Session::create_audio_source_for_session (size_t n_chans, string const & n, uint
        const string path    = new_source_path_from_name(DataType::AUDIO, name);
 
        return boost::dynamic_pointer_cast<AudioFileSource> (
-               SourceFactory::createWritable (DataType::AUDIO, *this, path, string(), destructive, frame_rate()));
+               SourceFactory::createWritable (DataType::AUDIO, *this, path, destructive, frame_rate()));
 }
 
 /** Return a unique name based on \a base for a new internal MIDI source */
@@ -3373,7 +3630,7 @@ Session::create_midi_source_for_session (Track* track, string const & n)
 
        return boost::dynamic_pointer_cast<SMFSource> (
                SourceFactory::createWritable (
-                       DataType::MIDI, *this, path, string(), false, frame_rate()));
+                       DataType::MIDI, *this, path, false, frame_rate()));
 }
 
 
@@ -3462,7 +3719,7 @@ Session::RoutePublicOrderSorter::operator() (boost::shared_ptr<Route> a, boost::
        if (b->is_monitor()) {
                return false;
        }
-       return a->order_key (MixerSort) < b->order_key (MixerSort);
+       return a->order_key () < b->order_key ();
 }
 
 bool
@@ -3483,7 +3740,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;
        }
 
@@ -3925,7 +4182,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end,
 
                try {
                        fsource = boost::dynamic_pointer_cast<AudioFileSource> (
-                               SourceFactory::createWritable (DataType::AUDIO, *this, buf, string(), false, frame_rate()));
+                               SourceFactory::createWritable (DataType::AUDIO, *this, buf, false, frame_rate()));
                }
 
                catch (failed_constructor& err) {
@@ -4067,11 +4324,18 @@ Session::get_silent_buffers (ChanCount count)
 }
 
 BufferSet&
-Session::get_scratch_buffers (ChanCount count)
+Session::get_scratch_buffers (ChanCount count, bool silence)
+{
+       return ProcessThread::get_scratch_buffers (count, silence);
+}
+
+BufferSet&
+Session::get_route_buffers (ChanCount count, bool silence)
 {
-       return ProcessThread::get_scratch_buffers (count);
+       return ProcessThread::get_route_buffers (count, silence);
 }
 
+
 BufferSet&
 Session::get_mix_buffers (ChanCount count)
 {
@@ -4118,7 +4382,7 @@ Session::add_automation_list(AutomationList *al)
 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 */
@@ -4325,7 +4589,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());
@@ -4345,6 +4609,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
         */
 
@@ -4360,16 +4633,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);
                }
        }
@@ -4463,7 +4727,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;
        }
 
@@ -4519,7 +4783,7 @@ Session::post_playback_latency ()
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->is_hidden() && ((*i)->active())) {
+               if (!(*i)->is_auditioner() && ((*i)->active())) {
                        _worst_track_latency = max (_worst_track_latency, (*i)->update_signal_latency ());
                }
        }
@@ -4625,7 +4889,7 @@ Session::update_latency_compensation (bool force_whole_graph)
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               if (!(*i)->is_hidden() && ((*i)->active())) {
+               if (!(*i)->is_auditioner() && ((*i)->active())) {
                        framecnt_t tl;
                        if ((*i)->signal_latency () != (tl = (*i)->update_signal_latency ())) {
                                some_track_latency_changed = true;
@@ -4692,8 +4956,7 @@ Session::notify_remote_id_change ()
        }
 
        switch (Config->get_remote_model()) {
-       case MixerSort:
-       case EditorSort:
+       case MixerOrdered:
                Route::RemoteControlIDChange (); /* EMIT SIGNAL */
                break;
        default:
@@ -4702,7 +4965,7 @@ Session::notify_remote_id_change ()
 }
 
 void
-Session::sync_order_keys (RouteSortOrderKey sort_key_changed)
+Session::sync_order_keys ()
 {
        if (deletion_in_progress()) {
                return;
@@ -4714,9 +4977,9 @@ Session::sync_order_keys (RouteSortOrderKey sort_key_changed)
           opportunity to keep them in sync if they wish to.
        */
 
-       DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("Sync Order Keys, based on %1\n", enum_2_string (sort_key_changed)));
+       DEBUG_TRACE (DEBUG::OrderKeys, "Sync Order Keys.\n");
 
-       Route::SyncOrderKeys (sort_key_changed); /* EMIT SIGNAL */
+       Route::SyncOrderKeys (); /* EMIT SIGNAL */
 
        DEBUG_TRACE (DEBUG::OrderKeys, "\tsync done\n");
 }
@@ -4726,3 +4989,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
+       }
+}